|
|
|
@@ -56,6 +56,7 @@ POLL_SECONDS = float(os.environ.get("POLL_SECONDS", "5"))
|
|
|
|
|
|
|
|
|
|
|
|
# JDownloader writes here inside container
|
|
|
|
# JDownloader writes here inside container
|
|
|
|
JD_OUTPUT_PATH = "/output"
|
|
|
|
JD_OUTPUT_PATH = "/output"
|
|
|
|
|
|
|
|
PROXY_EXPORT_PATH = os.environ.get("PROXY_EXPORT_PATH", "/output/jd-proxies.jdproxies")
|
|
|
|
|
|
|
|
|
|
|
|
URL_RE = re.compile(r"^https?://", re.I)
|
|
|
|
URL_RE = re.compile(r"^https?://", re.I)
|
|
|
|
|
|
|
|
|
|
|
|
@@ -365,6 +366,17 @@ def fetch_proxy_list(url: str) -> str:
|
|
|
|
with urllib.request.urlopen(req, timeout=20) as resp:
|
|
|
|
with urllib.request.urlopen(req, timeout=20) as resp:
|
|
|
|
return resp.read().decode("utf-8", "replace")
|
|
|
|
return resp.read().decode("utf-8", "replace")
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def save_proxy_export(text: str) -> str:
|
|
|
|
|
|
|
|
if not text.strip():
|
|
|
|
|
|
|
|
raise ValueError("Keine Proxy-Einträge zum Speichern.")
|
|
|
|
|
|
|
|
export_path = PROXY_EXPORT_PATH
|
|
|
|
|
|
|
|
export_dir = os.path.dirname(export_path)
|
|
|
|
|
|
|
|
if export_dir:
|
|
|
|
|
|
|
|
os.makedirs(export_dir, exist_ok=True)
|
|
|
|
|
|
|
|
with open(export_path, "w", encoding="utf-8") as handle:
|
|
|
|
|
|
|
|
handle.write(text.strip() + "\n")
|
|
|
|
|
|
|
|
return export_path
|
|
|
|
|
|
|
|
|
|
|
|
def pick_library_target(library_choice: str, filename: str, package_name: str) -> str:
|
|
|
|
def pick_library_target(library_choice: str, filename: str, package_name: str) -> str:
|
|
|
|
if library_choice not in {"movies", "series", "auto"}:
|
|
|
|
if library_choice not in {"movies", "series", "auto"}:
|
|
|
|
library_choice = "auto"
|
|
|
|
library_choice = "auto"
|
|
|
|
@@ -829,8 +841,17 @@ def render_nav(active: str) -> str:
|
|
|
|
+ "</div>"
|
|
|
|
+ "</div>"
|
|
|
|
)
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
def render_proxies_page(error: str = "", socks5_in: str = "", socks4_in: str = "", http_in: str = "", out_text: str = "") -> str:
|
|
|
|
def render_proxies_page(
|
|
|
|
|
|
|
|
error: str = "",
|
|
|
|
|
|
|
|
message: str = "",
|
|
|
|
|
|
|
|
socks5_in: str = "",
|
|
|
|
|
|
|
|
socks4_in: str = "",
|
|
|
|
|
|
|
|
http_in: str = "",
|
|
|
|
|
|
|
|
out_text: str = "",
|
|
|
|
|
|
|
|
export_path: str = "",
|
|
|
|
|
|
|
|
) -> str:
|
|
|
|
err_html = f"<p class='error'>{error}</p>" if error else ""
|
|
|
|
err_html = f"<p class='error'>{error}</p>" if error else ""
|
|
|
|
|
|
|
|
msg_html = f"<p class='success'>{message}</p>" if message else ""
|
|
|
|
return f"""
|
|
|
|
return f"""
|
|
|
|
<html>
|
|
|
|
<html>
|
|
|
|
<head>
|
|
|
|
<head>
|
|
|
|
@@ -842,6 +863,7 @@ def render_proxies_page(error: str = "", socks5_in: str = "", socks4_in: str = "
|
|
|
|
<h1>JD → Jellyfin</h1>
|
|
|
|
<h1>JD → Jellyfin</h1>
|
|
|
|
{render_nav("proxies")}
|
|
|
|
{render_nav("proxies")}
|
|
|
|
{err_html}
|
|
|
|
{err_html}
|
|
|
|
|
|
|
|
{msg_html}
|
|
|
|
|
|
|
|
|
|
|
|
<form method="post" action="/proxies">
|
|
|
|
<form method="post" action="/proxies">
|
|
|
|
<div class="row">
|
|
|
|
<div class="row">
|
|
|
|
@@ -870,6 +892,18 @@ def render_proxies_page(error: str = "", socks5_in: str = "", socks4_in: str = "
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
|
|
|
|
|
|
|
|
<button type="button" onclick="navigator.clipboard.writeText(document.getElementById('out').value)">Kopieren</button>
|
|
|
|
<button type="button" onclick="navigator.clipboard.writeText(document.getElementById('out').value)">Kopieren</button>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<h2 style="margin-top:18px;">Datei für Connection Manager</h2>
|
|
|
|
|
|
|
|
<p class="hint">Speichert die Liste als <code>.jdproxies</code> im Container, z. B. zum Import in JDownloader → Verbindungsmanager → Importieren.</p>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<form method="post" action="/proxies/save">
|
|
|
|
|
|
|
|
<textarea name="socks5_in" style="display:none;">{socks5_in}</textarea>
|
|
|
|
|
|
|
|
<textarea name="socks4_in" style="display:none;">{socks4_in}</textarea>
|
|
|
|
|
|
|
|
<textarea name="http_in" style="display:none;">{http_in}</textarea>
|
|
|
|
|
|
|
|
<button type="submit">Liste als JDProxies speichern</button>
|
|
|
|
|
|
|
|
</form>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<p class="hint">Aktueller Pfad: <code>{export_path or PROXY_EXPORT_PATH}</code></p>
|
|
|
|
</body>
|
|
|
|
</body>
|
|
|
|
</html>
|
|
|
|
</html>
|
|
|
|
"""
|
|
|
|
"""
|
|
|
|
@@ -947,7 +981,8 @@ def proxies_get():
|
|
|
|
socks5_in=socks5_in,
|
|
|
|
socks5_in=socks5_in,
|
|
|
|
socks4_in=socks4_in,
|
|
|
|
socks4_in=socks4_in,
|
|
|
|
http_in=http_in,
|
|
|
|
http_in=http_in,
|
|
|
|
out_text=combined
|
|
|
|
out_text=combined,
|
|
|
|
|
|
|
|
export_path=PROXY_EXPORT_PATH,
|
|
|
|
))
|
|
|
|
))
|
|
|
|
except Exception as e:
|
|
|
|
except Exception as e:
|
|
|
|
return HTMLResponse(render_proxies_page(error=str(e)), status_code=502)
|
|
|
|
return HTMLResponse(render_proxies_page(error=str(e)), status_code=502)
|
|
|
|
@@ -968,7 +1003,8 @@ def proxies_post(
|
|
|
|
socks5_in=socks5_in,
|
|
|
|
socks5_in=socks5_in,
|
|
|
|
socks4_in=socks4_in,
|
|
|
|
socks4_in=socks4_in,
|
|
|
|
http_in=http_in,
|
|
|
|
http_in=http_in,
|
|
|
|
out_text=combined
|
|
|
|
out_text=combined,
|
|
|
|
|
|
|
|
export_path=PROXY_EXPORT_PATH,
|
|
|
|
))
|
|
|
|
))
|
|
|
|
except Exception as e:
|
|
|
|
except Exception as e:
|
|
|
|
return HTMLResponse(render_proxies_page(
|
|
|
|
return HTMLResponse(render_proxies_page(
|
|
|
|
@@ -976,5 +1012,36 @@ def proxies_post(
|
|
|
|
socks5_in=socks5_in,
|
|
|
|
socks5_in=socks5_in,
|
|
|
|
socks4_in=socks4_in,
|
|
|
|
socks4_in=socks4_in,
|
|
|
|
http_in=http_in,
|
|
|
|
http_in=http_in,
|
|
|
|
out_text=""
|
|
|
|
out_text="",
|
|
|
|
|
|
|
|
export_path=PROXY_EXPORT_PATH,
|
|
|
|
|
|
|
|
), status_code=400)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@app.post("/proxies/save", response_class=HTMLResponse)
|
|
|
|
|
|
|
|
def proxies_save(
|
|
|
|
|
|
|
|
socks5_in: str = Form(""),
|
|
|
|
|
|
|
|
socks4_in: str = Form(""),
|
|
|
|
|
|
|
|
http_in: str = Form(""),
|
|
|
|
|
|
|
|
):
|
|
|
|
|
|
|
|
try:
|
|
|
|
|
|
|
|
s5 = format_proxy_lines(socks5_in, "socks5")
|
|
|
|
|
|
|
|
s4 = format_proxy_lines(socks4_in, "socks4")
|
|
|
|
|
|
|
|
hp = format_proxy_lines(http_in, "http")
|
|
|
|
|
|
|
|
combined = "\n".join([x for x in [s5, s4, hp] if x.strip()])
|
|
|
|
|
|
|
|
export_path = save_proxy_export(combined)
|
|
|
|
|
|
|
|
return HTMLResponse(render_proxies_page(
|
|
|
|
|
|
|
|
message=f"Proxy-Liste gespeichert: {export_path}",
|
|
|
|
|
|
|
|
socks5_in=socks5_in,
|
|
|
|
|
|
|
|
socks4_in=socks4_in,
|
|
|
|
|
|
|
|
http_in=http_in,
|
|
|
|
|
|
|
|
out_text=combined,
|
|
|
|
|
|
|
|
export_path=export_path,
|
|
|
|
|
|
|
|
))
|
|
|
|
|
|
|
|
except Exception as e:
|
|
|
|
|
|
|
|
return HTMLResponse(render_proxies_page(
|
|
|
|
|
|
|
|
error=str(e),
|
|
|
|
|
|
|
|
socks5_in=socks5_in,
|
|
|
|
|
|
|
|
socks4_in=socks4_in,
|
|
|
|
|
|
|
|
http_in=http_in,
|
|
|
|
|
|
|
|
out_text="",
|
|
|
|
|
|
|
|
export_path=PROXY_EXPORT_PATH,
|
|
|
|
), status_code=400)
|
|
|
|
), status_code=400)
|
|
|
|
|
