Macintosh-HW
/
RASCSI
mirror of https://github.com/akuker/RASCSI.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use pathlib object to construct upload path

This commit is contained in:
Daniel Markstedt 2023-11-03 21:00:05 +09:00
parent a3d422dd1e
commit 37d797ce5c
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
python/web/src/templates/upload.html
View File

@ -21,7 +21,7 @@
{% for dir in images_subdirs %}
<option value="{{dir}}">{{dir}}</option>
{% endfor %}
<option value="/" selected>/</option>
<option value="" selected>/</option>
</select>
{% if file_server_dir_exists %}
<input type="radio" name="destination" id="shared_files" value="shared_files">
@ -31,7 +31,7 @@
{% for dir in shared_subdirs %}
<option value="{{dir}}">{{dir}}</option>
{% endfor %}
<option value="/" selected>/</option>
<option value="" selected>/</option>
</select>
{% endif %}
<input type="radio" name="destination" id="piscsi_config" value="piscsi_config">

10
python/web/src/web.py
View File

@ -1038,14 +1038,14 @@ def upload_file():
if not safe_path["status"]:
return make_response(safe_path["msg"], 403)
server_info = piscsi_cmd.get_server_info()
destination_dir = server_info["image_dir"] + images_subdir
destination_dir = Path(server_info["image_dir"]) / images_subdir
elif destination == "shared_files":
safe_path = is_safe_path(Path("." + shared_subdir))
if not safe_path["status"]:
return make_response(safe_path["msg"], 403)
destination_dir = FILE_SERVER_DIR + shared_subdir
destination_dir = Path(FILE_SERVER_DIR) / shared_subdir
elif destination == "piscsi_config":
destination_dir = CFG_DIR
destination_dir = Path(CFG_DIR)
else:
return make_response(_("Unknown destination"), 403)
@ -1054,8 +1054,8 @@ def upload_file():
file_name = secure_filename(file_object.filename)
tmp_file_name = "__tmp_" + file_name
save_path = path.join(destination_dir, file_name)
tmp_save_path = path.join(destination_dir, tmp_file_name)
save_path = destination_dir / file_name
tmp_save_path = destination_dir / tmp_file_name
current_chunk = int(request.form["dzchunkindex"])
# Makes sure not to overwrite an existing file,