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

Merge pull request #82 from Berserker66/tweaks 

server address caching changes
This commit is contained in:
Fabian Dill 2020-05-01 15:40:43 +02:00 committed by GitHub
parent d6665b6b53 cc77b48146
commit 8c2ebc362e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
MultiClient.py
View File

@ -597,8 +597,11 @@ async def server_loop(ctx : Context, address = None):
if address is None: # set through CLI or BMBP if address is None: # set through CLI or BMBP
address = ctx.server_address address = ctx.server_address
if address is None: # see if this is an old connection if address is None: # see if this is an old connection
await asyncio.sleep(0.5) # wait for snes connection to succeed if possible.
rom = "".join(chr(x) for x in ctx.rom) if ctx.rom is not None else None
try: try:
address = Utils.persistent_load()["servers"]["default"] servers = Utils.persistent_load()["servers"]
address = servers[rom] if rom is not None and rom in servers else servers["default"]
except Exception as e: except Exception as e:
logging.debug(f"Could not find cached server address. {e}") logging.debug(f"Could not find cached server address. {e}")
else: else:
@ -611,8 +614,6 @@ async def server_loop(ctx : Context, address = None):
logging.info('Enter multiworld server address') logging.info('Enter multiworld server address')
address = await console_input(ctx) address = await console_input(ctx)
Utils.persistent_store("servers", "default", address)
address = f"ws://{address}" if "://" not in address else address address = f"ws://{address}" if "://" not in address else address
port = urllib.parse.urlparse(address).port or 38281 port = urllib.parse.urlparse(address).port or 38281
@ -705,6 +706,8 @@ async def process_server_cmd(ctx : Context, cmd, args):
raise Exception('Connection refused by the multiworld host') raise Exception('Connection refused by the multiworld host')
elif cmd == 'Connected': elif cmd == 'Connected':
Utils.persistent_store("servers", "default", ctx.server_address)
Utils.persistent_store("servers", "".join(chr(x) for x in ctx.rom), ctx.server_address)
ctx.team, ctx.slot = args[0] ctx.team, ctx.slot = args[0]
ctx.player_names = {p: n for p, n in args[1]} ctx.player_names = {p: n for p, n in args[1]}
msgs = [] msgs = []