riplex 0.6.3__tar.gz → 0.6.4__tar.gz

{riplex-0.6.3 → riplex-0.6.4}/.github/workflows/release.yml

@@ -164,6 +164,11 @@ jobs:
       - name: Create GitHub Release
         uses: softprops/action-gh-release@v2
         with:
+          # Auto-generate notes from commits and PRs since the previous tag,
+          # then prepend the tag annotation (if any) as a header. Using just
+          # the tag annotation produces single-line releases when the tag
+          # was created with `git tag -a -m "<subject>"` and no body.
+          generate_release_notes: true
           body: ${{ steps.tag_notes.outputs.body }}
           files: |
             release/riplex-windows.exe

{riplex-0.6.3 → riplex-0.6.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: riplex
-Version: 0.6.3
+Version: 0.6.4
 Summary: Automates the tedious manual work around MakeMKV: figuring out what to rip, which MKV files are actually what, and organizing everything into Plex-compatible folder structures.
 License: MIT
 Requires-Python: >=3.11

{riplex-0.6.3 → riplex-0.6.4}/docs/changelog.md

@@ -10,6 +10,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/).
 
 - Bumped `dvdcompare-scraper` pin to `>=0.1.15`, which adds quoted-title disc-header parsing. Boxsets such as *Back to the Future 40th Anniversary Trilogy* that glue six physical discs into a single dvdcompare disc entry are now split correctly into one PlannedDisc per physical disc.
 
+### Added
+
+- Disc Release screen: "View on dvdcompare.net" link showing the auto-selected film page so users can verify region/edition before committing to a long rip.
+- Disc Release screen: manual film-id override input. Paste either a bare fid (e.g. `55540`) or a full URL (`https://www.dvdcompare.net/comparisons/film.php?fid=55540`) and riplex will fetch and use that film page instead. The chosen fid is persisted per `(title, disc_format)` so swapping discs in the same box set keeps the override, with a "Clear saved override" affordance.
+
 ## 2026-05-12
 
 ### Added

{riplex-0.6.3 → riplex-0.6.4}/src/riplex/disc/provider.py

@@ -208,6 +208,82 @@ class DiscProvider:
     # in screens / external code may still use this; prefer ``fetch_film``.
     _fetch_film_cached = fetch_film
 
+    async def fetch_film_by_id(self, film_id: int) -> FilmComparison:
+        """Fetch a specific dvdcompare film page by its film id.
+
+        Used by the UI's manual-override path when our auto-ranking picks
+        the wrong film page. Cached on success; HTTP/network failures
+        propagate as LookupError after caching a short-TTL negative entry.
+        """
+        cache_key = cache.hash_key(f"film-by-id|{film_id}")
+
+        cached = cache.cache_get(self.cache_ns, cache_key, ttl_days=self.ttl_days)
+        if cached is not None and not cached.get("_negative"):
+            log.debug("dvdcompare film-by-id cache hit for %s", film_id)
+            return _dict_to_film(cached)
+
+        url = film_url(film_id)
+        try:
+            film = await _throttled_get_film_by_url(url)
+        except httpx.HTTPStatusError as exc:
+            status = exc.response.status_code if exc.response is not None else "?"
+            log.warning("dvdcompare HTTP %s fetching fid=%s", status, film_id)
+            raise LookupError(
+                f"dvdcompare returned HTTP {status} for fid={film_id}"
+            ) from exc
+        except httpx.RequestError as exc:
+            log.warning("dvdcompare network error fetching fid=%s: %s", film_id, exc)
+            raise LookupError(
+                f"dvdcompare network error for fid={film_id}: {exc}"
+            ) from exc
+
+        if not film.releases:
+            raise LookupError(f"dvdcompare film {film_id} has no releases")
+
+        cache.cache_set(self.cache_ns, cache_key, dataclasses.asdict(film))
+        return film
+
+
+# ---------------------------------------------------------------------------
+# Public URL / fid helpers
+# ---------------------------------------------------------------------------
+
+from dvdcompare.scraper import BASE_URL as _DVDCOMPARE_BASE_URL  # noqa: E402
+
+
+def film_url(film_id: int | str) -> str:
+    """Return the public dvdcompare comparison URL for a film id."""
+    return f"{_DVDCOMPARE_BASE_URL}/comparisons/film.php?fid={film_id}"
+
+
+_FID_RE = re.compile(r"(?:fid=|film\.php\?fid=|^)(\d+)")
+
+
+def parse_film_id(value: str) -> int | None:
+    """Extract a numeric film id from a bare number or a dvdcompare URL.
+
+    Returns ``None`` if no fid can be parsed.
+
+    Accepted forms:
+      - ``"55540"``
+      - ``"fid=55540"``
+      - ``"https://www.dvdcompare.net/comparisons/film.php?fid=55540"``
+      - ``"https://www.dvdcompare.net/comparisons/film.php?fid=55540#2"``
+    """
+    if not value:
+        return None
+    s = value.strip()
+    if not s:
+        return None
+    # Pure digits
+    if s.isdigit():
+        return int(s)
+    m = _FID_RE.search(s)
+    if m:
+        return int(m.group(1))
+    return None
+
+
 
 # ---------------------------------------------------------------------------
 # Internal helpers: negative cache + throttle
