riplex 0.9.1__tar.gz → 0.9.3__tar.gz

{riplex-0.9.1/src/riplex.egg-info → riplex-0.9.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: riplex
-Version: 0.9.1
+Version: 0.9.3
 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.9.1 → riplex-0.9.3}/docs/changelog.md

@@ -4,6 +4,12 @@ All notable changes to the riplex documentation are recorded here.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/).
 
+## v0.9.2 — 2026-06-24
+
+### Fixed
+
+- **TMDb credentials: accept both the API Key and the Read Access Token.** TMDb's settings page offers a v3 API Key (query parameter auth) and a v4 API Read Access Token (bearer header auth). riplex now auto-detects which credential was provided and uses the matching auth scheme, so pasting the Read Access Token no longer fails with `401 Unauthorized`. The setup wizard, GUI welcome screen, and docs now note that either credential works.
+
 ## v0.9.0 — 2026-06-13
 
 Summary: Plex-aligned movie version and edition support for combo-disc releases, with better organize preview matching for 4K, Blu-ray, and 3D movie rips.

{riplex-0.9.1 → riplex-0.9.3}/docs/getting-started/installation.md

@@ -243,6 +243,9 @@ The setup wizard will:
     > enter "riplex" as the app name and `https://github.com/AnyCredit5518/riplex`
     > as the URL. The rest of the form can be filled with basic info -- it
     > doesn't need to be a real business. The key is approved instantly.
+    >
+    > The settings page offers both an **API Key** (v3) and an **API Read
+    > Access Token** (v4). riplex accepts either one.
 
 2. Ask where your Plex library and MakeMKV rip folders are
 3. Check for required tools (MakeMKV, ffprobe, mkvmerge, mkvpropedit)

{riplex-0.9.1 → riplex-0.9.3}/docs/troubleshooting.md

@@ -74,6 +74,8 @@ riplex setup --force
 
 **Solution:** TMDb asks for an app name and URL when you request a key. You can enter "riplex" as the app name and `https://github.com/AnyCredit5518/riplex` as the URL. The rest of the form can be filled with basic info - it doesn't need to be a real business. The key is approved instantly.
 
+The settings page shows two credentials: an **API Key** (v3) and an **API Read Access Token** (v4). riplex accepts either one - paste whichever you copied. If you get a `401 Unauthorized` error, double-check that the value was copied in full.
+
 Sign up and request a key at: https://www.themoviedb.org/settings/api
 
 ---

{riplex-0.9.1 → riplex-0.9.3}/src/riplex/metadata/sources/tmdb.py

@@ -28,22 +28,44 @@ TMDB_BASE_URL = "https://api.themoviedb.org/3"
 _TMDB_TTL_DAYS = 7
 
 
+def _looks_like_read_access_token(key: str) -> bool:
+    """Return ``True`` when *key* looks like a TMDb v4 Read Access Token.
+
+    TMDb's settings page offers two credentials: a v3 ``API Key`` (a 32-char
+    hex string used as the ``api_key`` query parameter) and a v4 ``API Read
+    Access Token`` (a JWT used as an ``Authorization: Bearer`` header). The
+    v4 token is a JWT, so it starts with ``eyJ`` and contains exactly two
+    dots; a v3 key never does.
+    """
+    return key.startswith("eyJ") and key.count(".") == 2
+
+
 class TmdbProvider(MetadataProvider):
     """Metadata provider backed by TMDb API v3."""
 
     def __init__(self, api_key: str | None = None) -> None:
-        self._api_key = api_key or os.environ.get("TMDB_API_KEY", "")
+        self._api_key = (api_key or os.environ.get("TMDB_API_KEY", "")).strip()
         if not self._api_key:
             raise ValueError(
                 "TMDb API key is required. Pass --api-key, set the "
                 "TMDB_API_KEY environment variable, or add tmdb_api_key "
                 "to your config file."
             )
