jellyplex-sync 0.2.1__tar.gz → 0.2.2__tar.gz

{jellyplex_sync-0.2.1 → jellyplex_sync-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jellyplex-sync
-Version: 0.2.1
+Version: 0.2.2
 Summary: Convert your media library between Jellyfin and Plex formats by creating a hard-linked mirror
 Author: Stefan Schönberger
 Author-email: Stefan Schönberger <stefan@sniner.dev>

{jellyplex_sync-0.2.1 → jellyplex_sync-0.2.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "jellyplex-sync"
-version = "0.2.1"
+version = "0.2.2"
 description = "Convert your media library between Jellyfin and Plex formats by creating a hard-linked mirror"
 authors = [{ name = "Stefan Schönberger", email = "stefan@sniner.dev" }]
 requires-python = ">=3.11"

{jellyplex_sync-0.2.1 → jellyplex_sync-0.2.2}/src/jellyplex_sync/json_output.py

@@ -116,7 +116,10 @@ def write_diff_json(
         "source": _endpoint_payload(source_path, source_format),
         "target": _endpoint_payload(target_path, target_format),
         "in_sync": not result.has_differences,
-        "movies_only_in_source": list(result.movies_only_in_source),
+        "movies_only_in_source": [
+            {"source_folder": m.source_folder, "expected_target": m.expected_target}
+            for m in result.movies_only_in_source
+        ],
         "movies_only_in_target": list(result.movies_only_in_target),
         "differing_movies": [
             {

{jellyplex_sync-0.2.1 → jellyplex_sync-0.2.2}/src/jellyplex_sync/library.py

@@ -98,7 +98,7 @@ class StrictReporter:
 @dataclass
 class CollectingReporter:
     """Accumulates drops and info messages for later inspection.
-    Used by report-only flows like the planned `--diff` mode."""
+    Used by report-only flows like the `diff` subcommand."""
 
     drops: list[Drop] = field(default_factory=list)
     messages: list[str] = field(default_factory=list)

{jellyplex_sync-0.2.1 → jellyplex_sync-0.2.2}/src/jellyplex_sync/sync.py

@@ -111,8 +111,7 @@ def scan_media_library(
                     log.info("DELETE %s", entry)
                 else:
                     log.info("Removing stray item '%s' in target library", entry.name)
-                    utils.remove(entry)
-                stats.items_removed += 1
+                stats.items_removed += utils.remove(entry, dry_run=dry_run).files
                 stats.events.append(
                     FileEvent(action="remove", target=entry, context="library_stray")
                 )
@@ -180,9 +179,7 @@ def process_assets_folder(
             log.info("Removing stray item '%s' in target folder", entry.name)
             if dry_run:
                 log.info("DELETE %s", entry.name)
-            else:
-                utils.remove(entry)
-            stats.items_removed += 1
+            stats.items_removed += utils.remove(entry, dry_run=dry_run).files
             stats.events.append(
                 FileEvent(action="remove", target=entry, context="asset_stray")
             )
@@ -235,8 +232,7 @@ def _remove_strays(
                 entry.name,
                 target_path.relative_to(base_dir),
             )
-            utils.remove(entry)
-        removed += 1
+        removed += utils.remove(entry, dry_run=dry_run).files
         if events is not None:
             events.append(FileEvent(action="remove", target=entry, context="movie_stray"))
     return removed
@@ -550,9 +546,21 @@ class DiffEntry:
     only_in_target: tuple[str, ...] = ()
 
 
+@dataclass
+class MovieOnlyInSource:
+    """A source movie that has no counterpart in the target. Stores both
+    names so the diff output can show the user what they wrote (the
+    source folder) AND what it would become on the other side (the
+    expected target name) — pre-0.2.2 only the target name was shown,
+    which read as a stray for users browsing their source tree."""
+
+    source_folder: str
+    expected_target: str
+
+
 @dataclass
 class DiffResult:
-    movies_only_in_source: tuple[str, ...] = ()
+    movies_only_in_source: tuple[MovieOnlyInSource, ...] = ()
     movies_only_in_target: tuple[str, ...] = ()
     differing_movies: tuple[DiffEntry, ...] = ()
     drops: tuple = ()
@@ -625,8 +633,10 @@ def _compute_diff(source: LibraryReader, target: LibraryWriter) -> DiffResult:
     ignored: list[IgnoredEntry] = []
 
     expected: dict[str, set[str]] = {}
+    source_folder_for: dict[str, str] = {}
     for source_movie_path, movie in scan(source, ignored=ignored):
         target_movie_name = target.movie_name(movie, reporter)
+        source_folder_for[target_movie_name] = source_movie_path.name
         expected_files: set[str] = set()
         for entry in source_movie_path.glob("*"):
             if entry.name.startswith("."):
@@ -644,7 +654,13 @@ def _compute_diff(source: LibraryReader, target: LibraryWriter) -> DiffResult:
             continue
         actual[entry.name] = {sub.name for sub in entry.iterdir()}
 
-    only_source = sorted(set(expected) - set(actual))
+    only_source = tuple(
+        MovieOnlyInSource(
+            source_folder=source_folder_for[name],
+            expected_target=name,
+        )
+        for name in sorted(set(expected) - set(actual))
+    )
     only_target = sorted(set(actual) - set(expected))
     differing: list[DiffEntry] = []
     for name in sorted(set(expected) & set(actual)):
@@ -660,7 +676,7 @@ def _compute_diff(source: LibraryReader, target: LibraryWriter) -> DiffResult:
             )
 
     return DiffResult(
-        movies_only_in_source=tuple(only_source),
+        movies_only_in_source=only_source,
         movies_only_in_target=tuple(only_target),
         differing_movies=tuple(differing),
         drops=tuple(reporter.drops),
@@ -685,8 +701,9 @@ def _print_diff(
 
     if result.movies_only_in_source:
         print(f"Movies only in source ({len(result.movies_only_in_source)}):", file=out)
-        for name in result.movies_only_in_source:
-            print(f"  + {name}", file=out)
+        for m in result.movies_only_in_source:
+            print(f"  + '{m.source_folder}'", file=out)
+            print(f"      → would be '{m.expected_target}'", file=out)
         print(file=out)
 
     if result.movies_only_in_target:
@@ -719,5 +736,5 @@ def _print_diff(
             print(f"  ! '{i.path.name}': {i.reason}", file=out)
         print(file=out)
 
-    if not result.has_differences and not result.drops:
+    if not result.has_differences:
         print("In sync. No differences found.", file=out)

jellyplex_sync-0.2.2/src/jellyplex_sync/utils.py

@@ -0,0 +1,94 @@
+from __future__ import annotations
+
+import logging
+import os
+import pathlib
+from dataclasses import dataclass
+
+log = logging.getLogger(__name__)
+
+
+@dataclass
+class RemovalCounts:
+    files: int = 0
+    dirs: int = 0
+    ignored: int = 0
+    errors: int = 0
+
+
+def _count_removable(item: pathlib.Path) -> RemovalCounts:
+    """Predict what `remove(item)` would do. No side effects — used for
+    dry-run reporting so the summary matches what an actual run produces."""
+    counts = RemovalCounts()
+    if item.is_symlink() or item.is_file():
+        counts.files += 1
+    elif item.is_dir():
+        for root, dirs, files in os.walk(item, topdown=False):
+            counts.files += len(files)
+            root_path = pathlib.Path(root)
+            for name in dirs:
+                if (root_path / name).is_symlink():
+                    counts.files += 1
+                else:
+                    counts.dirs += 1
+        counts.dirs += 1
+    else:
+        counts.ignored += 1
+    return counts
+
+
+def _remove(item: pathlib.Path) -> RemovalCounts:
+    """Recursively remove a file, symlink, or directory tree.
+
+    Per-entry failures (permission denied, busy file, …) are logged and
+    counted in `errors`; the walk continues so a single un-removable
+    entry doesn't strand the rest of the sync.
+    """
+    counts = RemovalCounts()
+    if item.is_symlink() or item.is_file():
+        try:
+            item.unlink()
+            counts.files += 1
+        except OSError as exc:
+            log.warning("Failed to remove '%s': %s", item, exc)
+            counts.errors += 1
+    elif item.is_dir():
+        for root, dirs, files in os.walk(item, topdown=False):
+            root_path = pathlib.Path(root)
+            for name in files:
+                p = root_path / name
+                try:
+                    p.unlink()
+                    counts.files += 1
+                except OSError as exc:
+                    log.warning("Failed to remove '%s': %s", p, exc)
+                    counts.errors += 1
+            for name in dirs:
+                p = root_path / name
+                try:
+                    if p.is_symlink():
+                        # os.walk lists dir-symlinks under `dirs`; rmdir would fail.
+                        p.unlink()
+                        counts.files += 1
+                    else:
+                        p.rmdir()
+                        counts.dirs += 1
+                except OSError as exc:
+                    log.warning("Failed to remove '%s': %s", p, exc)
+                    counts.errors += 1
+        try:
+            item.rmdir()
+            counts.dirs += 1
+        except OSError as exc:
+            log.warning("Failed to remove '%s': %s", item, exc)
+            counts.errors += 1
+    else:
+        log.warning("Will not remove '%s'", item)
+        counts.ignored += 1
+    return counts
+
+
+def remove(item: pathlib.Path, *, dry_run: bool = False) -> RemovalCounts:
+    if bool(dry_run):
+        return _count_removable(item)
+    return _remove(item)

jellyplex_sync-0.2.1/src/jellyplex_sync/utils.py

@@ -1,16 +0,0 @@
-from __future__ import annotations
-
-import logging
-import pathlib
-import shutil
-
-log = logging.getLogger(__name__)
-
-
-def remove(item: pathlib.Path) -> None:
-    if item.is_file() or item.is_symlink():
-        item.unlink()
-    elif item.is_dir():
-        shutil.rmtree(item)
-    else:
-        log.warning("Will not remove '%s'", item)