@@ -284,6 +360,21 @@ async def _throttled_find_film(
             _last_request_at = time.monotonic()
 
 
+async def _throttled_get_film_by_url(url: str) -> FilmComparison:
+    """Call ``get_film_by_url`` under the same throttle as ``find_film``."""
+    global _last_request_at
+    async with _request_lock:
+        now = time.monotonic()
+        wait = _MIN_INTERVAL_S - (now - _last_request_at)
+        if wait > 0:
+            log.debug("dvdcompare throttle: waiting %.2fs before request", wait)
+            await asyncio.sleep(wait)
+        try:
+            return await get_film_by_url(url)
+        finally:
+            _last_request_at = time.monotonic()
+
+
 async def _find_film_prefer_format(
     title: str, disc_format: str, year: int | None
 ) -> FilmComparison:

{riplex-0.6.3 → riplex-0.6.4}/src/riplex.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: riplex
-Version: 0.6.3
+Version: 0.6.4
 Summary: Automates the tedious manual work around MakeMKV: figuring out what to rip, which MKV files are actually what, and organizing everything into Plex-compatible folder structures.
 License: MIT
 Requires-Python: >=3.11

{riplex-0.6.3 → riplex-0.6.4}/src/riplex_app/screens/release.py

@@ -2,11 +2,16 @@
 
 import asyncio
 import threading
+import webbrowser
 
 import flet as ft
 
+from riplex import cache as _cache
 from riplex.disc.provider import DiscProvider, _convert_release
-from riplex.disc.provider import detect_disc_format, score_releases
+from riplex.disc.provider import detect_disc_format, film_url, parse_film_id, score_releases
+
+
+_OVERRIDE_CACHE_NS = "dvdcompare_film_id_override"
 
 
 class ReleaseScreen:
@@ -14,6 +19,8 @@ class ReleaseScreen:
         self.app = app
         self.film_comparison = None
         self._search_field: ft.TextField | None = None
+        self._fid_field: ft.TextField | None = None
+        self._fid_error: ft.Text | None = None
 
     @property
     def _next_screen(self) -> str:
@@ -73,6 +80,114 @@ class ReleaseScreen:
         self.app.state.pop("_dvdcompare_error", None)
         self.app.navigate("release")
 
+    # -- film URL / manual fid override UI --------------------------------
+
+    def _build_film_link(self, film) -> ft.Control | None:
+        """Build a "View on dvdcompare.net" button for the current film."""
+        if film is None or not getattr(film, "film_id", None):
+            return None
+        url = film_url(film.film_id)
+
+        def _open(_e, _url=url):
+            webbrowser.open(_url)
+
+        return ft.Row(
+            [
+                ft.Icon(ft.Icons.OPEN_IN_NEW, size=16, color=ft.Colors.BLUE),
+                ft.TextButton(
+                    f"View on dvdcompare.net (fid={film.film_id})",
+                    on_click=_open,
+                    tooltip=url,
+                ),
+            ],
+            spacing=4,
+        )
+
+    def _build_fid_override_section(self) -> ft.Control:
+        """Editable manual film-id / URL override input."""
+        self._fid_field = ft.TextField(
+            label="Manual override (paste dvdcompare URL or fid)",
+            hint_text="e.g. 55540 or https://www.dvdcompare.net/comparisons/film.php?fid=55540",
+            expand=True,
+            on_submit=self._on_fid_override_submit,
+        )
+        self._fid_error = ft.Text("", size=12, color=ft.Colors.RED, visible=False)
+        persisted = self._load_persisted_override()
+        hint_controls = []
+        if persisted is not None:
+            hint_controls.append(
+                ft.Row([
+                    ft.Text(
+                        f"Currently using saved override fid={persisted}.",
+                        size=12,
+                        color=ft.Colors.GREY_500,
+                    ),
+                    ft.TextButton(
+                        "Clear saved override",
+                        on_click=self._on_clear_override,
+                    ),
+                ], spacing=10),
+            )
+        return ft.Container(
+            content=ft.Column(
+                [
+                    ft.Text(
+                        "Wrong film? Open dvdcompare.net, find the right page, "
+                        "and paste its URL or fid here:",
+                        size=12,
+                        color=ft.Colors.GREY_500,
+                    ),
+                    ft.Row(
+                        [
+                            self._fid_field,
+                            ft.ElevatedButton(
+                                "Use this",
+                                icon=ft.Icons.CHECK,
+                                on_click=self._on_fid_override_submit,
+                            ),
+                        ],
+                        spacing=10,
+                    ),
+                    self._fid_error,
+                    *hint_controls,
+                ],
+                spacing=6,
+            ),
+            padding=ft.Padding(left=0, top=8, right=0, bottom=8),
+        )
+
+    def _on_fid_override_submit(self, _e):
+        if self._fid_field is None:
+            return
+        raw = (self._fid_field.value or "").strip()
+        fid = parse_film_id(raw)
+        if fid is None:
+            if self._fid_error is not None:
+                self._fid_error.value = (
+                    "Couldn't parse a film id from that input. "
+                    "Expected a number like 55540 or a "
+                    "dvdcompare.net/comparisons/film.php?fid=... URL."
+                )
+                self._fid_error.visible = True
+                self.app.page.update()
+            return
+        # Stash for the next lookup pass and trigger a refresh.
+        self.app.state["_dvdcompare_film_id_override"] = fid
+        self.app.state["release"] = None
+        self.app.state["dvdcompare_discs"] = []
+        self.app.state.pop("_dvdcompare_film", None)
+        self.app.state.pop("_dvdcompare_error", None)
+        self.app.navigate("release")
+
+    def _on_clear_override(self, _e):
+        self._clear_persisted_override()
+        self.app.state["release"] = None
+        self.app.state["dvdcompare_discs"] = []
+        self.app.state.pop("_dvdcompare_film", None)
+        self.app.state.pop("_dvdcompare_error", None)
+        self.app.navigate("release")
+
+
     def build(self) -> ft.Control:
         title = self._current_search_title()
 
@@ -166,18 +281,27 @@ class ReleaseScreen:
             value=default_value,
         )
 
