mnamer 2.7.2.dev7__py3-none-any.whl → 2.7.2.dev8__py3-none-any.whl

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.2.dev8"

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/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.dist-info → mnamer-2.7.2.dev8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mnamer
-Version: 2.7.2.dev7
+Version: 2.7.2.dev8
 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.dist-info → mnamer-2.7.2.dev8.dist-info}/RECORD

@@ -1,6 +1,6 @@
 mnamer/__init__.py,sha256=ZjNNbifQHIhjmUekOwc_VZQQdR289XCqqSIdjDSF5pw,344
 mnamer/__main__.py,sha256=8AEEyLkBtfYQKOvrbg-XlLxEu9_0G-1-Rd657EBlnI8,913
-mnamer/__version__.py,sha256=Cad7mu-MWngZCZCohrD0M-PgJinSGiU3OccvuTHE4uU,110
+mnamer/__version__.py,sha256=RBCcQ_PgBZmTWJZcxA5Qyyto_6zqxd8dAOveMBFcIck,110
 mnamer/argument.py,sha256=PicJzTRGmamHeSKCWwhNMuf5WBSso8AbuPoZ3yOwcI4,3293
 mnamer/const.py,sha256=__YSxzRc8qDJqp4mlJncjiaRnKoi3wMLtGT1AVAm2mc,2035
 mnamer/endpoints.py,sha256=QAC1Vb-T_rDYOr-Fu92THffK9Dc48nJ3Jn12nC5yA_0,22778
@@ -11,14 +11,14 @@ mnamer/metadata.py,sha256=Z3BhX-oKpwoStMkH62Zh9WCRcFTl7S3TJTPpsT-IQaw,5839
 mnamer/providers.py,sha256=XYIvMLAKIbAl19RmB19pkSabnkEpqZk5liz2Q4pYasI,19042
 mnamer/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mnamer/setting_spec.py,sha256=37V7iT0_6XJdeqD6rItqQmYG-fQYQSglPX01KRls0KQ,1279
-mnamer/setting_store.py,sha256=n8E1tCCaRnwW1qTtemfUOq97CzsaSXwcdK42w7nTEII,16109
-mnamer/target.py,sha256=P29APLtH3772gblIBO5XPlDGHzoyYNv9DSwTuDskW-A,9176
+mnamer/setting_store.py,sha256=BcnUuNn823RHpOLpWvr7gVlrHZJWfxDaNfDDNqYjcqI,15977
+mnamer/target.py,sha256=RzvtzDabkRjw2Ygzi94FwwKrjAW22RmcYJRkrPpT7c4,11091
 mnamer/tty.py,sha256=v66fiv_rq_NPayUt9QfsEx5mxPJWAF28RSKiHe6op_Q,4146
 mnamer/types.py,sha256=aYMfEcBmPhrkA9PNrtr8JrDuBXeUNN8dbmd4T5rvRjg,638
 mnamer/utils.py,sha256=dB_DOKlXlHwF0KGk9hF5dB9eGbyzXLajOSBc_YQevqY,15639
-mnamer-2.7.2.dev7.dist-info/licenses/LICENSE.txt,sha256=WxN2vPlY96aW3C_CRs4q0xOK4CxO5RTVTzf2W25hGmM,1071
-mnamer-2.7.2.dev7.dist-info/METADATA,sha256=s0jsi2a3VVuRzVqJtPXFGXqVKMyS9acldcjkorEJxaI,8038
-mnamer-2.7.2.dev7.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
-mnamer-2.7.2.dev7.dist-info/entry_points.txt,sha256=STyNAl6d-ueccO1C_WdDfjq5GlYwi788H4AENG040fI,48
-mnamer-2.7.2.dev7.dist-info/top_level.txt,sha256=RER9MaloDml8ZAsXHlm6oKwvv2KgH_YWJLlOfKC1zAY,7
-mnamer-2.7.2.dev7.dist-info/RECORD,,
+mnamer-2.7.2.dev8.dist-info/licenses/LICENSE.txt,sha256=WxN2vPlY96aW3C_CRs4q0xOK4CxO5RTVTzf2W25hGmM,1071
+mnamer-2.7.2.dev8.dist-info/METADATA,sha256=4IUiAElfqQIHcR2UbU1Gh5gb21AbyDGw2M5Zlwo_1aY,8038
+mnamer-2.7.2.dev8.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
+mnamer-2.7.2.dev8.dist-info/entry_points.txt,sha256=STyNAl6d-ueccO1C_WdDfjq5GlYwi788H4AENG040fI,48
+mnamer-2.7.2.dev8.dist-info/top_level.txt,sha256=RER9MaloDml8ZAsXHlm6oKwvv2KgH_YWJLlOfKC1zAY,7
+mnamer-2.7.2.dev8.dist-info/RECORD,,