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

MultiServer: compat fix if checksum is not present (#1642)

This commit is contained in:
Fabian Dill 2023-04-01 22:40:14 +02:00 committed by GitHub
parent e43bb99622
commit f015cf4298
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MultiServer.py
View File

@ -761,7 +761,7 @@ async def on_client_connected(ctx: Context, client: Client):
'datapackage_versions': {game: game_data["version"] for game, game_data 'datapackage_versions': {game: game_data["version"] for game, game_data
in ctx.gamespackage.items() if game in games}, in ctx.gamespackage.items() if game in games},
'datapackage_checksums': {game: game_data["checksum"] for game, game_data 'datapackage_checksums': {game: game_data["checksum"] for game, game_data
in ctx.gamespackage.items() if game in games}, in ctx.gamespackage.items() if game in games and "checksum" in game_data},
'seed_name': ctx.seed_name, 'seed_name': ctx.seed_name,
'time': time.time(), 'time': time.time(),
}]) }])

7
WebHostLib/customserver.py
View File

@ -94,7 +94,7 @@ class WebHostContext(Context):
multidata = self.decompress(room.seed.multidata) multidata = self.decompress(room.seed.multidata)
game_data_packages = {} game_data_packages = {}
for game in list(multidata["datapackage"]): for game in list(multidata.get("datapackage", {})):
game_data = multidata["datapackage"][game] game_data = multidata["datapackage"][game]
if "checksum" in game_data: if "checksum" in game_data:
if self.gamespackage.get(game, {}).get("checksum") == game_data["checksum"]: if self.gamespackage.get(game, {}).get("checksum") == game_data["checksum"]:
@ -102,8 +102,9 @@ class WebHostContext(Context):
# games package could be dropped from static data once all rooms embed data package # games package could be dropped from static data once all rooms embed data package
del multidata["datapackage"][game] del multidata["datapackage"][game]
else: else:
data = Utils.restricted_loads(GameDataPackage.get(checksum=game_data["checksum"]).data) row = GameDataPackage.get(checksum=game_data["checksum"])
game_data_packages[game] = data if row: # None if rolled on >= 0.3.9 but uploaded to <= 0.3.8. multidata should be complete
game_data_packages[game] = Utils.restricted_loads(row.data)
return self._load(multidata, game_data_packages, True) return self._load(multidata, game_data_packages, True)