diff --git a/src/web/file_cmds.py b/src/web/file_cmds.py index a88fc419..82de6849 100644 --- a/src/web/file_cmds.py +++ b/src/web/file_cmds.py @@ -146,13 +146,13 @@ def unzip_file(file_name): unzip_proc = run( ["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: 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): diff --git a/src/web/web.py b/src/web/web.py index b5bac4d1..e2e1df92 100644 --- a/src/web/web.py +++ b/src/web/web.py @@ -638,11 +638,13 @@ def delete(): def unzip(): image = request.form.get("image") - if unzip_file(image): - flash("Unzipped file " + image) + process = unzip_file(image) + if process["status"]: + flash(process["msg"]) return redirect(url_for("index")) else: flash("Failed to unzip " + image, "error") + flash(process["msg"], "error") return redirect(url_for("index"))