various fixes to WebHost

WebHostLib/__init__.py

@@ -46,6 +46,7 @@ app.config["PONY"] = {
 app.config["MAX_ROLL"] = 20
 app.config["CACHE_TYPE"] = "simple"
 app.config["JSON_AS_ASCII"] = False
+app.config["PATCH_TARGET"] = "archipelago.gg"
 
 app.autoversion = True
 

WebHostLib/customserver.py

@@ -81,9 +81,9 @@ class WebHostContext(Context):
     def init_save(self, enabled: bool = True):
         self.saving = enabled
         if self.saving:
-            existing_savegame = restricted_loads(Room.get(id=self.room_id).multisave)
-            if existing_savegame:
-                self.set_save(existing_savegame)
+            savegame_data = Room.get(id=self.room_id).multisave
+            if savegame_data:
+                self.set_save(restricted_loads(Room.get(id=self.room_id).multisave))
             self._start_async_saving()
         threading.Thread(target=self.listen_to_db_commands, daemon=True).start()
 

WebHostLib/downloads.py

@@ -16,7 +16,7 @@ def download_patch(room_id, patch_id):
         room = Room.get(id=room_id)
         last_port = room.last_port
 
-        patch_data = update_patch_data(patch.data, server=f"{app.config['HOSTNAME']}:{last_port}")
+        patch_data = update_patch_data(patch.data, server=f"{app.config['PATCH_TARGET']}:{last_port}")
         patch_data = io.BytesIO(patch_data)
 
         fname = f"P{patch.player_id}_{patch.player_name}_{app.jinja_env.filters['suuid'](room_id)}.apbp"

WebHostLib/templates/macros.html

@@ -9,7 +9,7 @@
 {% macro list_patches_room(room) %}
     {% if room.seed.patches %}
         <ul>
-            {% for patch in patches|list|sort(attribute="player") %}
+            {% for patch in room.seed.patches|list|sort(attribute="player_id") %}
                 <li><a href="{{ url_for("download_patch", patch_id=patch.id, room_id=room.id) }}">
                     Patch for player {{ patch.player_id }} - {{ patch.player_name }}</a></li>
             {% endfor %}

WebHostLib/upload.py

@@ -41,8 +41,8 @@ def uploads():
                                 return "Uploaded data contained a rom file, which is likely to contain copyrighted material. Your file was deleted."
                             elif file.filename.endswith(".apbp"):
                                 splitted = file.filename.split("/")[-1][3:].split("P", 1)
-                                player = int(splitted[1].split(".")[0].split("_")[0])
-                                patches.add(Patch(data=zfile.open(file, "r").read(), player=player))
+                                player_id, player_name = splitted[1].split(".")[0].split("_")
+                                patches.add(Patch(data=zfile.open(file, "r").read(), player_name=player_name, player_id=player_id))
                             elif file.filename.endswith(".txt"):
                                 spoiler = zfile.open(file, "r").read().decode("utf-8-sig")
                             elif file.filename.endswith(".archipelago"):
@@ -71,7 +71,6 @@ def uploads():
                         flash("Could not load multidata. File may be corrupted or incompatible.")
                         raise
                     else:
-                        logging.info(multidata)
                         seed = Seed(multidata=multidata, owner=session["_id"])
                         commit()  # place into DB and generate ids
                         return redirect(url_for("viewSeed", seed=seed.id))