-        self._client = httpx.AsyncClient(
-            base_url=TMDB_BASE_URL,
-            params={"api_key": self._api_key},
-            timeout=30.0,
-        )
+        # TMDb accepts either a v3 API Key (query parameter) or a v4 Read
+        # Access Token (Authorization header) against the v3 endpoints. Pick
+        # the matching auth scheme so both credential types work.
+        if _looks_like_read_access_token(self._api_key):
+            self._client = httpx.AsyncClient(
+                base_url=TMDB_BASE_URL,
+                headers={"Authorization": f"Bearer {self._api_key}"},
+                timeout=30.0,
+            )
+        else:
+            self._client = httpx.AsyncClient(
+                base_url=TMDB_BASE_URL,
+                params={"api_key": self._api_key},
+                timeout=30.0,
+            )
 
     async def close(self) -> None:
         await self._client.aclose()
@@ -61,6 +83,13 @@ class TmdbProvider(MetadataProvider):
             if cached is not None:
                 return cached
         resp = await self._client.get(path, params=params)
+        if resp.status_code == 401:
+            raise ValueError(
+                "TMDb rejected the credential (401 Unauthorized). Check that "
+                "your TMDb API Key (v3) or API Read Access Token (v4) is "
+                "correct. Both are available at "
+                "https://www.themoviedb.org/settings/api."
+            )
         resp.raise_for_status()
         data = resp.json()
         if cache_ns and cache_key:

{riplex-0.9.1 → riplex-0.9.3}/src/riplex/scanner.py

@@ -4,6 +4,7 @@ from __future__ import annotations
 
 import json
 import logging
+import os
 import platform
 import shutil
 import subprocess
@@ -30,16 +31,44 @@ _FFPROBE_SEARCH_PATHS = [
 ]
 
 
+def _windows_ffprobe_candidates() -> list[Path]:
+    """Return likely ``ffprobe.exe`` locations from winget and manual installs.
+
+    riplex installs FFmpeg via ``winget install Gyan.FFmpeg``, which is a
+    portable package: winget drops a shim under ``WinGet\\Links`` and unpacks
+    the payload under ``WinGet\\Packages\\Gyan.FFmpeg*\\...\\bin``. Neither is on
+    PATH in the current process right after install, so check them directly.
+    """
+    candidates: list[Path] = []
+    local_appdata = os.environ.get("LOCALAPPDATA")
+    if local_appdata:
+        winget = Path(local_appdata) / "Microsoft" / "WinGet"
+        candidates.append(winget / "Links" / "ffprobe.exe")
+        packages = winget / "Packages"
+        if packages.is_dir():
+            candidates.extend(packages.glob("Gyan.FFmpeg*/**/bin/ffprobe.exe"))
+    # Common manual install spots
+    candidates.append(Path(r"C:\ffmpeg\bin\ffprobe.exe"))
+    candidates.append(Path(r"C:\Program Files\ffmpeg\bin\ffprobe.exe"))
+    return candidates
+
+
 def find_ffprobe() -> str | None:
     """Locate the ffprobe executable.
 
     Checks PATH first, then ``~/.riplex/bin/``, ``/usr/local/bin/``,
-    and ``/opt/homebrew/bin/``.  Returns the path string or *None*.
+    and ``/opt/homebrew/bin/``.  On Windows, also checks the winget
+    portable install locations (the ``WinGet\\Links`` shim and the
+    ``WinGet\\Packages\\Gyan.FFmpeg*`` payload) and common manual install
+    folders.  Returns the path string or *None*.
     """
     path = shutil.which("ffprobe")
     if path:
         return path
-    for candidate in _FFPROBE_SEARCH_PATHS:
+    candidates = list(_FFPROBE_SEARCH_PATHS)
+    if platform.system() == "Windows":
+        candidates.extend(_windows_ffprobe_candidates())
+    for candidate in candidates:
         if candidate.is_file():
             return str(candidate)
     return None

{riplex-0.9.1 → riplex-0.9.3/src/riplex.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: riplex
-Version: 0.9.1
+Version: 0.9.3
 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.9.1 → riplex-0.9.3}/src/riplex.egg-info/SOURCES.txt

@@ -124,6 +124,7 @@ tests/test_scanner.py
 tests/test_snapshot.py
 tests/test_splitter.py
 tests/test_tagger.py
+tests/test_tmdb_provider.py
 tests/test_ui.py
 tests/test_updater.py
 tests/test_welcome_screen.py

{riplex-0.9.1 → riplex-0.9.3}/src/riplex.egg-info/scm_file_list.json

