OverviewFilesCommitsIssuesDocsReleasesPeers

stremio-vsembed commits / 5f50bf7

Tell Jellyfin when a copy is added or deleted (0.25.0)
labs#13 part 5. POST /Library/Media/Updated {Path, UpdateType} after a finished ingest ("Created", after the sidecars so one call covers both) and after a delete ("Deleted"), with the stremio-vsembed API key from the gitignored jellyfin.json. Never raises, 5 s timeout, no config = no call. Measured first: Jellyfin's real-time monitor added S02E06 by itself 3 s before the ingest logged "done", so for adds this is a backstop. Deletes and sidecar pickup are verified after deploy. conftest points JELLYFIN_CONFIG at nothing for every test: stortron has the real file beside addon.py, and the suite runs there. 7 tests. Suite 448. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
5f50bf77fd7600ebde2d8978dec1b562aafed98e
by plankatron <fleeky@gmail.com> · 2026-10-05T00:52:23.000Z

Changed files (3) +164 -2

addon.py +31 -2
……@@ -619,7 +619,7 @@ TV_GENRES = [
619619
620620MANIFEST = {
621621 "id": "org.tabertron.vsembed",
622 "version": "0.24.0",
622 "version": "0.25.0",
623623 "name": "Tabertron VsEmbed",
624624 "description": "Self-hosted extractor with TMDB browse + search, played via vidcore and HdHub",
625625 "types": ["movie", "series"],
……@@ -2281,6 +2281,8 @@ def _run_ingest(kind: str, ident: str, season: int, episode: int,
22812281 log.info("ingest done: %s in %.0fs (%.2f GB)", key,
22822282 time.time() - started, os.path.getsize(dest) / 1e9)
22832283 _fetch_subtitles_for(dest, meta, season, episode)
2284 # After the sidecars, so one notification covers the copy and them.
2285 _notify_jellyfin(dest, "Created")
22842286 return "done"
22852287
22862288
……@@ -4686,8 +4688,35 @@ def _delete_copy(kind: str, tmdb: str, season: int, episode: int) -> tuple[int,
46864688 return 200, f"deleted {os.path.basename(dest)}"
46874689
46884690
4691# Jellyfin's real-time monitor picked up an ingested file on its own on
4692# 2026-10-04 (3 s before the ingest logged "done"), so for adds this is a
4693# backstop. It is here for what the monitor is not proven on -- deletes and
4694# subtitle sidecars -- and for an event the monitor misses. The key lives in a
4695# gitignored file beside this one (api key "stremio-vsembed").
4696JELLYFIN_CONFIG = os.path.join(os.path.dirname(os.path.abspath(__file__)),
4697 "jellyfin.json")
4698_jellyfin_cfg: Optional[dict] = None
4699
4700
46894701def _notify_jellyfin(path: str, update_type: str) -> None:
4690 """Tell Jellyfin a library file changed. Filled in by labs#13 part 5."""
4702 """POST /Library/Media/Updated for one path. Never raises, never blocks
4703 for long: it reports an action and must not be able to fail it."""
4704 global _jellyfin_cfg
4705 try:
4706 if _jellyfin_cfg is None:
4707 with open(JELLYFIN_CONFIG) as f:
4708 _jellyfin_cfg = json.load(f)
4709 r = requests.post(
4710 _jellyfin_cfg["url"].rstrip("/") + "/Library/Media/Updated",
4711 json={"Updates": [{"Path": path, "UpdateType": update_type}]},
4712 headers={"X-Emby-Token": _jellyfin_cfg["api_key"]}, timeout=5)
4713 r.raise_for_status()
4714 log.info("jellyfin: %s %s", update_type, os.path.basename(path))
4715 except FileNotFoundError:
4716 return
4717 except Exception as exc:
4718 log.warning("jellyfin: notify %s failed for %s (%s)",
4719 update_type, os.path.basename(path), exc)
46914720
46924721
46934722def _web_delete_form(kind: str, tmdb: str, season: int, episode: int,
conftest.py +5 -0
……@@ -21,4 +21,9 @@ def no_hdhub_network(monkeypatch):
2121 monkeypatch.setattr(addon, "_hdhub_query", refuse)
2222 monkeypatch.setattr(addon, "_hdhub_cache", {})
2323 monkeypatch.setattr(addon, "_hdhub_pick_cache", {})
24 # On stortron the real jellyfin.json sits beside addon.py; without this any
25 # test reaching an ingest or a delete would report temp paths to the
26 # production Jellyfin. test_jellyfin_notify points it at its own file.
27 monkeypatch.setattr(addon, "JELLYFIN_CONFIG", "/nonexistent/jellyfin.json")
28 monkeypatch.setattr(addon, "_jellyfin_cfg", None)
2429 yield
test_jellyfin_notify.py +128 -0
……@@ -0,0 +1,128 @@
1"""Tell Jellyfin when a library file is added or removed (labs#13).
2
3Measured 2026-10-04: Jellyfin's real-time monitor picked up S02E06 by itself
4three seconds before the ingest finished logging, so for ADDS this is a
5backstop. It exists for the cases the monitor is not proven on -- deletes and
6subtitle sidecars -- and for a monitor that misses an event (inotify on a USB
7exFAT volume is not something to bet on silently).
8
9It must never fail or delay the thing it reports: no config -> nothing; any
10error -> logged and dropped.
11
12Run: .venv/bin/python3 -m pytest test_jellyfin_notify.py -q
13"""
14
15import json
16import os
17import threading
18
19import pytest
20
21import addon
22
23
24@pytest.fixture
25def config(tmp_path, monkeypatch):
26 path = tmp_path / "jellyfin.json"
27 path.write_text(json.dumps({"url": "http://jf:8096", "api_key": "k123"}))
28 monkeypatch.setattr(addon, "JELLYFIN_CONFIG", str(path))
29 monkeypatch.setattr(addon, "_jellyfin_cfg", None)
30 return path
31
32
33@pytest.fixture
34def posts(monkeypatch):
35 sent = []
36
37 class Resp:
38 status_code = 204
39
40 def raise_for_status(self):
41 pass
42
43 def post(url, json=None, headers=None, timeout=None):
44 sent.append({"url": url, "json": json, "headers": headers, "timeout": timeout})
45 return Resp()
46 monkeypatch.setattr(addon.requests, "post", post)
47 return sent
48
49
50def test_it_posts_a_targeted_media_update(config, posts):
51 addon._notify_jellyfin("/mnt/usb/Shows/A/a.mp4", "Created")
52 (p,) = posts
53 assert p["url"] == "http://jf:8096/Library/Media/Updated"
54 assert p["headers"]["X-Emby-Token"] == "k123"
55 assert p["json"] == {"Updates": [{"Path": "/mnt/usb/Shows/A/a.mp4",
56 "UpdateType": "Created"}]}
57 assert p["timeout"] and p["timeout"] <= 10
58
59
60def test_no_config_means_no_call(tmp_path, monkeypatch, posts):
61 monkeypatch.setattr(addon, "JELLYFIN_CONFIG", str(tmp_path / "absent.json"))
62 monkeypatch.setattr(addon, "_jellyfin_cfg", None)
63 addon._notify_jellyfin("/x.mp4", "Created")
64 assert posts == []
65
66
67def test_a_jellyfin_failure_never_raises(config, monkeypatch):
68 def down(*a, **k):
69 raise addon.requests.ConnectionError("refused")
70 monkeypatch.setattr(addon.requests, "post", down)
71 addon._notify_jellyfin("/x.mp4", "Deleted") # must not raise
72
73
74def test_a_bad_config_never_raises(tmp_path, monkeypatch, posts):
75 bad = tmp_path / "jellyfin.json"
76 bad.write_text("{not json")
77 monkeypatch.setattr(addon, "JELLYFIN_CONFIG", str(bad))
78 monkeypatch.setattr(addon, "_jellyfin_cfg", None)
79 addon._notify_jellyfin("/x.mp4", "Created")
80 assert posts == []
81
82
83def test_the_suite_never_reaches_the_real_jellyfin():
84 """conftest points JELLYFIN_CONFIG at nothing for every test. On stortron
85 the real jellyfin.json sits beside addon.py; without the guard any test
86 reaching an ingest would report temp paths to the production server."""
87 assert not os.path.exists(addon.JELLYFIN_CONFIG)
88
89
90# --- wiring -----------------------------------------------------------------
91
92META = {"tmdb_id": "1", "title": "Show", "year": "2020",
93 "episode_title": "Six", "runtime": 30}
94
95
96def test_a_finished_ingest_reports_created(tmp_path, monkeypatch):
97 monkeypatch.setattr(addon, "LIBRARY_ROOT", str(tmp_path / "lib"))
98 monkeypatch.setattr(addon, "INGEST_QUEUE_FILE", str(tmp_path / "q.json"))
99 monkeypatch.setattr(addon, "INGEST_HISTORY_FILE", str(tmp_path / "h.jsonl"))
100 monkeypatch.setattr(addon, "_library_meta", lambda *a, **k: dict(META))
101 monkeypatch.setattr(addon, "_enough_space", lambda: True)
102 monkeypatch.setattr(addon, "_library_has", lambda *a, **k: False)
103 monkeypatch.setattr(addon, "_resolve_vidcore", lambda *a, **k: "http://cdn/m")
104 monkeypatch.setattr(addon, "_cap_variant", lambda u, h=None: u)
105 monkeypatch.setattr(addon, "_fetch_subtitles_for", lambda *a, **k: None)
106
107 def remux(url, dest):
108 os.makedirs(os.path.dirname(dest), exist_ok=True)
109 open(dest, "wb").write(b"x")
110 monkeypatch.setattr(addon, "_remux_to_mp4", remux)
111 seen = []
112 monkeypatch.setattr(addon, "_notify_jellyfin", lambda p, t: seen.append((p, t)))
113 assert addon._run_ingest("series", "tmdb:1", 2, 6, 1080) == "done"
114 assert len(seen) == 1 and seen[0][1] == "Created"
115 assert seen[0][0].endswith("Show (2020) - S02E06 - Six.mp4")
116
117
118def test_a_failed_ingest_reports_nothing(tmp_path, monkeypatch):
119 monkeypatch.setattr(addon, "LIBRARY_ROOT", str(tmp_path / "lib"))
120 monkeypatch.setattr(addon, "_library_meta", lambda *a, **k: dict(META))
121 monkeypatch.setattr(addon, "_enough_space", lambda: True)
122 monkeypatch.setattr(addon, "_library_has", lambda *a, **k: False)
123 monkeypatch.setattr(addon, "_resolve_vidcore", lambda *a, **k: None)
124 monkeypatch.setattr(addon, "_ingest_from_hdhub", lambda *a, **k: "no usable file")
125 seen = []
126 monkeypatch.setattr(addon, "_notify_jellyfin", lambda p, t: seen.append((p, t)))
127 assert addon._run_ingest("series", "tmdb:1", 2, 6, 1080).startswith("failed")
128 assert seen == []