riplex 0.9.2__tar.gz → 0.9.3__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: riplex
-Version: 0.9.2
+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.2 → 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.2 → riplex-0.9.3/src/riplex.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: riplex
-Version: 0.9.2
+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.2 → riplex-0.9.3}/src/riplex.egg-info/scm_version.json

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

{riplex-0.9.2 → 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
+