@@ -101,6 +101,7 @@
     "tests/test_snapshot.py",
     "tests/test_formatter.py",
     "tests/test_updater.py",
+    "tests/test_tmdb_provider.py",
     "tests/test_normalize.py",
     "tests/test_disc_analysis.py",
     "tests/test_cache.py",

{riplex-0.9.1 → riplex-0.9.3}/src/riplex.egg-info/scm_version.json

@@ -1,7 +1,7 @@
 {
-  "tag": "0.9.1",
+  "tag": "0.9.3",
   "distance": 0,
-  "node": "g1987f1d9a7fb9e2034793b92c4a94e7cd198682f",
+  "node": "g266d2beebd49f78f7e0d5ac851062e54b43dc545",
   "dirty": false,
   "branch": "HEAD",
   "node_date": "2026-06-24"

{riplex-0.9.1 → riplex-0.9.3}/src/riplex_app/screens/welcome.py

@@ -164,8 +164,9 @@ class WelcomeScreen:
                 ft.Container(height=4),
                 self.api_key_field,
                 ft.Text(
-                    "Required. Get a free API key at themoviedb.org/settings/api — "
-                    "used to look up movie and TV show metadata.",
+                    "Required. Get a free API Key or Read Access Token at "
+                    "themoviedb.org/settings/api — used to look up movie and "
+                    "TV show metadata.",
                     size=11,
                     color=ft.Colors.GREY_600,
                 ),

{riplex-0.9.1 → riplex-0.9.3}/src/riplex_cli/commands/setup.py

@@ -77,7 +77,7 @@ def run_setup(force: bool = False) -> int:
         value = input(f"{label}{prompt_hint}{suffix}: ").strip()
         return value if value else current
 
-    tmdb_key = prompt("tmdb_api_key", "TMDb API key", "free at themoviedb.org/settings/api", mask=True)
+    tmdb_key = prompt("tmdb_api_key", "TMDb API key or Read Access Token", "free at themoviedb.org/settings/api", mask=True)
     output_root = prompt("output_root", "Plex library root", "e.g. E:/Media")
     rip_output = prompt("rip_output", "MakeMKV rip output folder", "e.g. E:/Media/Rips")
     archive_root = prompt("archive_root", "Archive root (optional)", "move raw rips here after organizing")

{riplex-0.9.1 → riplex-0.9.3}/tests/test_scanner.py

@@ -6,7 +6,7 @@ from unittest.mock import patch
 import pytest
 
 from riplex.models import ScannedFile
-from riplex.scanner import _probe_file, scan_folder
+from riplex.scanner import _probe_file, find_ffprobe, scan_folder
 
 
 @pytest.fixture
@@ -103,3 +103,62 @@ class TestScanFolder:
         for disc in discs:
             for f in disc.files:
                 assert Path(f.path).is_absolute()
+
+
+class TestFindFfprobe:
+    def test_returns_path_when_on_path(self):
+        with patch("riplex.scanner.shutil.which", return_value="/usr/bin/ffprobe"):
+            assert find_ffprobe() == "/usr/bin/ffprobe"
+
+    def test_returns_none_when_not_found(self, monkeypatch):
+        monkeypatch.setattr("riplex.scanner.shutil.which", lambda _: None)
+        monkeypatch.setattr("riplex.scanner.platform.system", lambda: "Linux")
+        monkeypatch.setattr("riplex.scanner._FFPROBE_SEARCH_PATHS", [])
+        assert find_ffprobe() is None
+
+    def test_finds_winget_links_shim_on_windows(self, tmp_path, monkeypatch):
+        local_appdata = tmp_path / "AppData" / "Local"
+        links = local_appdata / "Microsoft" / "WinGet" / "Links"
+        links.mkdir(parents=True)
+        shim = links / "ffprobe.exe"
+        shim.write_text("", encoding="utf-8")
+
+        monkeypatch.setattr("riplex.scanner.shutil.which", lambda _: None)
+        monkeypatch.setattr("riplex.scanner.platform.system", lambda: "Windows")
+        monkeypatch.setattr("riplex.scanner._FFPROBE_SEARCH_PATHS", [])
+        monkeypatch.setenv("LOCALAPPDATA", str(local_appdata))
+
+        assert find_ffprobe() == str(shim)
+
+    def test_finds_winget_package_payload_on_windows(self, tmp_path, monkeypatch):
+        local_appdata = tmp_path / "AppData" / "Local"
+        bin_dir = (
+            local_appdata / "Microsoft" / "WinGet" / "Packages"
+            / "Gyan.FFmpeg_Microsoft.Winget.Source_abc"
+            / "ffmpeg-7.0-full_build" / "bin"
+        )
+        bin_dir.mkdir(parents=True)
+        exe = bin_dir / "ffprobe.exe"
+        exe.write_text("", encoding="utf-8")
+
+        monkeypatch.setattr("riplex.scanner.shutil.which", lambda _: None)
+        monkeypatch.setattr("riplex.scanner.platform.system", lambda: "Windows")
+        monkeypatch.setattr("riplex.scanner._FFPROBE_SEARCH_PATHS", [])
+        monkeypatch.setenv("LOCALAPPDATA", str(local_appdata))
+
+        assert find_ffprobe() == str(exe)
+
+    def test_windows_candidates_skipped_on_non_windows(self, monkeypatch):
+        monkeypatch.setattr("riplex.scanner.shutil.which", lambda _: None)
+        monkeypatch.setattr("riplex.scanner.platform.system", lambda: "Linux")
+        monkeypatch.setattr("riplex.scanner._FFPROBE_SEARCH_PATHS", [])
+        called = {"hit": False}
+
+        def _should_not_run():
+            called["hit"] = True
+            return []
+
+        monkeypatch.setattr("riplex.scanner._windows_ffprobe_candidates", _should_not_run)
+        assert find_ffprobe() is None
+        assert called["hit"] is False
+

riplex-0.9.3/tests/test_tmdb_provider.py

@@ -0,0 +1,57 @@
+import pytest
+
+from riplex.metadata.sources.tmdb import (
+    TmdbProvider,
+    _looks_like_read_access_token,
+)
+
+# A JWT-shaped sample (header.payload.signature). Not a real credential.
+_SAMPLE_READ_ACCESS_TOKEN = "eyJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJyaXBsZXgifQ.c2lnbmF0dXJl"
+_SAMPLE_API_KEY = "0123456789abcdef0123456789abcdef"
+
+
+class TestLooksLikeReadAccessToken:
+    def test_jwt_token_is_detected(self):
+        assert _looks_like_read_access_token(_SAMPLE_READ_ACCESS_TOKEN) is True
+
+    def test_v3_hex_key_is_not_detected(self):
+        assert _looks_like_read_access_token(_SAMPLE_API_KEY) is False
+
+    def test_empty_string_is_not_detected(self):
+        assert _looks_like_read_access_token("") is False
+
+
+class TestTmdbProviderAuth:
+    @pytest.mark.asyncio
+    async def test_read_access_token_uses_authorization_header(self):
+        provider = TmdbProvider(api_key=_SAMPLE_READ_ACCESS_TOKEN)
+        try:
+            assert (
+                provider._client.headers["Authorization"]
+                == f"Bearer {_SAMPLE_READ_ACCESS_TOKEN}"
+            )
+            assert "api_key" not in provider._client.params
+        finally:
+            await provider.close()
+
+    @pytest.mark.asyncio
+    async def test_v3_key_uses_query_parameter(self):
+        provider = TmdbProvider(api_key=_SAMPLE_API_KEY)
+        try:
+            assert provider._client.params["api_key"] == _SAMPLE_API_KEY
+            assert "Authorization" not in provider._client.headers
+        finally:
+            await provider.close()
+
+    @pytest.mark.asyncio
+    async def test_whitespace_is_stripped_from_credential(self):
+        provider = TmdbProvider(api_key=f"  {_SAMPLE_API_KEY}  ")
+        try:
+            assert provider._client.params["api_key"] == _SAMPLE_API_KEY
+        finally:
+            await provider.close()
+
+    def test_missing_key_raises(self, monkeypatch):
+        monkeypatch.delenv("TMDB_API_KEY", raising=False)
+        with pytest.raises(ValueError, match="TMDb API key is required"):
+            TmdbProvider(api_key="")