monorail
/
Archipelago
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MultiServer: rip Store, Modify -> Set, Retrieve -> Get, Modified -> SetReply, ModifyNotify -> SetNotify

This commit is contained in:
Fabian Dill 2022-02-22 12:17:21 +01:00
parent 5faf1f27de
commit 53ab224fba
1 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
MultiServer.py
View File

@ -1525,15 +1525,7 @@ async def process_client_cmd(ctx: Context, client: Client, args: dict):
bounceclient.slot in slots): bounceclient.slot in slots):
await ctx.send_encoded_msgs(bounceclient, msg) await ctx.send_encoded_msgs(bounceclient, msg)
elif cmd == "Store": elif cmd == "Get":
if "data" not in args or type(args["data"]) != dict:
await ctx.send_msgs(client, [{'cmd': 'InvalidPacket', "type": "arguments",
"text": 'Store', "original_cmd": cmd}])
return
for key, value in args["data"].items():
ctx.stored_data[key] = value
elif cmd == "Retrieve":
if "data" not in args or type(args["data"]) != list: if "data" not in args or type(args["data"]) != list:
await ctx.send_msgs(client, [{'cmd': 'InvalidPacket', "type": "arguments", await ctx.send_msgs(client, [{'cmd': 'InvalidPacket', "type": "arguments",
"text": 'Retrieve', "original_cmd": cmd}]) "text": 'Retrieve', "original_cmd": cmd}])
@ -1543,26 +1535,28 @@ async def process_client_cmd(ctx: Context, client: Client, args: dict):
args["data"] = {key: ctx.stored_data.get(key, None) for key in keys} args["data"] = {key: ctx.stored_data.get(key, None) for key in keys}
await ctx.send_msgs(client, [args]) await ctx.send_msgs(client, [args])
elif cmd == "Modify": elif cmd == "Set":
if "key" not in args or "value" not in args: if "key" not in args or "value" not in args:
await ctx.send_msgs(client, [{'cmd': 'InvalidPacket', "type": "arguments", await ctx.send_msgs(client, [{'cmd': 'InvalidPacket', "type": "arguments",
"text": 'Modify', "original_cmd": cmd}]) "text": 'Set', "original_cmd": cmd}])
return return
args["cmd"] = "Modified" args["cmd"] = "SetReply"
value = ctx.stored_data.get(args["key"], args.get("default", 0)) value = ctx.stored_data.get(args["key"], args.get("default", 0))
args["original_value"] = value args["original_value"] = value
operation = args.get("operation", "add") operation = args.get("operation", "replace")
func = modify_functions[operation] func = modify_functions[operation]
value = func(value, args.get("value")) value = func(value, args.get("value"))
ctx.stored_data[args["key"]] = args["value"] = value ctx.stored_data[args["key"]] = args["value"] = value
targets = set(ctx.stored_data_notification_clients[args["key"]]) targets = set(ctx.stored_data_notification_clients[args["key"]])
targets.add(client) if args.get("want_reply", True):
ctx.broadcast(targets, [args]) targets.add(client)
if targets:
ctx.broadcast(targets, [args])
elif cmd == "ModifyNotify": elif cmd == "SetNotify":
if "data" not in args or type(args["data"]) != list: if "data" not in args or type(args["data"]) != list:
await ctx.send_msgs(client, [{'cmd': 'InvalidPacket', "type": "arguments", await ctx.send_msgs(client, [{'cmd': 'InvalidPacket', "type": "arguments",
"text": 'ModifyNotify', "original_cmd": cmd}]) "text": 'SetNotify', "original_cmd": cmd}])
return return
for key in args["data"]: for key in args["data"]:
ctx.stored_data_notification_clients[key].add(client) ctx.stored_data_notification_clients[key].add(client)