rekordbox-edit 0.13.1.dev23__tar.gz → 0.13.2.dev24__tar.gz

{rekordbox_edit-0.13.1.dev23 → rekordbox_edit-0.13.2.dev24}/CHANGELOG.md

@@ -1,6 +1,7 @@
-## v0.13.1.dev23 (2026-09-28)
+## v0.13.2.dev24 (2026-09-29)
 
 
+- fix(import): don't resolve mapped/symlinked drives to their UNC paths
 - chore(deps): update dependency ruff to v0.16.9 (#251)
 - Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 - chore(deps): update pre-commit hook astral-sh/ruff-pre-commit to v0.16.9 (#252)

{rekordbox_edit-0.13.1.dev23 → rekordbox_edit-0.13.2.dev24}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: rekordbox-edit
-Version: 0.13.1.dev23
+Version: 0.13.2.dev24
 Summary: Tools for managing and modifying a RekordBox library en-masse
 Project-URL: Homepage, https://github.com/jviall/rekordbox-edit
 Project-URL: Repository, https://github.com/jviall/rekordbox-edit

{rekordbox_edit-0.13.1.dev23 → rekordbox_edit-0.13.2.dev24}/docs/commands/edit.md

@@ -52,6 +52,8 @@ rbe edit --title "Teh" Title --match "Teh" --replace "The"
 - When the new file's size differs from the recorded `FileSize`, the file is probed and all of `FileType`, `SampleRate`, `BitDepth`, `BitRate`, `FileSize`, and `Length` are rewritten to match it.
 - When the file name changes, the `PPTH` path tag inside the track's analysis (ANLZ) files is rewritten to match. All other analysis data is left alone.
 
+A `--replace` path is resolved just like [`import`](import.md) does. It resolves to an absolute path, follows any symlinks, and normalizes to forward-slashes.
+
 By default edits will be skipped in the following cases:
 
 - The new path's file does not exist.

{rekordbox_edit-0.13.1.dev23 → rekordbox_edit-0.13.2.dev24}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "rekordbox-edit"
-version = "0.13.1.dev23"
+version = "0.13.2.dev24"
 description = "Tools for managing and modifying a RekordBox library en-masse"
 authors = [{ name = "James Viall", email= "jamesviall@pm.me"}]
 license = "MIT"

{rekordbox_edit-0.13.1.dev23 → rekordbox_edit-0.13.2.dev24}/rekordbox_edit/api/_field_handlers.py

@@ -22,6 +22,7 @@ from rekordbox_edit.api._relations import (
 from rekordbox_edit.api._utils import _sync_audio_columns, _update_anlz_paths
 from rekordbox_edit.errors import DependencyMissingError
 from rekordbox_edit.models import EditRequest, SkipReason
+from rekordbox_edit.query import normalize_path
 from rekordbox_edit.utils import (
     AudioInfo,
     get_audio_info,
@@ -265,7 +266,12 @@ class FolderPathField(FieldHandler):
         new_value = _replace(current, args)
         if new_value is None:
             return None
-        return new_value.replace("\\", "/")
+        if args.match_pattern is not None:
+            # --match rewrites stored paths in bulk, routinely onto a drive
+            # this machine has not mounted. Resolving those against the local
+            # filesystem would rewrite the very prefix the caller just set.
+            return new_value.replace("\\", "/")
+        return normalize_path(new_value)
 
     def validate_track(self, db, content, new_value, args):
         if not os.path.exists(new_value):

{rekordbox_edit-0.13.1.dev23 → rekordbox_edit-0.13.2.dev24}/rekordbox_edit/query.py

@@ -1,6 +1,6 @@
 import logging
 import os
-from pathlib import Path
+from pathlib import Path, PurePath, PureWindowsPath
 from collections.abc import Collection
 from typing import List, Literal, Tuple, Union
 
@@ -342,8 +342,39 @@ def get_filtered_content(
 def normalize_path(path: str) -> str:
     """A path in the form Rekordbox stores: absolute, symlinks resolved,
     forward-slashed. Rekordbox records the resolved form, so /tmp becomes
-    /private/tmp on macOS."""
-    return Path(path).resolve().as_posix()
+    /private/tmp on macOS. A Windows drive letter survives resolution, since
+    Rekordbox cannot open the UNC share behind a mapped network drive.
+    """
+    resolved = Path(path).resolve()
+    # splitdrive over abspath, not over `resolved`: abspath makes a relative
+    # path absolute without following the mapping, so the drive letter the
+    # caller meant is still there to compare against. It is always "" off
+    # Windows, which short-circuits everything below.
+    drive = os.path.splitdrive(os.path.abspath(path))[0]
+    if not drive or drive == resolved.drive or drive.startswith("\\\\"):
+        return resolved.as_posix()
+    try:
+        target = Path(drive + os.sep).resolve()
+    except OSError as e:
+        _logger.debug(f"could not resolve what drive {drive} points at: {e}")
+        return resolved.as_posix()
+    return _restore_drive_letter(resolved, drive, target)
+
+
+def _restore_drive_letter(resolved: PurePath, drive: str, target: PurePath) -> str:
+    """`resolved` moved back onto `drive`, which is mapped to `target`.
+
+    Path.resolve() follows a mapped network drive (M: -> //host/share) and a
+    subst drive the way it follows a symlink. Rekordbox stores and plays the
+    drive-letter form and cannot open the UNC share, so only the mapping is
+    undone; a symlink resolved deeper in the path stays resolved.
+    """
+    try:
+        tail = resolved.relative_to(target)
+    except ValueError:
+        _logger.debug(f"{resolved} does not sit under {target}, the target of {drive}")
+        return resolved.as_posix()
+    return PureWindowsPath(drive + "\\", tail).as_posix()
 
 
 def find_content_by_key(

{rekordbox_edit-0.13.1.dev23 → rekordbox_edit-0.13.2.dev24}/tests/api/test_field_handlers.py

@@ -1,3 +1,5 @@
+import os
+import platform
 from typing import get_args
 from unittest.mock import MagicMock, patch
 
@@ -13,6 +15,7 @@ from rekordbox_edit.api._field_handlers import (
 from rekordbox_edit.api._relations import RELATIONS, find_by_name, get_or_create
 from rekordbox_edit.errors import DependencyMissingError
 from rekordbox_edit.models import EditRequest, SkipReason
+from rekordbox_edit.query import normalize_path
 
 
 def _artist_handler():
@@ -403,6 +406,9 @@ class TestFolderPathField:
         content = make_djmd_content_item(ID="1", FolderPath="/old/song.wav")
         assert _folder_handler().current_value(content) == "/old/song.wav"
 
+    @pytest.mark.skipif(
+        platform.system() != "Windows", reason="a backslash path is a Windows path"
+    )
     def test_compute_normalizes_backslashes(self):
         args = EditRequest(
             title=["x"], field="FolderPath", replace_value=r"C:\Music\song.wav"
@@ -412,6 +418,30 @@ class TestFolderPathField:
             == "C:/Music/song.wav"
         )
 
+    def test_compute_makes_a_wholesale_replacement_absolute(self):
+        """Rekordbox resolves a stored path against nothing, so a relative one
+        never finds its file."""
+        args = EditRequest(
+            title=["x"], field="FolderPath", replace_value="music/song.wav"
+        )
+        new_value = _folder_handler().compute_new_value("/old/song.wav", args)
+        assert new_value == normalize_path("music/song.wav")
+        assert os.path.isabs(new_value)
+
+    def test_compute_match_leaves_the_replacement_unresolved(self):
+        """--match retargets stored paths in bulk, often onto a drive this
+        machine has not mounted, so the substitution stands as written."""
+        args = EditRequest(
+            title=["x"],
+            field="FolderPath",
+            match_pattern="/old/music",
+            replace_value="relative/dir",
+        )
+        assert (
+            _folder_handler().compute_new_value("/old/music/song.wav", args)
+            == "relative/dir/song.wav"
+        )
+
     def test_compute_match_skips_none(self):
         # --match has no text to search when the field is empty.
         args = EditRequest(

{rekordbox_edit-0.13.1.dev23 → rekordbox_edit-0.13.2.dev24}/tests/test_query.py

@@ -3,7 +3,9 @@
 
 import os
 import platform
-from pathlib import Path
+import subprocess
+from contextlib import contextmanager
+from pathlib import Path, PureWindowsPath
 from unittest.mock import MagicMock
 
 import pytest
@@ -17,6 +19,7 @@ from rekordbox_edit.query import (
     find_playlists_by_name,
     get_filtered_content,
     normalize_path,
+    _restore_drive_letter,
 )
 
 
@@ -24,6 +27,24 @@ def _compile(condition: ColumnElement[bool]) -> str:
     return str(condition.compile(compile_kwargs={"literal_binds": True}))
 
 
+@contextmanager
+def _subst_drive(target: Path):
+    """Map the first free drive letter to `target` for the duration of the
+    block. subst is a per-session mapping: it creates no files and leaves
+    nothing behind once detached."""
+    drive = next(
+        (f"{letter}:" for letter in "ZYXWV" if not os.path.exists(f"{letter}:/")),
+        None,
+    )
+    if drive is None:
+        pytest.skip("no free drive letter to map")
+    subprocess.run(["subst", drive, str(target)], check=True)
+    try:
+        yield drive
+    finally:
+        subprocess.run(["subst", drive, "/D"], check=True)
+
+
 class TestCollectionQuery:
     """Test the CollectionQuery class."""
 
@@ -885,6 +906,42 @@ class TestNormalizePath:
     def test_makes_relative_paths_absolute(self):
         assert os.path.isabs(normalize_path("song.flac"))
 
+    @pytest.mark.skipif(
+        platform.system() != "Windows", reason="drive letters are Windows-only"
+    )
+    def test_keeps_the_drive_letter_a_subst_drive_resolves_away(self, tmp_path):
+        """A mapped drive is what this guards in the field; subst stands in for
+        one, since Path.resolve() expands both the same way."""
+        track = tmp_path / "song.flac"
+        track.write_bytes(b"")
+        with _subst_drive(tmp_path) as drive:
+            assert normalize_path(f"{drive}/song.flac") == f"{drive}/song.flac"
+
+
+class TestRestoreDriveLetter:
+    """The drive-letter half of normalize_path, fed the paths Windows would
+    produce so the assertions run on every platform."""
+
+    UNC = PureWindowsPath("//192.168.68.10/music")
+
+    def test_rewrites_a_unc_share_back_onto_the_drive(self):
+        resolved = self.UNC / "DJ Music/song.flac"
+        assert (
+            _restore_drive_letter(resolved, "M:", self.UNC) == "M:/DJ Music/song.flac"
+        )
+
+    def test_rewrites_the_share_root_itself(self):
+        assert _restore_drive_letter(self.UNC, "M:", self.UNC) == "M:/"
+
+    def test_keeps_a_path_outside_the_drive_target(self):
+        """A symlink deeper in the path can land outside the share; the
+        resolved form is then the only one that points at the file."""
+        resolved = PureWindowsPath("//other-host/backup/song.flac")
+        assert (
+            _restore_drive_letter(resolved, "M:", self.UNC)
+            == "//other-host/backup/song.flac"
+        )
+
 
 class TestFindContentByKey:
     @staticmethod

{rekordbox_edit-0.13.1.dev23 → rekordbox_edit-0.13.2.dev24}/uv.lock

@@ -1274,7 +1274,7 @@ wheels = [
 
 [[package]]
 name = "rekordbox-edit"
-version = "0.13.1.dev23"
+version = "0.13.2.dev24"
 source = { editable = "." }
 dependencies = [
     { name = "click" },