rekordbox-edit 0.13.2.dev24__tar.gz → 0.13.3.dev1__tar.gz

{rekordbox_edit-0.13.2.dev24 → rekordbox_edit-0.13.3.dev1}/CHANGELOG.md

@@ -1,4 +1,15 @@
-## v0.13.2.dev24 (2026-09-29)
+## v0.13.3.dev1 (2026-10-03)
+
+
+- chore(deps): update dependency platformdirs to v4.12.2 (#255)
+- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
+
+## v0.13.3 (2026-10-01)
+
+
+- fix(import): read and concatenate all tagged genres
+
+## v0.13.2 (2026-09-29)
 
 
 - fix(import): don't resolve mapped/symlinked drives to their UNC paths

{rekordbox_edit-0.13.2.dev24 → rekordbox_edit-0.13.3.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: rekordbox-edit
-Version: 0.13.2.dev24
+Version: 0.13.3.dev1
 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.2.dev24 → rekordbox_edit-0.13.3.dev1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "rekordbox-edit"
-version = "0.13.2.dev24"
+version = "0.13.3.dev1"
 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.2.dev24 → rekordbox_edit-0.13.3.dev1}/rekordbox_edit/tags.py

@@ -42,6 +42,9 @@ class TrackTags(TypedDict):
     bitrate: int | None
 
 
+#: Joins the genres of a multi-genre file into the single name a track stores.
+GENRE_SEPARATOR = "; "
+
 # Rekordbox FileType by mutagen's file class. MP4 splits on the codec because
 # .m4a holds either ALAC or AAC and the extension cannot tell them apart.
 _MP4_ALAC, _MP4_AAC = 6, 4
@@ -91,8 +94,17 @@ _MP4_KEYS: dict[str, tuple[str, ...]] = {
 }
 
 
-def _first(tags, keys) -> str | None:
-    """The first non-empty value among `keys`, as a string.
+def _text(value) -> str:
+    """One raw mutagen value as stripped text."""
+    if isinstance(value, tuple):  # MP4 trkn/disk are (number, total)
+        value = value[0]
+    if isinstance(value, (bytes, bytearray)):
+        value = bytes(value).decode("utf-8", "replace")
+    return str(value).strip()
+
+
+def _values(tags, keys) -> list[str]:
+    """Every non-empty value under the first of `keys` the file carries.
 
     A literal "COMM" key is a fallback marker: mutagen keys ID3 comment
     frames as "COMM:<description>:<language>", and the description varies
@@ -109,20 +121,31 @@ def _first(tags, keys) -> str | None:
                 raw = tags[key]
             except (KeyError, TypeError):
                 continue
-        if isinstance(raw, list) and raw:
-            value = raw[0]
-        elif hasattr(raw, "text"):  # ID3 frame; .text holds its value(s)
-            value = raw.text[0] if raw.text else ""
+        if hasattr(raw, "text"):  # ID3 frame; .text holds its value(s)
+            items = list(raw.text)
+        elif isinstance(raw, list):
+            items = raw
         else:
-            value = raw
-        if isinstance(value, tuple):  # MP4 trkn/disk are (number, total)
-            value = value[0]
-        if isinstance(value, (bytes, bytearray)):
-            value = bytes(value).decode("utf-8", "replace")
-        text = str(value).strip()
-        if text:
-            return text
-    return None
+            items = [raw]
+        values = [text for text in (_text(item) for item in items) if text]
+        if values:
+            return values
+    return []
+
+
+def _first(tags, keys) -> str | None:
+    """The first non-empty value among `keys`, as a string."""
+    values = _values(tags, keys)
+    return values[0] if values else None
+
+
+def _genre(tags, keys) -> str | None:
+    """Every genre the file lists, joined by GENRE_SEPARATOR.
+
+    A track holds one GenreID, so multiple genres collapse into one name
+    that Rekordbox shows, sorts, and searches as written.
+    """
+    return GENRE_SEPARATOR.join(_values(tags, keys)) or None
 
 
 def _leading_int(value: str | None) -> int | None:
@@ -199,7 +222,7 @@ def read_tags(path: str) -> TrackTags:
         "title": read.get("title") or os.path.splitext(os.path.basename(path))[0],
         "artist": read.get("artist"),
         "album": read.get("album"),
-        "genre": read.get("genre"),
+        "genre": _genre(tags, keys["genre"]),
         "composer": read.get("composer"),
         "label": read.get("label"),
         "isrc": isrc,

{rekordbox_edit-0.13.2.dev24 → rekordbox_edit-0.13.3.dev1}/tests/test_tags.py

@@ -7,7 +7,7 @@ from mutagen.id3 import COMM, TCOM, TCON, TDRC, TKEY, TPOS, TPUB, TRCK, TSRC
 from mutagen.mp3 import MP3
 from mutagen.mp4 import MP4, MP4FreeForm
 
-from rekordbox_edit.tags import UnreadableFile, _first, read_tags
+from rekordbox_edit.tags import UnreadableFile, _first, _genre, read_tags
 
 FIXTURES = Path(__file__).resolve().parent / "e2e/fixtures/audio"
 
@@ -163,6 +163,16 @@ class TestVorbisTags:
         assert tags["track_no"] == 3
         assert tags["disc_no"] == 1
 
+    def test_joins_repeated_genre_comments(self, tmp_path):
+        """Vorbis stores a second genre as a second `genre` comment; all of
+        them reach the single genre a track stores."""
+        path = _copy(tmp_path, "01-flac-44_1k-16b.flac")
+        audio = FLAC(path)
+        audio["genre"] = ["Techno", "Electro", "  "]
+        audio.save()
+
+        assert read_tags(path)["genre"] == "Techno; Electro"
+
 
 class TestID3Tags:
     """genre through disc_no plus comment: none of these appear on the
@@ -211,9 +221,19 @@ class TestID3Tags:
         assert read_tags(path)["comment"] == "legacy note"
 
     def test_takes_the_first_value_of_a_multi_value_text_frame(self, tmp_path):
-        """A text frame may legally carry multiple values (e.g. two genres
-        in one TCON). Stringifying the whole frame joins them with a NUL
-        byte; read_tags must take only the first value instead."""
+        """A text frame may legally carry multiple values. Stringifying the
+        whole frame joins them with a NUL byte; read_tags must take only the
+        first value instead, except for genre, which keeps all of them."""
+        path = _copy(tmp_path, "07-mp3-44_1k-320cbr.mp3")
+
+        audio = MP3(path)
+        assert audio.tags is not None
+        audio.tags.add(TCOM(encoding=3, text=["First Composer", "Second Composer"]))
+        audio.save()
+
+        assert read_tags(path)["composer"] == "First Composer"
+
+    def test_joins_the_genres_of_a_multi_value_tcon_frame(self, tmp_path):
         path = _copy(tmp_path, "07-mp3-44_1k-320cbr.mp3")
 
         audio = MP3(path)
@@ -221,7 +241,7 @@ class TestID3Tags:
         audio.tags.add(TCON(encoding=3, text=["Trance", "Progressive House"]))
         audio.save()
 
-        assert read_tags(path)["genre"] == "Trance"
+        assert read_tags(path)["genre"] == "Trance; Progressive House"
 
 
 class TestFirst:
@@ -252,3 +272,11 @@ class TestFirst:
 
     def test_returns_none_when_every_key_is_empty(self):
         assert _first({"label": [""]}, ("label", "organization")) is None
+
+
+class TestGenre:
+    def test_joins_every_value_of_the_first_populated_key(self):
+        assert _genre({"\xa9gen": ["House", "Disco"]}, ("\xa9gen",)) == "House; Disco"
+
+    def test_returns_none_when_no_key_holds_a_genre(self):
+        assert _genre({}, ("genre",)) is None

{rekordbox_edit-0.13.2.dev24 → rekordbox_edit-0.13.3.dev1}/uv.lock

@@ -1,5 +1,5 @@
 version = 1
-revision = 3
+revision = 5
 requires-python = ">=3.11"
 
 [options]
@@ -884,11 +884,11 @@ wheels = [
 
 [[package]]
 name = "platformdirs"
-version = "4.11.12"
+version = "4.12.2"
 source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/ea/dd/65804b0c2925a1c821a05502ea57517b69a073ff400d25ab9faa3a2cf012/platformdirs-4.11.12.tar.gz", hash = "sha256:e8dc1cb58f1153fd7f61db1374317770baababec2480b37b8f01c6cc25b45267", size = 40016, upload-time = "2026-09-22T01:02:36.973Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/17/c8/721b3855fe457da514fe249247d404b9b39c5d16532278f70ebaa6acf18b/platformdirs-4.12.2.tar.gz", hash = "sha256:eab5f70271a490ef74618bb314fbb86e3c7e82fa3b9c922c2ea0e0a1a155d329", size = 59353, upload-time = "2026-09-29T18:27:56.009Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/ec/2b/69de6317fbf48865bb12aa56c9cfcfff46b3add0cd45250725d96146dce0/platformdirs-4.11.12-py3-none-any.whl", hash = "sha256:b1ba966ac76153d9985a0787ffab951e7c18416189873d4e4ddb2c8a04a0a254", size = 24976, upload-time = "2026-09-22T01:02:35.742Z" },
+    { url = "https://files.pythonhosted.org/packages/d0/89/446044f33aba0348d35e433f56d12206d010a5281a1df54054d4cfb82388/platformdirs-4.12.2-py3-none-any.whl", hash = "sha256:29dbf06d96c500bc6bdbce75fb0a14d63279c93b1842f97e72a135b33e856983", size = 32457, upload-time = "2026-09-29T18:27:54.43Z" },
 ]
 
 [[package]]
@@ -1274,7 +1274,7 @@ wheels = [
 
 [[package]]
 name = "rekordbox-edit"
-version = "0.13.2.dev24"
+version = "0.13.3.dev1"
 source = { editable = "." }
 dependencies = [
     { name = "click" },