+        film_link = self._build_film_link(self.film_comparison)
+        header_children = [
+            ft.Text("Disc Release", size=24, weight=ft.FontWeight.BOLD),
+            ft.Text(
+                "Multiple releases were found on dvdcompare.net. Pick the one "
+                "that matches your physical disc (region, edition, distributor).",
+                size=13,
+                color=ft.Colors.GREY_500,
+            ),
+        ]
+        if film_link is not None:
+            header_children.append(film_link)
+        header_children.append(ft.Divider(height=20))
+
         return ft.Column(
             [
-                ft.Text("Disc Release", size=24, weight=ft.FontWeight.BOLD),
-                ft.Text(
-                    "Multiple releases were found on dvdcompare.net. Pick the one "
-                    "that matches your physical disc (region, edition, distributor).",
-                    size=13,
-                    color=ft.Colors.GREY_500,
-                ),
-                ft.Divider(height=20),
+                *header_children,
                 ft.Text("Select your disc release:", size=14),
                 self.release_radio_group,
+                ft.Divider(height=20),
+                self._build_fid_override_section(),
                 ft.Container(expand=True),
                 ft.Row([
                     ft.TextButton("Back", on_click=lambda _: self.app.navigate("metadata")),
@@ -212,6 +336,8 @@ class ReleaseScreen:
                 ft.Divider(height=20),
                 self._build_search_bar(title, searching=False),
                 ft.Text(msg, size=14, color=ft.Colors.ORANGE),
+                ft.Divider(height=20),
+                self._build_fid_override_section(),
                 ft.Container(expand=True),
                 ft.Row([
                     ft.TextButton("Back", on_click=lambda _: self.app.navigate("metadata")),
@@ -238,11 +364,30 @@ class ReleaseScreen:
         try:
             disc_format = self._detect_disc_format()
             year = tmdb_match.year if tmdb_match else None
-            log.info("dvdcompare lookup: title=%r format=%r year=%r", title, disc_format, year)
             provider = DiscProvider()
-            film = asyncio.run(provider.fetch_film(title, disc_format, year=year))
-            log.info("dvdcompare lookup: found %r (%d releases)",
+
+            # Per-session manual override (just submitted).
+            session_fid = self.app.state.pop("_dvdcompare_film_id_override", None)
+            # Persisted override (set on a previous run for this title/format).
+            persisted_fid = self._load_persisted_override() if session_fid is None else None
+            override_fid = session_fid if session_fid is not None else persisted_fid
+
+            if override_fid is not None:
+                log.info("dvdcompare lookup: using film id override fid=%s (source=%s)",
+                         override_fid, "session" if session_fid is not None else "persisted")
+                film = asyncio.run(provider.fetch_film_by_id(override_fid))
+                # Persist on success so subsequent navigations / disc swaps
+                # auto-use the same fid.
+                if session_fid is not None:
+                    self._save_persisted_override(override_fid)
+            else:
+                log.info("dvdcompare lookup: title=%r format=%r year=%r",
+                         title, disc_format, year)
+                film = asyncio.run(provider.fetch_film(title, disc_format, year=year))
+
+            log.info("dvdcompare lookup: found %r (fid=%s, %d releases)",
                      film.title if film else None,
+                     film.film_id if film else None,
                      len(film.releases) if film else 0)
             self.app.state["_dvdcompare_film"] = film
         except Exception as exc:

{riplex-0.6.3 → riplex-0.6.4}/tests/test_disc_provider.py

@@ -253,3 +253,46 @@ class TestBoxsetWithQuotedTitleDiscs:
         assert planned[5].is_film is True
         assert planned[6].is_film is False
         assert planned[7].is_film is False
+
+class TestFilmUrl:
+    def test_film_url_int(self):
+        from riplex.disc.provider import film_url
+        assert film_url(55540) == "https://www.dvdcompare.net/comparisons/film.php?fid=55540"
+
+    def test_film_url_str(self):
+        from riplex.disc.provider import film_url
+        assert film_url("55540") == "https://www.dvdcompare.net/comparisons/film.php?fid=55540"
+
+
+class TestParseFilmId:
+    def test_bare_digits(self):
+        from riplex.disc.provider import parse_film_id
+        assert parse_film_id("55540") == 55540
+
+    def test_full_url(self):
+        from riplex.disc.provider import parse_film_id
+        assert parse_film_id("https://www.dvdcompare.net/comparisons/film.php?fid=55540") == 55540
+
+    def test_url_with_anchor(self):
+        from riplex.disc.provider import parse_film_id
+        assert parse_film_id("https://www.dvdcompare.net/comparisons/film.php?fid=55540#2") == 55540
+
+    def test_query_fragment(self):
+        from riplex.disc.provider import parse_film_id
+        assert parse_film_id("fid=12345") == 12345
+
+    def test_whitespace_stripped(self):
+        from riplex.disc.provider import parse_film_id
+        assert parse_film_id("  55540  ") == 55540
+
+    def test_garbage_returns_none(self):
+        from riplex.disc.provider import parse_film_id
+        assert parse_film_id("not a film id") is None
+
+    def test_empty_returns_none(self):
+        from riplex.disc.provider import parse_film_id
+        assert parse_film_id("") is None
+
+    def test_whitespace_only_returns_none(self):
+        from riplex.disc.provider import parse_film_id
+        assert parse_film_id("   ") is None