riplex 1.0.1__tar.gz → 1.0.2__tar.gz

{riplex-1.0.1/src/riplex.egg-info → riplex-1.0.2}/PKG-INFO

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

@@ -8,6 +8,16 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/).
 
 ### Fixed
 
+- **TV episodes with parenthetical titles (or filed under extras) no longer land in `Other/`.** When organizing a TV rip, the destination is now chosen from the authoritative `SxxEyy` classification recorded in each disc's rip manifest at rip time, taking priority over the re-derived dvdcompare match label. Previously an episode whose title contains a parenthetical (e.g. *Shawn and Gus in Drag (Racing)*), or one that dvdcompare files under a disc's extras (e.g. an *(Extended Version)* listing such as *Romeo and Juliet and Juliet* or *Dual Spires*), was misread as an extra and dropped into `Other/` instead of its season folder — even though orchestrate had already classified it correctly (e.g. Psych S5 E01/E05/E12).
+
+### Added
+
+- **Durations on the organize preview.** Each matched file now shows its runtime next to the matched episode/target's expected runtime; a divergence of more than a minute is highlighted so an incorrect match is easy to spot before you execute.
+
+## v1.0.1 — 2026-07-20
+
+### Fixed
+
 - **Out-of-order episode matching.** When dvdcompare files an “(Extended Version)” of an episode under a disc's *extras*, TMDb enrichment promotes it to an episode but leaves it positioned after the real episode list, so the episode entries arrive out of broadcast order. Positional episode alignment now sorts episodes by their canonical `SxxEyy` number before matching disc titles, so a disc whose titles are in broadcast order maps correctly. Previously the misordered list could orphan a title to a generic “Episode” label and shift the following episodes by one (e.g. Psych S6 D3).
 
 ## v1.0.0 — 2026-07-18

riplex-1.0.2/issues/organize-preview-match-override.md

@@ -0,0 +1,87 @@
+# GUI: override a wrong match on the organize preview
+
+## Problem
+
+The organize preview is the last checkpoint before files are moved into Plex
+layout, but it is read-only. When the user spots a wrong match there — a title
+routed to the wrong episode, an episode dropped into `Other/`, an extra
+mislabeled — they have **no recourse**. Their only options are to execute a
+plan they know is wrong, or go back and re-rip / re-pick metadata, neither of
+which fixes a single bad row.
+
+We hit this with Psych S5: three episodes with parenthetical titles or filed
+by dvdcompare under a disc's extras (`Shawn and Gus in Drag (Racing)`,
+`Romeo and Juliet and Juliet`, `Dual Spires`) landed in `Other/`. The
+underlying misclassification is now fixed (organize honors the rip-time
+`SxxEyy` classification from the manifest), and the new duration columns on
+the preview make a bad match visible — but "visible" still isn't "fixable."
+
+## Goal
+
+Let the user correct an individual row on the organize preview before
+executing, without leaving the screen or re-running the whole flow.
+
+## Proposed UX
+
+Each matched / unmatched / (optionally) split row gets an **Edit** affordance
+(pencil icon or click-to-expand). Activating it opens an inline picker for
+that one file:
+
+- **Target dropdown** populated from the current plan:
+  - Each episode in the resolved `PlannedShow` (`S05E05 - Shawn and Gus in
+    Drag (Racket)`), grouped by season.
+  - The movie main feature / editions for a `PlannedMovie`.
+  - Extras folders: `Featurettes`, `Behind The Scenes`, `Deleted Scenes`,
+    `Interviews`, `Trailers`, `Shorts`, `Other`.
+  - `Skip (leave unmatched)`.
+- The dropdown defaults to the current assignment and shows each option's
+  expected runtime next to the file's runtime (reuse the duration formatting
+  just added), so the correct episode is easy to pick.
+- Confirming rebuilds just that row's destination and re-renders the preview
+  (updating the summary counts). No other rows are recomputed.
+
+## Where the logic lives (CLI/GUI parity)
+
+Per `.github/copilot-instructions.md`, the override resolution must be a plain
+function in `src/riplex/`, not GUI code. Sketch:
+
+```python
+# src/riplex/organizer.py (or a new override.py)
+def apply_move_override(
+    plan: OrganizePlan,
+    source_path: str,
+    target: MoveOverride,   # episode (s,e) | movie edition | extras folder | skip
+    planned: PlannedMovie | PlannedShow,
+    output_root: Path,
+) -> OrganizePlan:
+    """Return a new OrganizePlan with the one file re-routed per `target`."""
+```
+
+The GUI preview becomes a thin caller (`state[...] = apply_move_override(...)`
+then re-render); a future CLI `--fix FILE=TARGET` flag could call the same
+function. Destination computation should reuse `_compute_destination` / the
+episode + extras-folder helpers rather than duplicating path logic.
+
+## Scope / decisions to settle
+
+- **Persistence:** session-only (re-route affects just this execute), or write
+  the corrected `SxxEyy` back into the file's `_rip_manifest.json` so a later
+  re-organize keeps the fix? Recommend session-only first; manifest write-back
+  is a follow-up.
+- **Split rows:** overriding a chapter-split move is more complex (N
+  destinations). Start with matched + unmatched single-file rows; leave split
+  overrides out of v1.
+- **Validation:** picking an episode that another row already claims should
+  warn (duplicate destination) but not hard-block — the user may be fixing a
+  swap and will correct the other row next.
+- **Testing:** unit-test `apply_move_override` in `tests/test_organizer.py`
+  (episode re-route, extras re-route, skip). Drive the picker end to end in the
+  GUI integration harness (`tests/support/`), asserting the summary counts and
+  the corrected destination.
+
+## Related
+
+- Fixed: organize honors rip-time `SxxEyy` classification over the dvdcompare
+  label (Psych S5 E01/E05/E12 → `Other/`).
+- Added: source + target durations on the organize preview (highlights
+  mismatches), which pairs naturally with this override picker.

