555f6ca · stremio-vsembed

Changed files (2) +76 -5

addon.py +32 -5

…	…	@@ -533,7 +533,7 @@ TV_GENRES = [
533	533
534	534	MANIFEST = {
535	535	"id": "org.tabertron.vsembed",
536		"version": "0.12.1",
	536	"version": "0.12.2",
537	537	"name": "Tabertron VsEmbed",
538	538	"description": "Self-hosted HLS extractor with TMDB browse + search, played via vidcore",
539	539	"types": ["movie", "series"],
…	…	@@ -1007,6 +1007,26 @@ def _serve_vidcore(url: str):
1007	1007	return redirect(_cap_variant(url, _requested_height()), code=302)
1008	1008
1009	1009
	1010	def _local_redirect(kind: str, ident: str, season: int, episode: int,
	1011	height: int):
	1012	"""302 to the local copy when we hold one, else None.
	1013
	1014	Checked BEFORE resolving, which is the substance of this rather than the
	1015	redirect itself: a resolve costs ~11s and launches a browser, and paying
	1016	that for a title already sitting on disk is pure waste.
	1017
	1018	Redirecting rather than serving inline hands the player a URL that actually
	1019	ends in .mp4, and routes it through /mp4/ — the single place local files are
	1020	served, so Range support and rolling forward are not duplicated here.
	1021	"""
	1022	if not _playable_path(kind, ident, season, episode, height):
	1023	return None
	1024	path = (f"/mp4/series/{ident}:{season}:{episode}.mp4" if kind == "series"
	1025	else f"/mp4/movie/{ident}.mp4")
	1026	log.info("vidcore: serving %s from the local copy", ident)
	1027	return redirect(f"{path}?h={height}", code=302)
	1028
	1029
1010	1030	def _log_client_headers(route: str) -> None:
1011	1031	"""Record which request headers the client actually forwarded.
1012	1032
…	…	@@ -1023,12 +1043,16 @@ def vidcore_movie(ident: str):
1023	1043	_log_client_headers("vidcore/movie")
1024	1044	if not re.fullmatch(VIDCORE_IDENT, ident):
1025	1045	abort(404)
	1046	height = _requested_height()
	1047	local = _local_redirect("movie", ident, 0, 0, height)
	1048	if local:
	1049	return local
1026	1050	url = _resolve_vidcore("movie", ident)
1027	1051	if not url:
1028	1052	abort(404)
1029	1053	# Playing is the honest "I chose this" signal, so keep a copy of what is
1030	1054	# being watched. Idempotent, and skipped when the library already has it.
1031		_ensure_ingest("movie", ident, height=_requested_height())
	1055	_ensure_ingest("movie", ident, height=height)
1032	1056	return _serve_vidcore(url)
1033	1057
1034	1058
…	…	@@ -1038,11 +1062,14 @@ def vidcore_series(ident: str):
1038	1062	m = re.fullmatch(rf"({VIDCORE_IDENT}):(\d+):(\d+)", ident)
1039	1063	if not m:
1040	1064	abort(404)
1041		url = _resolve_vidcore("series", m.group(1), int(m.group(2)), int(m.group(3)))
1042		if not url:
1043		abort(404)
1044	1065	season, episode = int(m.group(2)), int(m.group(3))
1045	1066	height = _requested_height()
	1067	local = _local_redirect("series", m.group(1), season, episode, height)
	1068	if local:
	1069	return local
	1070	url = _resolve_vidcore("series", m.group(1), season, episode)
	1071	if not url:
	1072	abort(404)
1046	1073	_ensure_ingest("series", m.group(1), season, episode, height=height)
1047	1074	_queue_next_episode(m.group(1), season, episode, height)
1048	1075	return _serve_vidcore(url)

test_library_ingest.py +44 -0

…	…	@@ -612,6 +612,50 @@ def test_a_tmdb_failure_stops_rolling_rather_than_guessing(rolling, monkeypatch)
612	612	assert addon._next_episode("1", 1, 1) is None
613	613
614	614
	615	# --- the vidcore rows also prefer a local copy ------------------------------
	616
	617	def test_a_vidcore_row_redirects_to_the_local_copy(rolling):
	618	"""Playing "720p vidcore" on a title already in the library streamed from
	619	the CDN, ignoring the seekable file sitting on disk."""
	620	dest = addon._library_path("series", "Show", "2020", "1",
	621	season=1, episode=1, episode_title="E1")
	622	os.makedirs(os.path.dirname(dest), exist_ok=True)
	623	open(dest, "wb").write(b"x" * 10)
	624	r = addon.app.test_client().get("/vidcore/series/tmdb:1:1:1.m3u8?h=720")
	625	assert r.status_code == 302
	626	assert "/mp4/series/tmdb:1:1:1.mp4" in r.headers["Location"]
	627
	628
	629	def test_the_local_check_happens_before_the_browser_resolve(rolling, monkeypatch):
	630	"""A resolve costs ~11s and launches a browser. Paying that for a title we
	631	already hold on disk is the whole point of checking first."""
	632	resolved = []
	633	monkeypatch.setattr(addon, "_resolve_vidcore",
	634	lambda a, *k: resolved.append(a) or "http://cdn/m.m3u8")
	635	dest = addon._library_path("series", "Show", "2020", "1",
	636	season=1, episode=1, episode_title="E1")
	637	os.makedirs(os.path.dirname(dest), exist_ok=True)
	638	open(dest, "wb").write(b"x" * 10)
	639	addon.app.test_client().get("/vidcore/series/tmdb:1:1:1.m3u8?h=720")
	640	assert resolved == [], "no browser should be launched for a local title"
	641
	642
	643	def test_without_a_local_copy_the_vidcore_row_still_streams(rolling):
	644	r = addon.app.test_client().get("/vidcore/series/tmdb:1:1:1.m3u8?h=720")
	645	assert r.status_code == 302
	646	assert "/mp4/" not in r.headers["Location"]
	647
	648
	649	def test_a_movie_vidcore_row_also_prefers_the_local_copy(rolling, tmdb):
	650	tmdb.responses["movie/5"] = {"title": "Film", "release_date": "2020-01-01"}
	651	dest = addon._library_path("movie", "Film", "2020", "5")
	652	os.makedirs(os.path.dirname(dest), exist_ok=True)
	653	open(dest, "wb").write(b"x" * 10)
	654	r = addon.app.test_client().get("/vidcore/movie/tmdb:5.m3u8?h=720")
	655	assert r.status_code == 302
	656	assert "/mp4/movie/tmdb:5.mp4" in r.headers["Location"]
	657
	658
615	659	def test_ingest_resolves_at_run_time_not_at_queue_time(ingest, monkeypatch):
616	660	"""Variant URLs are signed and expire in ~4h. A job that resolved when it
617	661	was queued would fetch a dead link once the queue backs up."""

stremio-vsembed commits / 555f6ca

Changed files (2) +76 -5