mnamer 2.7.2.dev7__tar.gz → 2.7.3.dev2__tar.gz

{mnamer-2.7.2.dev7 → mnamer-2.7.3.dev2}/.github/workflows/publish.yml

@@ -4,6 +4,9 @@ on:
   workflow_call:
   workflow_dispatch:
 
+permissions:
+  contents: read
+
 jobs:
   publish-pypi:
     runs-on: ubuntu-latest

{mnamer-2.7.2.dev7 → mnamer-2.7.3.dev2}/.github/workflows/pull_request.yml

@@ -2,6 +2,9 @@ name: pr
 
 on: pull_request
 
+permissions:
+  contents: read
+
 jobs:
   lint:
     runs-on: ubuntu-latest

{mnamer-2.7.2.dev7 → mnamer-2.7.3.dev2}/.github/workflows/push.yml

@@ -11,6 +11,9 @@ on:
       - published
       - prereleased
 
+permissions:
+  contents: read
+
 jobs:
   lint:
     runs-on: ubuntu-latest
@@ -50,6 +53,9 @@ jobs:
     secrets:
       inherit
 
+    permissions:
+      contents: read
+
     uses: ./.github/workflows/publish.yml
 
   publish-docker-main:
@@ -65,6 +71,10 @@ jobs:
     secrets:
       inherit
 
+    permissions:
+      contents: read
+      packages: write
+
     uses: ./.github/workflows/publish-docker.yml
     with:
       target: latest-sha
@@ -85,6 +95,10 @@ jobs:
     secrets:
       inherit
 
+    permissions:
+      contents: read
+      packages: write
+
     uses: ./.github/workflows/publish-docker.yml
     with:
       target: event-release

{mnamer-2.7.2.dev7/mnamer.egg-info → mnamer-2.7.3.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mnamer
-Version: 2.7.2.dev7
+Version: 2.7.3.dev2
 Summary: A command-line utility for organizing media files.
 Author-email: Jessy Williams <jessy@jessywilliams.com>
 Maintainer-email: Jessy Williams <jessy@jessywilliams.com>

{mnamer-2.7.2.dev7 → mnamer-2.7.3.dev2}/mnamer/__version__.py

@@ -1,4 +1,4 @@
 # file generated by setuptools_scm
 # don't change, don't track in version control
 
-__version__ = "2.7.2.dev7"
+__version__ = "2.7.3.dev2"

{mnamer-2.7.2.dev7 → mnamer-2.7.3.dev2}/mnamer/providers.py

@@ -31,7 +31,7 @@ from mnamer.language import Language
 from mnamer.metadata import Metadata, MetadataEpisode, MetadataMovie
 from mnamer.setting_store import SettingStore
 from mnamer.types import MediaType, ProviderType
-from mnamer.utils import parse_date, year_range_parse
+from mnamer.utils import parse_date, year_parse, year_range_parse
 
 
 class Provider[M: Metadata](ABC):
@@ -212,6 +212,7 @@ class Tmdb(Provider[MetadataMovie]):
         self, name: str, year: str | None, language: Language | None
     ) -> Iterator[MetadataMovie]:
         assert self.api_key
+        requested_year = year_parse(year) if year else None
         page = 1
         page_max = 5  # each page yields a maximum of 20 results
         found = False
@@ -226,17 +227,19 @@ class Tmdb(Provider[MetadataMovie]):
             )
             for entry in response["results"]:
                 try:
-                    meta = MetadataMovie(
+                    result_year = year_parse(entry.get("release_date", ""))
+                    if result_year is None:
+                        continue
+                    if requested_year and result_year != requested_year:
+                        continue
+                    found = True
+                    yield MetadataMovie(
                         id_tmdb=str(entry["id"]),
                         name=entry["title"],
                         language=language,
                         synopsis=entry.get("overview"),
                         year=entry.get("release_date"),
                     )
-                    if not meta.year:
-                        continue
-                    yield meta
-                    found = True
                 except (AttributeError, KeyError, TypeError, ValueError):
                     continue
             if page == response["total_pages"]:

{mnamer-2.7.2.dev7 → mnamer-2.7.3.dev2}/mnamer/setting_store.py

@@ -366,20 +366,16 @@ class SettingStore:
             if f.metadata
         ]
 
-    @staticmethod
-    def _resolve_path(path: str | Path) -> Path:
-        return Path(path).resolve()
-
     @override
     def __setattr__(self, key: str, value: Any):
         converter_map: dict[str, Callable[[Any], Any]] = {
             "episode_api": ProviderType,
-            "episode_directory": self._resolve_path,
+            "episode_directory": Path,
             "language": Language.parse,
             "mask": normalize_containers,
             "media": MediaType,
             "movie_api": ProviderType,
-            "movie_directory": self._resolve_path,
+            "movie_directory": Path,
             "targets": lambda targets: [Path(target) for target in targets],
         }
         converter: Callable[[Any], Any] | None = converter_map.get(key)