{riplex-1.0.1 → riplex-1.0.2}/src/riplex/organizer.py

@@ -152,6 +152,8 @@ class FileMove:
     label: str  # what this file was matched to
     confidence: str
     delta_seconds: int = 0  # |file_runtime - target_runtime|, for diagnostics
+    file_duration_seconds: int = 0  # source file runtime, for preview display
+    target_runtime_seconds: int = 0  # matched target runtime, for preview display
 
 
 @dataclass
@@ -532,6 +534,8 @@ def build_organize_plan(
                 label=candidate.matched_label,
                 confidence=candidate.confidence,
                 delta_seconds=candidate.delta_seconds,
+                file_duration_seconds=candidate.file_duration_seconds,
+                target_runtime_seconds=candidate.matched_runtime_seconds,
             )
         )
 
@@ -565,6 +569,7 @@ def build_organize_plan(
                         destination=str(dest),
                         label=f"(unmatched extra) {f.name}",
                         confidence="none",
+                        file_duration_seconds=f.duration_seconds,
                     )
                 )
             else:
@@ -595,6 +600,30 @@ def _compute_destination(
     label = candidate.matched_label
     log.debug("_compute_destination: label='%s'", label)
 
+    # SE-first: the rip-time classification is authoritative. When the
+    # classifier tagged this file with a TMDb-enriched "SxxEyy - Title"
+    # prefix (recorded in the manifest at rip time), route directly by
+    # (season, episode) — before consulting the dvdcompare match label.
+    # The label loses episode identity when the episode title carries a
+    # parenthetical (e.g. "Shawn and Gus in Drag (Racing)", which the
+    # feature-type branch below mistakes for an extra) or when dvdcompare
+    # files the episode under a disc's extras (e.g. an "(Extended
+    # Version)" listing). Honoring the manifest avoids re-deriving — and
+    # mis-deriving — a match that was already correct at rip time.
+    if isinstance(plan, PlannedShow):
+        se_ep = _episode_from_classification_se(plan, candidate.classification)
+        if se_ep is not None:
+            fname = episode_file_name(
+                plan.canonical_title, plan.year,
+                se_ep.season_number, se_ep.episode_number, se_ep.title,
+            )
+            dest = base / season_folder_name(se_ep.season_number) / fname
+            log.debug(
+                "  -> episode by SE-in-classification '%s' (pre-label): %s",
+                candidate.classification, dest,
+            )
+            return dest
+
     # Movie main file
     if "(movie)" in label:
         edition = None

{riplex-1.0.1 → riplex-1.0.2/src/riplex.egg-info}/PKG-INFO

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

@@ -32,6 +32,7 @@ issues/debug-artifacts-consolidation.md
 issues/manual-rip-and-organize-escape-hatch.md
 issues/one-season-at-a-time.md
 issues/orchestrate-dvdcompare-fallback.md
+issues/organize-preview-match-override.md
 issues/planned-features.md
 screenshots/0_Rip_Flow_BTTF.gif
 screenshots/1_Welcome_Screen.png

{riplex-1.0.1 → riplex-1.0.2}/src/riplex.egg-info/scm_file_list.json

@@ -92,6 +92,7 @@
     "issues/one-season-at-a-time.md",
     "issues/debug-artifacts-consolidation.md",
     "issues/planned-features.md",
+    "issues/organize-preview-match-override.md",
     "tests/test_organize_cli.py",
     "tests/test_formatter.py",
     "tests/test_metadata_screen.py",

riplex-1.0.2/src/riplex.egg-info/scm_version.json

@@ -0,0 +1,8 @@
+{
+  "tag": "1.0.2",
+  "distance": 0,
+  "node": "g3c9c24840a9054aee9658fb81bf9afd727d73b8b",
+  "dirty": false,
+  "branch": "HEAD",
+  "node_date": "2026-07-21"
+}

{riplex-1.0.1 → riplex-1.0.2}/src/riplex_app/screens/organize_preview.py

@@ -19,6 +19,16 @@ from riplex.snapshot import save_from_scanned, save_organized_marker
 log = logging.getLogger(__name__)
 
 
+def _fmt_duration(seconds: int) -> str:
+    """Format seconds as ``m:ss`` (or ``h:mm:ss`` for hour-plus runtimes)."""
+    seconds = int(seconds or 0)
+    h, rem = divmod(seconds, 3600)
+    m, s = divmod(rem, 60)
+    if h:
+        return f"{h}:{m:02d}:{s:02d}"
+    return f"{m}:{s:02d}"
+
+
 class OrganizePreviewScreen:
     def __init__(self, app):
         self.app = app
@@ -282,13 +292,24 @@ class OrganizePreviewScreen:
                 padding=ft.Padding(left=6, right=6, top=2, bottom=2),
                 border_radius=4,
             )
