From c07e1a8ede89bdce320947de22c5b5a68d6701ad Mon Sep 17 00:00:00 2001 From: Daniel Markstedt Date: Sat, 1 Oct 2022 19:56:19 -0700 Subject: [PATCH] Allow for generating properties files in the Create Image UI --- python/web/src/templates/index.html | 11 ++++++++++ python/web/src/web.py | 32 +++++++++++++++++++++-------- 2 files changed, 35 insertions(+), 8 deletions(-) diff --git a/python/web/src/templates/index.html b/python/web/src/templates/index.html index 4bef6a7b..18ece547 100644 --- a/python/web/src/templates/index.html +++ b/python/web/src/templates/index.html @@ -589,6 +589,17 @@ + + diff --git a/python/web/src/web.py b/python/web/src/web.py index 35a25d62..af0ea8d9 100644 --- a/python/web/src/web.py +++ b/python/web/src/web.py @@ -876,17 +876,33 @@ def create_file(): file_name = request.form.get("file_name") size = (int(request.form.get("size")) * 1024 * 1024) file_type = request.form.get("type") + drive_name = request.form.get("drive_name") + full_file_name = file_name + "." + file_type - process = file_cmd.create_new_image(file_name, file_type, size) - if process["status"]: - return response( - status_code=201, - message=_("Image file created: %(file_name)s", file_name=full_file_name), - image=full_file_name, - ) + if not process["status"]: + return response(error=True, message=process["msg"]) - return response(error=True, message=process["msg"]) + # Creating the drive properties file, if one is chosen + if drive_name: + drive_props = None + for drive in APP.config["RASCSI_DRIVE_PROPERTIES"]: + if drive["name"] == drive_name: + drive_props = drive + break + properties = { + "vendor": drive_props["vendor"], + "product": drive_props["product"], + "revision": drive_props["revision"], + "block_size": drive_props["block_size"], + } + prop_file_name = f"{full_file_name}.{PROPERTIES_SUFFIX}" + process = file_cmd.write_drive_properties(prop_file_name, properties) + process = ReturnCodeMapper.add_msg(process) + if not process["status"]: + return response(error=True, message=process["msg"]) + + return response(message=_("Image file created: %(file_name)s", file_name=full_file_name)) @APP.route("/files/download", methods=["POST"])