Add PelixPlay HD 16-thread downloader and auto-metadata
Browse files- _panel_app.py +30 -3
_panel_app.py
CHANGED
|
@@ -352,6 +352,26 @@ def _verify_and_extract_hls_segments(master_url, referer, ua):
|
|
| 352 |
if r_s0.status_code != 200 or len(r_s0.content) < 1000:
|
| 353 |
return None
|
| 354 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 355 |
return variant_url, seg_urls, res_label
|
| 356 |
|
| 357 |
|
|
@@ -847,19 +867,25 @@ def resolve_pelixplay_hls(tmdb_id, media_type="movie", season=1, episode=1, skip
|
|
| 847 |
html_txt = r_w.text
|
| 848 |
unpacked = unpack_js_eval(html_txt)
|
| 849 |
if unpacked:
|
| 850 |
-
for hls_key in ["
|
| 851 |
m_h = re.search(rf'"{hls_key}"\s*:\s*"([^"]+)"', unpacked)
|
| 852 |
if m_h:
|
| 853 |
raw_hls = m_h.group(1).replace("\\/", "/")
|
| 854 |
full_hls = urljoin(emb_origin + "/", raw_hls)
|
| 855 |
-
|
|
|
|
|
|
|
|
|
|
| 856 |
if verified:
|
| 857 |
variant_url, seg_urls, res_label = verified
|
| 858 |
return variant_url, seg_urls, res_label, emb_origin + "/", data.get("tmdb_title"), emb_url
|
| 859 |
# También buscar sources:[{file:"...m3u8"}] (usado por Vidmoly / VidSpeed / VOE)
|
| 860 |
for m_f in re.finditer(r'''["'](https?://[^"']+\.m3u8[^"']*)["']''', unpacked + "\n" + html_txt):
|
| 861 |
cand_hls = m_f.group(1).replace("\\/", "/")
|
| 862 |
-
|
|
|
|
|
|
|
|
|
|
| 863 |
if verified:
|
| 864 |
variant_url, seg_urls, res_label = verified
|
| 865 |
return variant_url, seg_urls, res_label, emb_origin + "/", data.get("tmdb_title"), emb_url
|
|
@@ -1078,6 +1104,7 @@ def download_pelixplay_to_mp4(job, p_info, job_dir):
|
|
| 1078 |
break
|
| 1079 |
|
| 1080 |
last_srv_err = RuntimeError(f"Fallo descargando segmento {still_failed[0][0]}/{total_segs}")
|
|
|
|
| 1081 |
if srv_attempt == 2:
|
| 1082 |
shutil.rmtree(seg_dir, ignore_errors=True)
|
| 1083 |
raise last_srv_err
|
|
|
|
| 352 |
if r_s0.status_code != 200 or len(r_s0.content) < 1000:
|
| 353 |
return None
|
| 354 |
|
| 355 |
+
# Probar tambien un segmento del medio y el ultimo: descarta rutas (CDN) que arrancan bien pero se traban despues
|
| 356 |
+
for probe_idx in (len(seg_urls) // 2, len(seg_urls) - 1):
|
| 357 |
+
try:
|
| 358 |
+
p_hdrs = dict(hdrs)
|
| 359 |
+
p_hdrs["Range"] = "bytes=0-2047"
|
| 360 |
+
r_p = requests.get(seg_urls[probe_idx], headers=p_hdrs, timeout=(6, 10), stream=True)
|
| 361 |
+
ok_probe = r_p.status_code in (200, 206)
|
| 362 |
+
if ok_probe:
|
| 363 |
+
got = 0
|
| 364 |
+
for chunk_p in r_p.iter_content(chunk_size=1024):
|
| 365 |
+
got += len(chunk_p)
|
| 366 |
+
if got >= 512:
|
| 367 |
+
break
|
| 368 |
+
ok_probe = got >= 512
|
| 369 |
+
r_p.close()
|
| 370 |
+
if not ok_probe:
|
| 371 |
+
return None
|
| 372 |
+
except Exception:
|
| 373 |
+
return None
|
| 374 |
+
|
| 375 |
return variant_url, seg_urls, res_label
|
| 376 |
|
| 377 |
|
|
|
|
| 867 |
html_txt = r_w.text
|
| 868 |
unpacked = unpack_js_eval(html_txt)
|
| 869 |
if unpacked:
|
| 870 |
+
for hls_key in ["hls2", "hls4", "hls3"]:
|
| 871 |
m_h = re.search(rf'"{hls_key}"\s*:\s*"([^"]+)"', unpacked)
|
| 872 |
if m_h:
|
| 873 |
raw_hls = m_h.group(1).replace("\\/", "/")
|
| 874 |
full_hls = urljoin(emb_origin + "/", raw_hls)
|
| 875 |
+
try:
|
| 876 |
+
verified = _verify_and_extract_hls_segments(full_hls, emb_origin + "/", ua)
|
| 877 |
+
except Exception:
|
| 878 |
+
verified = None
|
| 879 |
if verified:
|
| 880 |
variant_url, seg_urls, res_label = verified
|
| 881 |
return variant_url, seg_urls, res_label, emb_origin + "/", data.get("tmdb_title"), emb_url
|
| 882 |
# También buscar sources:[{file:"...m3u8"}] (usado por Vidmoly / VidSpeed / VOE)
|
| 883 |
for m_f in re.finditer(r'''["'](https?://[^"']+\.m3u8[^"']*)["']''', unpacked + "\n" + html_txt):
|
| 884 |
cand_hls = m_f.group(1).replace("\\/", "/")
|
| 885 |
+
try:
|
| 886 |
+
verified = _verify_and_extract_hls_segments(cand_hls, emb_origin + "/", ua)
|
| 887 |
+
except Exception:
|
| 888 |
+
verified = None
|
| 889 |
if verified:
|
| 890 |
variant_url, seg_urls, res_label = verified
|
| 891 |
return variant_url, seg_urls, res_label, emb_origin + "/", data.get("tmdb_title"), emb_url
|
|
|
|
| 1104 |
break
|
| 1105 |
|
| 1106 |
last_srv_err = RuntimeError(f"Fallo descargando segmento {still_failed[0][0]}/{total_segs}")
|
| 1107 |
+
print(f"[pelix] {chosen_emb} ({res_label}) fallo {len(still_failed)} segmentos, probando otro servidor...")
|
| 1108 |
if srv_attempt == 2:
|
| 1109 |
shutil.rmtree(seg_dir, ignore_errors=True)
|
| 1110 |
raise last_srv_err
|