+            # Durations make a bad match obvious at a glance: the source
+            # file's runtime beside the matched target's expected runtime,
+            # highlighted when they diverge by more than a minute.
+            file_dur = getattr(move, "file_duration_seconds", 0)
+            tgt_dur = getattr(move, "target_runtime_seconds", 0)
+            dur_mismatch = tgt_dur > 0 and abs(file_dur - tgt_dur) > 60
+            dur_color = ft.Colors.ORANGE if dur_mismatch else ft.Colors.GREY_500
+            src_dur_text = _fmt_duration(file_dur) if file_dur else ""
+            tgt_dur_text = f"({_fmt_duration(tgt_dur)})" if tgt_dur else ""
             move_rows.append(
                 ft.Row([
                     ft.Icon(ft.Icons.CHECK_CIRCLE, color=conf_color, size=16),
                     conf_chip,
-                    ft.Text(f"{src_name}", size=12, width=220, no_wrap=True),
+                    ft.Text(f"{src_name}", size=12, width=180, no_wrap=True),
+                    ft.Text(src_dur_text, size=11, width=54, no_wrap=True, color=dur_color),
                     ft.Icon(ft.Icons.ARROW_FORWARD, size=14, color=ft.Colors.GREY_500),
                     ft.Text(f"{dest_folder}/{dest_name}", size=12, expand=True, no_wrap=True),
+                    ft.Text(tgt_dur_text, size=11, no_wrap=True, color=dur_color),
                 ], spacing=6)
             )
 

{riplex-1.0.1 → riplex-1.0.2}/tests/test_organizer.py

@@ -504,6 +504,39 @@ class TestBuildOrganizePlanShow:
         assert "TV Shows" in dest
         assert "Planet Earth III (2023) - s01e01 - Coasts.mkv" in dest
 
