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

Shorten file names when downloading to AFP (#592)

Browse Source
This commit is contained in:
Daniel Markstedt 2022-01-04 19:08:28 -08:00 committed by GitHub
parent a240198123
commit 1c84bb34f9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/web/file_cmds.py
View File

@ -279,7 +279,7 @@ def download_file_to_iso(url, *iso_args):
tmp_full_path = tmp_dir + file_name
iso_filename = f"{server_info['image_dir']}/{file_name}.iso"
req_proc = download_to_dir(url, tmp_dir)
req_proc = download_to_dir(url, tmp_dir, file_name)
if not req_proc["status"]:
return {"status": False, "msg": req_proc["msg"]}
@ -330,13 +330,12 @@ def download_file_to_iso(url, *iso_args):
}
def download_to_dir(url, save_dir):
def download_to_dir(url, save_dir, file_name):
"""
Takes (str) url, (str) save_dir
Takes (str) url, (str) save_dir, (str) file_name
Returns (dict) with (bool) status and (str) msg
"""
import requests
file_name = PurePath(url).name
logging.info("Making a request to download %s", url)
try:

17
src/web/web.py
View File

@ -6,6 +6,7 @@ import logging
import argparse
from pathlib import Path
from functools import wraps
from hashlib import md5
from flask import (
Flask,
@ -789,7 +790,7 @@ def download_img():
"""
url = request.form.get("url")
server_info = get_server_info()
process = download_to_dir(url, server_info["image_dir"])
process = download_to_dir(url, server_info["image_dir"], Path(url).name)
if process["status"]:
flash(process["msg"])
return redirect(url_for("index"))
@ -806,7 +807,19 @@ def download_afp():
Downloads a remote file onto the AFP shared dir on the Pi
"""
url = request.form.get("url")
process = download_to_dir(url, AFP_DIR)
file_name = Path(url).name
# Shorten file names longer than 31 chars, the HFS upper limit
# Append a hash of the removed piece of the file name to make it unique
# The format of the hash is a # followed by the first four symbols of the md4 hash
if len(file_name) > 31:
chars_to_cut = len(file_name) - 31
file_name_stem = Path(file_name).stem
file_name_suffix = Path(file_name).suffix
discarded_portion = file_name_stem[:-abs(chars_to_cut)]
stem_remainder = file_name_stem[:(26 - len(file_name_suffix))]
appendix_hash = (md5(discarded_portion.encode("utf-8"))).hexdigest().upper()
file_name = stem_remainder + "#" + appendix_hash[:4] + file_name_suffix
process = download_to_dir(url, AFP_DIR, file_name)
if process["status"]:
flash(process["msg"])
return redirect(url_for("index"))