{mnamer-2.7.2.dev7 → mnamer-2.7.3.dev2}/mnamer/target.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
 import datetime as dt
-from os import path
 from pathlib import Path
 from shutil import move
 from typing import Any, ClassVar, Self, override
@@ -94,21 +93,62 @@ class Target:
         preferences.
         """
         if self.directory:
-            dir_head_ = format(self.metadata, str(self.directory))
-            dir_head_ = str_sanitize(dir_head_)
-            dir_head = Path(dir_head_)
+            dir_head = self._format_directory(self.directory)
         else:
             dir_head = self.source.parent
+
         file_path = format(self.metadata, self._settings.formatting_for(self.metadata))
-        dir_tail, filename = path.split(Path(file_path))
-        filename = filename_replace(filename, self._settings.replace_after)
+        dir_tail, filename = self._split_formatted_path(file_path)
+        directory = Path(dir_head, self._process_directory(dir_tail))
+        filename = self._process_filename(filename)
+        return Path(directory, filename).resolve()
+
+    def _format_directory(self, directory: Path) -> Path:
+        """Format and post-process a configured directory template.
+
+        Each part of the original (un-resolved) directory is formatted
+        independently so we can tell template substitutions apart from literal
+        user-typed parts. For relative paths every part is transformed; for
+        absolute paths only template parts are, keeping literal filesystem
+        prefixes like ``/Volumes/Media`` intact.
+        """
+        is_absolute = directory.is_absolute()
+        processed_parts: list[str] = []
+        for original_part in directory.parts:
+            formatted_part = format(self.metadata, original_part)
+            if not is_absolute or "{" in original_part:
+                formatted_part = self._process_path_text(formatted_part)
+            processed_parts.append(formatted_part)
+        return Path(*processed_parts) if processed_parts else Path()
+
+    @staticmethod
+    def _split_formatted_path(file_path: str) -> tuple[Path, str]:
+        """Split a formatted file template into optional directories and filename."""
+        formatted_path = Path(file_path)
+        dir_tail = formatted_path.parent
+        if str(dir_tail) == ".":
+            dir_tail = Path()
+        return dir_tail, formatted_path.name
+
+    def _process_directory(self, directory: Path) -> Path:
+        """Apply filename post-processing rules to each generated directory path."""
+        parts = tuple(self._process_path_text(part) for part in directory.parts)
+        return Path(*parts) if parts else Path()
+
+    def _process_filename(self, filename: str) -> str:
+        """Apply configured post-processing rules to a generated filename."""
+        return self._process_path_text(filename)
+
+    def _process_path_text(self, value: str) -> str:
+        """Apply replacement, scene, lower, and sanitize transforms in one place."""
+        if value in (".", ".."):
+            return value
+        value = filename_replace(value, self._settings.replace_after)
         if self._settings.scene:
-            filename = str_scenify(filename)
+            value = str_scenify(value)
         if self._settings.lower:
-            filename = filename.lower()
-        filename = str_sanitize(filename)
-        directory = Path(dir_head, dir_tail)
-        return Path(directory, filename)
+            value = value.lower()
+        return str_sanitize(value)
 
     def _parse(self, file_path: Path):
         path_data: dict[str, Any] = {"language": self._settings.language}

{mnamer-2.7.2.dev7 → mnamer-2.7.3.dev2/mnamer.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mnamer
-Version: 2.7.2.dev7
+Version: 2.7.3.dev2
 Summary: A command-line utility for organizing media files.
 Author-email: Jessy Williams <jessy@jessywilliams.com>
 Maintainer-email: Jessy Williams <jessy@jessywilliams.com>

{mnamer-2.7.2.dev7 → mnamer-2.7.3.dev2}/tests/e2e/test_moving.py

@@ -145,6 +145,40 @@ def test_multiple_nested_directories(e2e_run, setup_test_files):
     assert expected in result.out
 
 
+@pytest.mark.usefixtures("setup_test_dir")
+def test_lower_directory(e2e_run, setup_test_files):
+    setup_test_files("Ninja Turtles (1990).mkv")
+    result = e2e_run(
+        "--batch",
+        "--lower",
+        "--movie_directory=Movies/{name[0]}",
+        "Ninja Turtles (1990).mkv",
+    )
+    expected = str(Path("/movies/t/teenage mutant ninja turtles (1990).mkv"))
+    assert result.code == 0
+    assert expected in result.out
+
+
+@pytest.mark.usefixtures("setup_test_dir")
+def test_scene_directory(e2e_run, setup_test_files):
+    setup_test_files("Ninja Turtles (1990).mkv")
+    result = e2e_run(
+        "--batch",
+        "--scene",
+        "--movie_directory=Movie Library/{name}",
+        "Ninja Turtles (1990).mkv",
+    )
+    expected = str(
+        Path(
+            "/movie.library"
+            "/teenage.mutant.ninja.turtles"
+            "/teenage.mutant.ninja.turtles.1990.mkv"
+        )
+    )
+    assert result.code == 0
+    assert expected in result.out
+
+
 @pytest.mark.omdb
 @pytest.mark.usefixtures("setup_test_dir")
 def test_format_id(e2e_run, setup_test_files):

mnamer-2.7.3.dev2/tests/local/test_target.py

@@ -0,0 +1,241 @@
+import datetime as dt
+from pathlib import Path
+
+import pytest
+
+from mnamer.metadata import MetadataEpisode, MetadataMovie
+from mnamer.setting_store import SettingStore
+from mnamer.target import Target
+from mnamer.types import MediaType
+
+pytestmark = pytest.mark.local
+
+
+def test_parse__media__movie():
+    target = Target(Path("ninja turtles (1990).mkv"), SettingStore())
+    assert target.metadata.to_media_type() is MediaType.MOVIE
+
+
+def test_parse__media__episode():
+    target = Target(Path("ninja turtles s01e01.mkv"), SettingStore())
+    assert target.metadata.to_media_type() is MediaType.EPISODE
+
+
+def test_parse__quality():
+    file_path = Path("ninja.turtles.s01e04.1080p.ac3.rargb.sample.mkv")
+    target = Target(file_path, SettingStore())
+    assert target.metadata.quality == "1080p dolby digital"
+
+
+def test_parse__group():
+    file_path = Path("ninja.turtles.s01e04.1080p.ac3.rargb.sample.mkv")
+    target = Target(file_path, SettingStore())
+    assert target.metadata.group == "RARGB"
+
+
+def test_parse__container():
+    file_path = Path("ninja.turtles.s01e04.1080p.ac3.rargb.sample.mp4")
+    target = Target(file_path, SettingStore())
+    assert target.metadata.container == ".mp4"
+
+
+def test_parse__date():
+    file_path = Path("the.colbert.show.2010.10.01.avi")
+    target = Target(file_path, SettingStore())
+    assert isinstance(target.metadata, MetadataEpisode)
+    assert target.metadata.date == dt.date(2010, 10, 1)
+
+
+def test_parse__episode():
+    file_path = Path("ninja.turtles.s01e04.1080p.ac3.rargb.sample.mp4")
+    target = Target(file_path, SettingStore())
+    assert isinstance(target.metadata, MetadataEpisode)
+    assert target.metadata.episode == 4
+
+
+def test_parse__season():
+    file_path = Path("ninja.turtles.s01e04.1080p.ac3.rargb.sample.mp4")
+    target = Target(file_path, SettingStore())
+    assert isinstance(target.metadata, MetadataEpisode)
+    assert target.metadata.season == 1
+
+
+def test_parse__series():
+    file_path = Path("ninja.turtles.s01e04.1080p.ac3.rargb.sample.mp4")
+    target = Target(file_path, SettingStore())
+    assert isinstance(target.metadata, MetadataEpisode)
+    assert target.metadata.series == "Ninja Turtles"
+
+
+def test_parse__year():
+    file_path = Path("the.goonies.1985")
+    target = Target(file_path, SettingStore())
+    assert isinstance(target.metadata, MetadataMovie)
+    assert target.metadata.year == 1985
+
+
+def testparse__name():
+    file_path = Path("the.goonies.1985")
+    target = Target(file_path, SettingStore())
+    assert isinstance(target.metadata, MetadataMovie)
+    assert target.metadata.name == "The Goonies"
+
+
+@pytest.mark.parametrize("media", MediaType)
+def test_media__override(media: MediaType):
+    target = Target(Path(), SettingStore(media=media))
+    assert target.metadata.to_media_type() == media
+
+
+def test_directory__movie():
+    movie_path = Path("/some/movie/path").absolute()
+    target = Target(
+        Path(), SettingStore(media=MediaType.MOVIE, movie_directory=movie_path)
+    )
+    assert target.directory == movie_path
+
+
+def test_directory__episode():
+    episode_path = Path("/some/episode/path").absolute()
+    target = Target(
+        Path(),
+        SettingStore(media=MediaType.EPISODE, episode_directory=episode_path),
+    )
+    assert target.directory == episode_path
+
+
+def test_ambiguous_subtitle_language():
+    target = Target(
+        Path("Subs/Nancy.Drew.S01E01.WEBRip.x264-ION10.srt"), SettingStore()
+    )
+    assert target.metadata.language is None
+
+
+def test_destination__simple():
+    pass  # TODO
+
+
+def test_destination__relative_directory_lowered():
+    """Every part of a relative configured directory receives --lower."""
+    settings = SettingStore(
+        batch=True,
+        media=MediaType.MOVIE,
+        lower=True,
+        movie_directory=Path("Movies/{name[0]}"),
+    )
+    target = Target(Path("ninja turtles (1990).mkv"), settings)
+    assert target.destination == Path("movies/n/ninja turtles (1990).mkv").resolve()
+
+
+def test_destination__absolute_directory_preserves_literal_parts():
+    """Literal parts of an absolute configured directory survive --lower."""
+    settings = SettingStore(
+        batch=True,
+        media=MediaType.MOVIE,
+        lower=True,
+        movie_directory=Path("/Media Library/Movies"),
+    )
+    target = Target(Path("ninja turtles (1990).mkv"), settings)
+    assert target.destination == Path("/Media Library/Movies/ninja turtles (1990).mkv")
+
+
+def test_destination__absolute_directory_transforms_template_parts():
+    """Template parts within an absolute configured directory are transformed."""
+    settings = SettingStore(
+        batch=True,
+        media=MediaType.MOVIE,
+        lower=True,
+        movie_directory=Path("/Media Library/{name[0]}"),
+    )
+    target = Target(Path("ninja turtles (1990).mkv"), settings)
+    assert target.destination == Path("/Media Library/n/ninja turtles (1990).mkv")
+
+
+def test_destination__format_template_directory_components_transformed():
+    """Directory components emitted by the format template are post-processed."""
+    settings = SettingStore(
+        batch=True,
+        media=MediaType.MOVIE,
+        lower=True,
+        movie_format="{name}/{name} ({year}).{extension}",
+    )
+    target = Target(Path("ninja turtles (1990).mkv"), settings)
+    assert (
+        target.destination == Path("ninja turtles/ninja turtles (1990).mkv").resolve()
+    )
+
+
+def test_destination__relative_directory_scene():
+    """--scene applies to literal and templated parts of a relative directory."""
+    settings = SettingStore(
+        batch=True,
+        media=MediaType.MOVIE,
+        scene=True,
+        movie_directory=Path("Movie Library/{name}"),
+    )
+    target = Target(Path("ninja turtles (1990).mkv"), settings)
+    assert (
+        target.destination
+        == Path("movie.library/ninja.turtles/ninja.turtles.1990.mkv").resolve()
+    )
+
+
+def test_destination__absolute_directory_scene_preserves_literal_parts():
+    """Literal parts of an absolute configured directory survive --scene."""
+    settings = SettingStore(
+        batch=True,
+        media=MediaType.MOVIE,
+        scene=True,
+        movie_directory=Path("/Media Library/Movies"),
+    )
+    target = Target(Path("ninja turtles (1990).mkv"), settings)
+    assert target.destination == Path("/Media Library/Movies/ninja.turtles.1990.mkv")
+
+
+def test_destination__absolute_directory_scene_transforms_template_parts():
+    """Template parts within an absolute configured directory survive --scene."""
+    settings = SettingStore(
+        batch=True,
+        media=MediaType.MOVIE,
+        scene=True,
+        movie_directory=Path("/Media Library/{name}"),
+    )
+    target = Target(Path("ninja turtles (1990).mkv"), settings)
+    assert target.destination == Path(
+        "/Media Library/ninja.turtles/ninja.turtles.1990.mkv"
+    )
+
+
+def test_destination__parent_directory_navigation_preserved():
+    """A `..` segment in a relative directory survives sanitization."""
+    settings = SettingStore(
+        batch=True,
+        media=MediaType.MOVIE,
+        lower=True,
+        movie_directory=Path("../Movies"),
+    )
+    target = Target(Path("ninja turtles (1990).mkv"), settings)
+    assert target.destination == Path("../movies/ninja turtles (1990).mkv").resolve()
+
+
+def test_destination__same_directory_matches_source(tmp_path, monkeypatch):
+    """`--movie_directory=.` resolves to the source path so the no-op is skippable."""
+    tmp = tmp_path.resolve()
+    monkeypatch.chdir(tmp)
+    source = tmp / "Ninja Turtles (1990).mkv"
+    source.touch()
+    settings = SettingStore(
+        batch=True,
+        media=MediaType.MOVIE,
+        movie_directory=Path("."),
+    )
+    target = Target(source, settings)
+    assert target.destination == target.source
+
+
+def test_query():
+    pass  # TODO
+
+
+def test_relocate():
+    pass  # TODO

mnamer-2.7.2.dev7/tests/local/test_target.py

@@ -1,123 +0,0 @@
-import datetime as dt
-from pathlib import Path
-
-import pytest
-
-from mnamer.metadata import MetadataEpisode, MetadataMovie
-from mnamer.setting_store import SettingStore
-from mnamer.target import Target
-from mnamer.types import MediaType
-
-pytestmark = pytest.mark.local
-
-
-def test_parse__media__movie():
-    target = Target(Path("ninja turtles (1990).mkv"), SettingStore())
-    assert target.metadata.to_media_type() is MediaType.MOVIE
-
-
-def test_parse__media__episode():
-    target = Target(Path("ninja turtles s01e01.mkv"), SettingStore())
-    assert target.metadata.to_media_type() is MediaType.EPISODE
-
-
-def test_parse__quality():
-    file_path = Path("ninja.turtles.s01e04.1080p.ac3.rargb.sample.mkv")
-    target = Target(file_path, SettingStore())
-    assert target.metadata.quality == "1080p dolby digital"
-
-
-def test_parse__group():
-    file_path = Path("ninja.turtles.s01e04.1080p.ac3.rargb.sample.mkv")
-    target = Target(file_path, SettingStore())
-    assert target.metadata.group == "RARGB"
-
-
-def test_parse__container():
-    file_path = Path("ninja.turtles.s01e04.1080p.ac3.rargb.sample.mp4")
-    target = Target(file_path, SettingStore())
-    assert target.metadata.container == ".mp4"
-
-
-def test_parse__date():
-    file_path = Path("the.colbert.show.2010.10.01.avi")
-    target = Target(file_path, SettingStore())
-    assert isinstance(target.metadata, MetadataEpisode)
-    assert target.metadata.date == dt.date(2010, 10, 1)
-
-
-def test_parse__episode():
-    file_path = Path("ninja.turtles.s01e04.1080p.ac3.rargb.sample.mp4")
-    target = Target(file_path, SettingStore())
-    assert isinstance(target.metadata, MetadataEpisode)
-    assert target.metadata.episode == 4
-
-
-def test_parse__season():
-    file_path = Path("ninja.turtles.s01e04.1080p.ac3.rargb.sample.mp4")
-    target = Target(file_path, SettingStore())
-    assert isinstance(target.metadata, MetadataEpisode)
-    assert target.metadata.season == 1
-
-
-def test_parse__series():
-    file_path = Path("ninja.turtles.s01e04.1080p.ac3.rargb.sample.mp4")
-    target = Target(file_path, SettingStore())
-    assert isinstance(target.metadata, MetadataEpisode)
-    assert target.metadata.series == "Ninja Turtles"
-
-
-def test_parse__year():
-    file_path = Path("the.goonies.1985")
-    target = Target(file_path, SettingStore())
-    assert isinstance(target.metadata, MetadataMovie)
-    assert target.metadata.year == 1985
-
-
-def testparse__name():
-    file_path = Path("the.goonies.1985")
-    target = Target(file_path, SettingStore())
-    assert isinstance(target.metadata, MetadataMovie)
-    assert target.metadata.name == "The Goonies"
-
-
-@pytest.mark.parametrize("media", MediaType)
-def test_media__override(media: MediaType):
-    target = Target(Path(), SettingStore(media=media))
-    assert target.metadata.to_media_type() == media
-
-
-def test_directory__movie():
-    movie_path = Path("/some/movie/path").absolute()
-    target = Target(
-        Path(), SettingStore(media=MediaType.MOVIE, movie_directory=movie_path)
-    )
-    assert target.directory == movie_path
-
-
-def test_directory__episode():
-    episode_path = Path("/some/episode/path").absolute()
-    target = Target(
-        Path(),
-        SettingStore(media=MediaType.EPISODE, episode_directory=episode_path),
-    )
-    assert target.directory == episode_path
-
-
-def test_ambiguous_subtitle_language():
-    target = Target(
-        Path("Subs/Nancy.Drew.S01E01.WEBRip.x264-ION10.srt"), SettingStore()
-    )
-    assert target.metadata.language is None
-
-
-def test_destination__simple():
-    pass  # TODO
-
-
-def test_query():
-    pass  # TODO
-
-
-def test_relocate():
-    pass  # TODO