nearxos/reterminal-dm4
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Enhance API response in portal files listing: streamline JSON structure by consolidating repeated code, improve error handling for directory checks, and add portal files directory information to the response. Update HTML template to display the server directory path dynamically.

Browse Source
This commit is contained in:
nearxos
2026-02-20 08:49:02 +02:00
parent 1fdd1dd376
commit 42bacad329
2 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
chromium-setup/emmc-provisioning/dashboard/app.py
View File

@@ -615,17 +615,24 @@ def _save_portal_descriptions(descriptions):
def api_portal_files_list():
"""List one level: root or contents of path=... (folders and files)."""
subpath = request.args.get("path", "").strip().strip("/")
base_url = request.host_url.rstrip("/") + "/files/"
empty = {"items": [], "base_url": base_url, "descriptions": {}, "current_path": subpath, "portal_files_dir": str(PORTAL_FILES_DIR)}
if ".." in subpath or "\\" in subpath:
return jsonify({"items": [], "base_url": request.host_url.rstrip("/") + "/files/", "descriptions": {}, "current_path": ""})
return jsonify(empty)
if not PORTAL_FILES_DIR.is_dir():
return jsonify({"items": [], "base_url": request.host_url.rstrip("/") + "/files/", "descriptions": {}, "current_path": ""})
try:
PORTAL_FILES_DIR.mkdir(parents=True, exist_ok=True)
except OSError:
pass
if not PORTAL_FILES_DIR.is_dir():
return jsonify(empty)
list_dir = (PORTAL_FILES_DIR / subpath).resolve() if subpath else PORTAL_FILES_DIR
try:
list_dir.relative_to(PORTAL_FILES_DIR.resolve())
except ValueError:
return jsonify({"items": [], "base_url": request.host_url.rstrip("/") + "/files/", "descriptions": {}, "current_path": subpath})
return jsonify({**empty, "current_path": subpath})
if not list_dir.is_dir():
return jsonify({"items": [], "base_url": request.host_url.rstrip("/") + "/files/", "descriptions": {}, "current_path": subpath})
return jsonify({**empty, "current_path": subpath})
items = []
for p in sorted(list_dir.iterdir(), key=lambda x: (not x.is_dir(), x.name.lower())):
if ".." in p.name or p.name.startswith("."):
@@ -639,8 +646,7 @@ def api_portal_files_list():
except OSError:
pass
descriptions = _load_portal_descriptions()
base = request.host_url.rstrip("/") + "/files/"
return jsonify({"items": items, "base_url": base, "descriptions": descriptions, "current_path": subpath})
return jsonify({"items": items, "base_url": base_url, "descriptions": descriptions, "current_path": subpath, "portal_files_dir": str(PORTAL_FILES_DIR)})
@app.route("/api/portal-files/descriptions", methods=["GET", "PATCH"])