+    def test_move_carries_file_and_target_durations(self):
+        """The preview surfaces duration mismatches, so each FileMove
+        must carry both the source file's runtime and the matched
+        target's expected runtime."""
+        result = OrganizeResult(
+            matched=[
+                MatchCandidate(
+                    file_name="d1_t00.mkv",
+                    file_duration_seconds=3141,
+                    matched_label="Disc 1: Coasts",
+                    matched_runtime_seconds=3120,
+                    delta_seconds=21,
+                    confidence="high",
+                ),
+            ],
+        )
+        plan = PlannedShow(
+            canonical_title="Planet Earth III",
+            year=2023,
+            seasons=[
+                PlannedSeason(
+                    season_number=1,
+                    episodes=[
+                        PlannedEpisode(season_number=1, episode_number=1, title="Coasts", runtime="52m"),
+                    ],
+                ),
+            ],
+        )
+        op = build_organize_plan(result, plan, Path("E:/Media"))
+        assert len(op.moves) == 1
+        assert op.moves[0].file_duration_seconds == 3141
+        assert op.moves[0].target_runtime_seconds == 3120
+
     def test_tv_episode_disc_label_no_tmdb_match_is_unmatched(self):
         """Episode not in TMDb data is treated as unmatched."""
         result = OrganizeResult(
@@ -586,6 +619,72 @@ class TestBuildOrganizePlanShow:
         assert len(op.moves) == 1
         assert "Trailers" in op.moves[0].destination
 
+    def test_tv_episode_with_parenthetical_title_routes_by_se_classification(self):
+        """Psych S5: an episode whose *title* contains a parenthetical
+        (``Shawn and Gus in Drag (Racing)``) — or an episode dvdcompare
+        files under a disc's extras (``Romeo and Juliet and Juliet
+        (Extended Version)``, ``Dual Spires (Extended Version)``) — must
+        still route to its Plex episode path. The dvdcompare match label
+        looks like an extra (trailing parenthetical), so the pre-fix code
+        sent these to ``Other/``. The rip-time ``SxxEyy`` classification
+        recorded in the manifest is authoritative and now wins.
+        """
+        result = OrganizeResult(
+            matched=[
+                MatchCandidate(
+                    file_name="C1_t00.mkv",
+                    file_duration_seconds=2585,
+                    matched_label="Disc 2: Shawn and Gus in Drag (Racing)",
+                    matched_runtime_seconds=2590,
+                    delta_seconds=5,
+                    confidence="high",
+                    classification="S05E05 - Shawn and Gus in Drag (Racing) (1080p)",
+                ),
+                MatchCandidate(
+                    file_name="C1_t00.mkv",
+                    file_duration_seconds=2894,
+                    matched_label="Disc 1: Romeo and Juliet and Juliet ((Extended Version))",
+                    matched_runtime_seconds=2898,
+                    delta_seconds=4,
+                    confidence="high",
+                    classification="S05E01 - Romeo and Juliet and Juliet (1080p)",
+                ),
+                MatchCandidate(
+                    file_name="D2_t03.mkv",
+                    file_duration_seconds=3275,
+                    matched_label="Disc 3: Dual Spires ((Extended Version))",
+                    matched_runtime_seconds=3279,
+                    delta_seconds=4,
+                    confidence="high",
+                    classification="S05E12 - Dual Spires (1080p)",
+                ),
+            ],
+        )
+        plan = PlannedShow(
+            canonical_title="Psych",
+            year=2006,
+            seasons=[
+                PlannedSeason(
+                    season_number=5,
+                    episodes=[
+                        PlannedEpisode(season_number=5, episode_number=1, title="Romeo and Juliet and Juliet", runtime="48m"),
+                        PlannedEpisode(season_number=5, episode_number=5, title="Shawn and Gus in Drag (Racket)", runtime="43m"),
+                        PlannedEpisode(season_number=5, episode_number=12, title="Dual Spires", runtime="54m"),
+                    ],
+                ),
+            ],
+        )
+        output = Path("E:/Media")
+        op = build_organize_plan(result, plan, output)
+        dests = sorted(m.destination for m in op.moves)
+        assert len(op.moves) == 3
+        # None land in Other/.
+        assert all("Other" not in d for d in dests)
+        assert all("Season 05" in d for d in dests)
+        assert any(d.endswith("s05e01 - Romeo and Juliet and Juliet.mkv") for d in dests)
+        assert any(d.endswith("s05e05 - Shawn and Gus in Drag (Racket).mkv") for d in dests)
+        assert any(d.endswith("s05e12 - Dual Spires.mkv") for d in dests)
+
     def test_tv_episode_fuzzy_title_match(self):
         """dvdcompare titles diverging from TMDb still route correctly.
 

riplex-1.0.1/src/riplex.egg-info/scm_version.json

@@ -1,8 +0,0 @@
-{
-  "tag": "1.0.1",
-  "distance": 0,
-  "node": "g58f2f354988368976cde6f8f778539c9e7716516",
-  "dirty": false,
-  "branch": "HEAD",
-  "node_date": "2026-07-20"
-}