Macintosh-HW/RASCSI
1
0
Fork 0
mirror of https://github.com/akuker/RASCSI.git synced 2024-11-27 04:49:18 +00:00
Code Issues Projects Releases Wiki Activity

Fix incorrect path to zip file to unzip; improve error handling

Browse Source
This commit is contained in:
Daniel Markstedt 2021-10-24 11:07:26 -07:00
parent c706fedfd3
commit dd6d289395
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/web/file_cmds.py
View File

@ -146,13 +146,13 @@ def unzip_file(file_name):
unzip_proc = run( unzip_proc = run(
["unzip", "-d", server_info["image_dir"], "-o", "-j", \ ["unzip", "-d", server_info["image_dir"], "-o", "-j", \
server_info["image_dir"] + file_name], capture_output=True f"{server_info['image_dir']}/{file_name}"], capture_output=True
) )
if unzip_proc.returncode != 0: if unzip_proc.returncode != 0:
logging.warning(f"Unzipping failed: {unzip_proc}") logging.warning(f"Unzipping failed: {unzip_proc}")
return {"status": False, "msg": unzip_proc} return {"status": False, "msg": str(unzip_proc)}
return {"status": True, "msg": f"{file_name} unzipped"} return {"status": True, "msg": f"Unzipped {file_name} to {server_info['image_dir']}"}
def download_file_to_iso(scsi_id, url): def download_file_to_iso(scsi_id, url):

6
src/web/web.py
View File

@ -638,11 +638,13 @@ def delete():
def unzip(): def unzip():
image = request.form.get("image") image = request.form.get("image")
if unzip_file(image): process = unzip_file(image)
flash("Unzipped file " + image) if process["status"]:
flash(process["msg"])
return redirect(url_for("index")) return redirect(url_for("index"))
else: else:
flash("Failed to unzip " + image, "error") flash("Failed to unzip " + image, "error")
flash(process["msg"], "error")
return redirect(url_for("index")) return redirect(url_for("index"))