DasPoschi/jd-jellyfin-stack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Handle submit API response safely and avoid 500 crash

Browse Source
This commit is contained in:
DasPoschi
2026-04-12 18:44:48 +02:00
parent 0fe0e436aa
commit 7d0231c004
1 changed files with 46 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
jd-webgui/app.py
View File

@@ -1168,46 +1168,59 @@ def index():
@app.post("/submit") @app.post("/submit")
def submit(url: str = Form(...), package_name: str = Form(""), library: str = Form("auto")): def submit(url: str = Form(...), package_name: str = Form(""), library: str = Form("auto")):
ensure_env() try:
url = url.strip() ensure_env()
package_name = (package_name or "").strip() or "WebGUI" url = url.strip()
library = (library or "auto").strip().lower() package_name = (package_name or "").strip() or "WebGUI"
library = (library or "auto").strip().lower()
if not URL_RE.match(url): if not URL_RE.match(url):
return HTMLResponse(render_page("Nur http(s) URLs erlaubt."), status_code=400) return HTMLResponse(render_page("Nur http(s) URLs erlaubt."), status_code=400)
url_err = check_url_reachable(url) url_err = check_url_reachable(url)
if url_err: if url_err:
log_connection(f"URL-Check fehlgeschlagen: {url} -> {url_err}") log_connection(f"URL-Check fehlgeschlagen: {url} -> {url_err}")
return HTMLResponse(render_page(f"Link nicht erreichbar: {url_err}"), status_code=400) return HTMLResponse(render_page(f"Link nicht erreichbar: {url_err}"), status_code=400)
dev = get_device() dev = get_device()
resp = dev.linkgrabber.add_links([{ resp = dev.linkgrabber.add_links([{
"links": url, "links": url,
"autostart": True, "autostart": True,
"assignJobID": True, "assignJobID": True,
"packageName": package_name, "packageName": package_name,
}]) }])
jobid = str(resp.get("id", "")) jobid = ""
if not jobid: if isinstance(resp, dict):
return HTMLResponse(render_page(f"Unerwartete Antwort von add_links: {resp}"), status_code=500) jobid = str(resp.get("id", "")).strip()
elif isinstance(resp, (str, int)):
jobid = str(resp).strip()
elif isinstance(resp, list) and resp and isinstance(resp[0], dict):
jobid = str(resp[0].get("id", "")).strip()
with lock: if not jobid:
jobs[jobid] = Job( msg = f"Unerwartete Antwort von add_links (kein Job-ID): {resp!r}"
id=jobid, log_connection(msg)
url=url, return HTMLResponse(render_page(msg), status_code=502)
package_name=package_name,
library=library,
status="queued",
message="Download gestartet",
progress=0.0,
)
t = threading.Thread(target=worker, args=(jobid,), daemon=True) with lock:
t.start() jobs[jobid] = Job(
id=jobid,
url=url,
package_name=package_name,
library=library,
status="queued",
message="Download gestartet",
progress=0.0,
)
return RedirectResponse(url="/", status_code=303) t = threading.Thread(target=worker, args=(jobid,), daemon=True)
t.start()
return RedirectResponse(url="/", status_code=303)
except Exception as e:
log_connection(f"Submit-Fehler: {e}")
return HTMLResponse(render_page(f"Interner Fehler beim Absenden: {e}"), status_code=500)
@app.post("/cancel/{jobid}") @app.post("/cancel/{jobid}")
def cancel(jobid: str): def cancel(jobid: str):