riplex 0.5.2__tar.gz → 0.5.4__tar.gz

{riplex-0.5.2/src/riplex.egg-info → riplex-0.5.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: riplex
-Version: 0.5.2
+Version: 0.5.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.5.2 → riplex-0.5.4}/src/riplex/manifest.py

@@ -33,8 +33,9 @@ def build_rip_path(
     is not configured.
     """
     from riplex.config import get_output_root, get_rip_output
+    from riplex.normalize import sanitize_filename
 
-    folder_base = f"{canonical} ({year})"
+    folder_base = sanitize_filename(f"{canonical} ({year})")
     rip_output = get_rip_output()
     if rip_output:
         rip_root = Path(rip_output) / folder_base

{riplex-0.5.2 → riplex-0.5.4/src/riplex.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: riplex
-Version: 0.5.2
+Version: 0.5.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.5.2 → riplex-0.5.4}/src/riplex_app/screens/update.py

@@ -23,31 +23,32 @@ class UpdateScreen:
             ])
 
         tag = update_info["tag"]
-        body = update_info.get("body", "").strip()
+        releases = update_info.get("releases", [])
         release_url = update_info.get("url", "")
         current = get_current_version()
 
-        # Clean up sparse release notes (auto-generated GitHub changelog links)
-        if body:
-            # De-duplicate repeated lines
-            seen = []
-            for line in body.splitlines():
-                if line not in seen:
-                    seen.append(line)
-            body = "\n".join(seen)
+        log.info("Update screen: %s -> %s (%d releases in series)", current, tag, len(releases))
 
-            # If it's just changelog links with no real content, replace with a summary
-            non_empty = [l for l in seen if l.strip()]
-            if all("full changelog" in l.lower() or not l.strip() for l in seen):
-                body = ""
+        # Build release notes content
+        notes_controls = []
+        for i, rel in enumerate(releases):
+            rel_body = self._clean_body(rel.get("body", ""))
+            if not rel_body:
+                rel_body = "*No release notes available.*"
 
-        if not body:
-            body = (
-                f"A new version of riplex ({tag}) is available.\n\n"
-                "Visit the release page for full details and download links."
+            notes_controls.append(
+                ft.Text(rel["tag"], size=16, weight=ft.FontWeight.BOLD),
             )
-
-        log.info("Update screen: %s -> %s", current, tag)
+            notes_controls.append(
+                ft.Markdown(
+                    rel_body,
+                    selectable=True,
+                    extension_set=ft.MarkdownExtensionSet.GITHUB_WEB,
+                    on_tap_link=lambda e: webbrowser.open(e.data),
+                ),
+            )
+            if i < len(releases) - 1:
+                notes_controls.append(ft.Divider(height=10, color=ft.Colors.GREY_800))
 
         return ft.Column(
             [
@@ -75,12 +76,7 @@ class UpdateScreen:
                 ft.Text("Release Notes", size=18, weight=ft.FontWeight.BOLD),
                 ft.Container(height=4),
                 ft.Container(
-                    ft.Markdown(
-                        body if body else "*No release notes available.*",
-                        selectable=True,
-                        extension_set=ft.MarkdownExtensionSet.GITHUB_WEB,
-                        on_tap_link=lambda e: webbrowser.open(e.data),
-                    ),
+                    ft.Column(notes_controls, spacing=8),
                     expand=True,
                     padding=ft.padding.all(10),
                     border=ft.border.all(1, ft.Colors.GREY_800),
@@ -113,3 +109,19 @@ class UpdateScreen:
 
     def _go_back(self, e):
         self.app.navigate("welcome")
+
+    @staticmethod
+    def _clean_body(body: str) -> str:
+        """Clean up sparse or auto-generated release notes."""
+        body = body.strip()
+        if not body:
+            return ""
+        # De-duplicate repeated lines
+        seen = []
+        for line in body.splitlines():
+            if line not in seen:
+                seen.append(line)
+        # If it's just changelog links with no real content, discard
+        if all("full changelog" in l.lower() or not l.strip() for l in seen):
+            return ""
+        return "\n".join(seen)

riplex-0.5.4/src/riplex_app/updater.py

@@ -0,0 +1,122 @@
+"""Check for newer releases on GitHub."""
+
+import urllib.request
+import json
+import sys
+from importlib.metadata import version, PackageNotFoundError
+
+GITHUB_REPO = "AnyCredit5518/riplex"
+RELEASES_URL = f"https://api.github.com/repos/{GITHUB_REPO}/releases"
+LATEST_RELEASE_URL = f"{RELEASES_URL}/latest"
+
+
+def get_current_version() -> str:
+    """Return the installed package version, or 'dev' if not installed."""
+    try:
+        return version("riplex")
+    except PackageNotFoundError:
+        return "dev"
+
+
+def _parse_version(tag: str) -> tuple:
+    """Parse 'v1.2.3' into (1, 2, 3) for comparison."""
+    tag = tag.lstrip("v")
+    parts = []
+    for p in tag.split("."):
+        try:
+            parts.append(int(p))
+        except ValueError:
+            break
+    return tuple(parts)
+
+
+def _major_minor(version_tuple: tuple) -> tuple:
+    """Return (major, minor) from a parsed version tuple."""
+    return version_tuple[:2] if len(version_tuple) >= 2 else version_tuple
+
+
+def check_for_update() -> dict | None:
+    """Check GitHub for a newer release.
+
+    Returns a dict with 'tag', 'url', 'releases', and 'assets' if an update
+    is available, or None if already up to date (or on error).
+
+    'releases' is a list of dicts (tag, url, body) for all releases in the
+    latest minor version series, ordered newest first.  For example if the
+    latest release is v0.5.2, releases will contain v0.5.2, v0.5.1, v0.5.0.
+    """
+    current = get_current_version()
+    if current == "dev":
+        return None
+
+    try:
+        req = urllib.request.Request(
+            RELEASES_URL + "?per_page=30",
+            headers={"Accept": "application/vnd.github+json", "User-Agent": "riplex"},
+        )
+        with urllib.request.urlopen(req, timeout=8) as resp:
+            all_releases = json.loads(resp.read())
+    except Exception:
+        return None
+
+    if not all_releases:
+        return None
+
+    # Sort by parsed version descending
+    tagged = []
+    for r in all_releases:
+        tag = r.get("tag_name", "")
+        if not tag:
+            continue
+        parsed = _parse_version(tag)
+        if parsed:
+            tagged.append((parsed, r))
+    tagged.sort(key=lambda x: x[0], reverse=True)
+
+    if not tagged:
+        return None
+
+    latest_parsed, latest_release = tagged[0]
+    current_parsed = _parse_version(current)
+
+    if latest_parsed <= current_parsed:
+        return None
+
+    # Collect all releases in the same major.minor series
+    latest_minor = _major_minor(latest_parsed)
+    series = []
+    for parsed, r in tagged:
+        if _major_minor(parsed) == latest_minor:
+            series.append({
+                "tag": r["tag_name"],
+                "url": r.get("html_url", ""),
+                "body": r.get("body", ""),
+            })
+
+    # Assets from the latest release
+    assets = {}
+    for asset in latest_release.get("assets", []):
+        name = asset["name"].lower()
+        assets[name] = asset["browser_download_url"]
+
+    return {
+        "tag": latest_release["tag_name"],
+        "url": latest_release.get("html_url", ""),
+        "body": latest_release.get("body", ""),
+        "releases": series,
+        "assets": assets,
+    }
+
+
+def get_download_url(update_info: dict) -> str:
+    """Get the platform-appropriate download URL from update info."""
+    if sys.platform == "win32":
+        for name, url in update_info["assets"].items():
+            if "ui" in name and "windows" in name:
+                return url
+    elif sys.platform == "darwin":
+        for name, url in update_info["assets"].items():
+            if "ui" in name and "macos" in name:
+                return url
+    # Fallback to release page
+    return update_info["url"]

{riplex-0.5.2 → riplex-0.5.4}/src/riplex_cli/commands/lookup.py

@@ -323,7 +323,9 @@ async def run_lookup(args: argparse.Namespace) -> int:
             print("Error: --output or output_root config required for --create-folders.", file=sys.stderr)
             return 1
         rip_output = get_rip_output()
-        makemkv_root = Path(rip_output) / f"{canonical} ({year})" if rip_output else Path(output_val) / "Rips" / f"{canonical} ({year})"
+        from riplex.normalize import sanitize_filename
+        folder_base = sanitize_filename(f"{canonical} ({year})")
+        makemkv_root = Path(rip_output) / folder_base if rip_output else Path(output_val) / "Rips" / folder_base
         created = create_rip_folders(makemkv_root, discs)
         if created:
             print(f"\nCreated {len(created)} folder(s) under {makemkv_root}")

{riplex-0.5.2 → riplex-0.5.4}/tests/test_updater.py

@@ -51,11 +51,11 @@ class TestCheckForUpdate:
                 assert check_for_update() is None
 
     def test_returns_none_when_up_to_date(self):
-        response_data = json.dumps({
+        response_data = json.dumps([{
             "tag_name": "v0.2.3",
             "html_url": "https://github.com/AnyCredit5518/riplex/releases/tag/v0.2.3",
             "assets": [],
-        }).encode()
+        }]).encode()
 
         mock_resp = MagicMock()
         mock_resp.read.return_value = response_data
@@ -67,14 +67,15 @@ class TestCheckForUpdate:
                 assert check_for_update() is None
 
     def test_returns_update_info_when_newer(self):
-        response_data = json.dumps({
+        response_data = json.dumps([{
             "tag_name": "v0.3.0",
             "html_url": "https://github.com/AnyCredit5518/riplex/releases/tag/v0.3.0",
+            "body": "### Added\n- Cool feature",
             "assets": [
                 {"name": "riplex-ui-windows.exe", "browser_download_url": "https://example.com/win.exe"},
                 {"name": "riplex-ui-macos.zip", "browser_download_url": "https://example.com/mac.zip"},
             ],
-        }).encode()
+        }]).encode()
 
         mock_resp = MagicMock()
         mock_resp.read.return_value = response_data
@@ -89,6 +90,52 @@ class TestCheckForUpdate:
         assert result["tag"] == "v0.3.0"
         assert "riplex-ui-windows.exe" in result["assets"]
         assert "riplex-ui-macos.zip" in result["assets"]
+        assert len(result["releases"]) == 1
+        assert result["releases"][0]["tag"] == "v0.3.0"
+
+    def test_groups_releases_by_minor_version(self):
+        response_data = json.dumps([
+            {"tag_name": "v0.5.2", "html_url": "url/v0.5.2", "body": "Fix 2", "assets": []},
+            {"tag_name": "v0.5.1", "html_url": "url/v0.5.1", "body": "Fix 1", "assets": []},
+            {"tag_name": "v0.5.0", "html_url": "url/v0.5.0", "body": "Big release", "assets": []},
+            {"tag_name": "v0.4.0", "html_url": "url/v0.4.0", "body": "Old", "assets": []},
+        ]).encode()
+
+        mock_resp = MagicMock()
+        mock_resp.read.return_value = response_data
+        mock_resp.__enter__ = lambda s: s
+        mock_resp.__exit__ = MagicMock(return_value=False)
+
+        with patch("riplex_app.updater.get_current_version", return_value="0.4.0"):
+            with patch("urllib.request.urlopen", return_value=mock_resp):
+                result = check_for_update()
+
+        assert result is not None
+        assert result["tag"] == "v0.5.2"
+        assert len(result["releases"]) == 3
+        assert [r["tag"] for r in result["releases"]] == ["v0.5.2", "v0.5.1", "v0.5.0"]
+
+    def test_does_not_mix_major_versions(self):
+        response_data = json.dumps([
+            {"tag_name": "v1.0.1", "html_url": "url/v1.0.1", "body": "Patch", "assets": []},
+            {"tag_name": "v1.0.0", "html_url": "url/v1.0.0", "body": "Major", "assets": []},
+            {"tag_name": "v0.5.0", "html_url": "url/v0.5.0", "body": "Old minor", "assets": []},
+        ]).encode()
+
+        mock_resp = MagicMock()
+        mock_resp.read.return_value = response_data
+        mock_resp.__enter__ = lambda s: s
+        mock_resp.__exit__ = MagicMock(return_value=False)
+
+        with patch("riplex_app.updater.get_current_version", return_value="0.5.0"):
+            with patch("urllib.request.urlopen", return_value=mock_resp):
+                result = check_for_update()
+
+        assert result is not None
+        assert result["tag"] == "v1.0.1"
+        # Should only contain v1.0.x, not v0.5.0
+        assert len(result["releases"]) == 2
+        assert [r["tag"] for r in result["releases"]] == ["v1.0.1", "v1.0.0"]
 
 
 # ---------------------------------------------------------------------------

riplex-0.5.2/src/riplex_app/updater.py

@@ -1,84 +0,0 @@
-"""Check for newer releases on GitHub."""
-
-import urllib.request
-import json
-import sys
-from importlib.metadata import version, PackageNotFoundError
-
-GITHUB_REPO = "AnyCredit5518/riplex"
-RELEASES_URL = f"https://api.github.com/repos/{GITHUB_REPO}/releases/latest"
-
-
-def get_current_version() -> str:
-    """Return the installed package version, or 'dev' if not installed."""
-    try:
-        return version("riplex")
-    except PackageNotFoundError:
-        return "dev"
-
-
-def _parse_version(tag: str) -> tuple:
-    """Parse 'v1.2.3' into (1, 2, 3) for comparison."""
-    tag = tag.lstrip("v")
-    parts = []
-    for p in tag.split("."):
-        try:
-            parts.append(int(p))
-        except ValueError:
-            break
-    return tuple(parts)
-
-
-def check_for_update() -> dict | None:
-    """Check GitHub for a newer release.
-
-    Returns a dict with 'tag', 'url', and 'assets' if an update is available,
-    or None if already up to date (or on error).
-    """
-    current = get_current_version()
-    if current == "dev":
-        return None
-
-    try:
-        req = urllib.request.Request(
-            RELEASES_URL,
-            headers={"Accept": "application/vnd.github+json", "User-Agent": "riplex"},
-        )
-        with urllib.request.urlopen(req, timeout=5) as resp:
-            data = json.loads(resp.read())
-    except Exception:
-        return None
-
-    latest_tag = data.get("tag_name", "")
-    if not latest_tag:
-        return None
-
-    if _parse_version(latest_tag) > _parse_version(current):
-        # Find the right asset for this platform
-        assets = {}
-        for asset in data.get("assets", []):
-            name = asset["name"].lower()
-            assets[name] = asset["browser_download_url"]
-
-        return {
-            "tag": latest_tag,
-            "url": data.get("html_url", ""),
-            "body": data.get("body", ""),
-            "assets": assets,
-        }
-
-    return None
-
-
-def get_download_url(update_info: dict) -> str:
-    """Get the platform-appropriate download URL from update info."""
-    if sys.platform == "win32":
-        for name, url in update_info["assets"].items():
-            if "ui" in name and "windows" in name:
-                return url
-    elif sys.platform == "darwin":
-        for name, url in update_info["assets"].items():
-            if "ui" in name and "macos" in name:
-                return url
-    # Fallback to release page
-    return update_info["url"]