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

WebHost: Show error instead of 500 for unexpected files in multidata zip (#2260) 

* WebHost: Show error instead of 500 for unexpected files in multidata zip

* Add filename to error message

* Apply suggestions from code review

Co-authored-by: black-sliver <59490463+black-sliver@users.noreply.github.com>

---------

Co-authored-by: black-sliver <59490463+black-sliver@users.noreply.github.com>
This commit is contained in:
Remy Jette 2023-10-10 14:20:08 -07:00 committed by GitHub
parent d7475ddd73
commit 88dfbd4087
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
WebHostLib/upload.py
View File

@ -104,13 +104,21 @@ def upload_zip_to_db(zfile: zipfile.ZipFile, owner=None, meta={"race": False}, s
# Factorio # Factorio
elif file.filename.endswith(".zip"): elif file.filename.endswith(".zip"):
_, _, slot_id, *_ = file.filename.split('_')[0].split('-', 3) try:
_, _, slot_id, *_ = file.filename.split('_')[0].split('-', 3)
except ValueError:
flash("Error: Unexpected file found in .zip: " + file.filename)
return
data = zfile.open(file, "r").read() data = zfile.open(file, "r").read()
files[int(slot_id[1:])] = data files[int(slot_id[1:])] = data
# All other files using the standard MultiWorld.get_out_file_name_base method # All other files using the standard MultiWorld.get_out_file_name_base method
else: else:
_, _, slot_id, *_ = file.filename.split('.')[0].split('_', 3) try:
_, _, slot_id, *_ = file.filename.split('.')[0].split('_', 3)
except ValueError:
flash("Error: Unexpected file found in .zip: " + file.filename)
return
data = zfile.open(file, "r").read() data = zfile.open(file, "r").read()
files[int(slot_id[1:])] = data files[int(slot_id[1:])] = data