diff --git a/WebHostLib/downloads.py b/WebHostLib/downloads.py
index 5dc71788..e8c32b83 100644
--- a/WebHostLib/downloads.py
+++ b/WebHostLib/downloads.py
@@ -37,9 +37,10 @@ def download_raw_patch(seed_id, player_id):
return "Patch not found"
else:
import io
-
- pname = patch.seed.multidata["names"][0][patch.player - 1]
-
+ if patch.seed.multidata:
+ pname = patch.seed.multidata["names"][0][patch.player - 1]
+ else:
+ pname = "unknown"
patch_data = update_patch_data(patch.data, server="")
patch_data = io.BytesIO(patch_data)
diff --git a/WebHostLib/generate.py b/WebHostLib/generate.py
index 93315a1b..971e832d 100644
--- a/WebHostLib/generate.py
+++ b/WebHostLib/generate.py
@@ -141,7 +141,7 @@ def gen_game(gen_options, race=False, owner=None, sid=None):
del (erargs.progression_balancing)
ERmain(erargs, seed)
- return upload_to_db(target.name, owner, sid)
+ return upload_to_db(target.name, owner, sid, race)
except BaseException:
if sid:
with db_session:
@@ -181,9 +181,10 @@ def wait_seed_api(seed: UUID):
return {"text": "Generation running"}, 202
-def upload_to_db(folder, owner, sid):
+def upload_to_db(folder, owner, sid, race:bool):
patches = set()
spoiler = ""
+
multidata = None
for file in os.listdir(folder):
file = os.path.join(folder, file)
@@ -193,20 +194,26 @@ def upload_to_db(folder, owner, sid):
elif file.endswith(".txt"):
spoiler = open(file, "rt").read()
elif file.endswith("multidata"):
- try:
- multidata = json.loads(zlib.decompress(open(file, "rb").read()))
- except Exception as e:
- flash(e)
- if multidata:
- with db_session:
- if sid:
- seed = Seed(multidata=multidata, spoiler=spoiler, patches=patches, owner=owner, id=sid)
- else:
- seed = Seed(multidata=multidata, spoiler=spoiler, patches=patches, owner=owner)
- for patch in patches:
- patch.seed = seed
- if sid:
- gen = Generation.get(id=sid)
- if gen is not None:
- gen.delete()
- return seed.id
+ multidata = file
+
+ if not race or len(patches) > 1:
+ try:
+ multidata = json.loads(zlib.decompress(open(multidata, "rb").read()))
+ except Exception as e:
+ flash(e)
+ raise e
+ else:
+ multidata = {}
+
+ with db_session:
+ if sid:
+ seed = Seed(multidata=multidata, spoiler=spoiler, patches=patches, owner=owner, id=sid)
+ else:
+ seed = Seed(multidata=multidata, spoiler=spoiler, patches=patches, owner=owner)
+ for patch in patches:
+ patch.seed = seed
+ if sid:
+ gen = Generation.get(id=sid)
+ if gen is not None:
+ gen.delete()
+ return seed.id
diff --git a/WebHostLib/templates/generate.html b/WebHostLib/templates/generate.html
index e33a106c..9b14ae24 100644
--- a/WebHostLib/templates/generate.html
+++ b/WebHostLib/templates/generate.html
@@ -19,10 +19,10 @@
You can also upload a .zip with multiple YAMLs.
A proper menu is in the works.
{% if race -%}
- Race Mode means the spoiler log will be unavailable.
+ Race Mode means the spoiler log will be unavailable, roms will be encrypted and single-player has no multidata.
{%- else -%}
You can go to Race Mode to create a game without
- spoiler log.
+ spoiler log and with encryption.
{%- endif -%}
diff --git a/WebHostLib/templates/view_seed.html b/WebHostLib/templates/view_seed.html
index 0db581ee..0996c42b 100644
--- a/WebHostLib/templates/view_seed.html
+++ b/WebHostLib/templates/view_seed.html
@@ -11,6 +11,11 @@
Seed Info
+ {% if not seed.multidata and not seed.spoiler %}
+
+ Single Player Race Rom: No spoiler or multidata exists, parts of the rom are encrypted and rooms cannot be created.
+
+ {% endif %}
@@ -27,6 +32,7 @@
Download |
{% endif %}
+ {% if seed.multidata %}
Players: |
@@ -55,6 +61,23 @@
{% endcall %}
|
+ {% else %}
+
+ Patches: |
+
+
+ |
+
+ {% endif %}