rekordbox-edit 0.4.0.dev38__tar.gz → 0.4.0.dev40__tar.gz

{rekordbox_edit-0.4.0.dev38 → rekordbox_edit-0.4.0.dev40}/CHANGELOG.md

@@ -1,6 +1,9 @@
-## v0.4.0.dev38 (2026-06-05)
+## v0.4.0.dev40 (2026-06-05)
 
 
+- docs: update README.md
+- refactor(query): group filter args into FilterArgs dataclass
+- refactor(cli): extract convert-specific options into convert_click_options
 - refactor(cli): extract edit-specific options into edit_click_options
 - refactor(cli): extract shared confirmation flags into global_click_confirmations
 - chore(deps): update linters to v0.0.42 (#58)

{rekordbox_edit-0.4.0.dev38 → rekordbox_edit-0.4.0.dev40}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rekordbox-edit
-Version: 0.4.0.dev38
+Version: 0.4.0.dev40
 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
@@ -244,9 +244,9 @@ And generally limit the potential impact of a mistake by using filters to target
 
 ## AI Usage
 
-I believe it's important to be aware of and to disclose AI usage. AI seems to be forced upon us without us having much choice in the matter, and I like many others find this to be a gross and oppressive experience. While it has lots of potential to benefit the common good, so far it has mostly furthered capitalist greed.
+I believe it's important to be aware of and to disclose AI usage. In many ways it's being forced upon us without us having much choice in the matter, and it's a gross and oppressive experience. While it has lots of potential to benefit the common good, mostly it's only furthered capitalist greed.
 
-This isn't a soapbox, but an attempt to thoughtfully disclose how generative AI has contributed to building this tool. I might have built it without AI, but it's not usually my preference to spend my free time coding in front of a computer, and using it has drastically reduced the time it would have taken. I have many years of professional experience as a Software Engineer, and while it will probably age poorly to say this in the (hopefully far) future, I don't think AI could have built this tool without me. Please validate the quality of this project yourself--at the end of the day it's just code written by some stranger!
+I'm mostly attempting to thoughtfully disclose that generative AI _has_ been a significant tool in building out this project. I don't personally enjoy too much coding in my personal time, but I feel passionate about making `rekordbox-edit`--AI has admittedly helped me bridge that gap between my capacity and my vision. I'm a career professional software engineer who takes pride in their work, and I don't want to produce a vibe coded mess any more than you want to experience it. Please validate the quality of this project yourself--at the end of the day it's just code written by some stranger.
 
 If it's any consolation, my main test subject has been my own 10,000+ track RekordBox library--a risk I do not take lightly!
 
@@ -254,7 +254,7 @@ If it's any consolation, my main test subject has been my own 10,000+ track Reko
 
 This project exists thanks to [@dylanjones](https://github.com/dylanjones), the creator of [pyrekordbox](https://github.com/dylanljones/pyrekordbox), which provides the Python API for Rekordbox databases.
 
-I built this tool to help correct my own bad habits and misteps in managing and organizing my rekordbox library. If it helps you too, great! If you find issues or have ideas, contributions are welcome.
+I built this tool to help correct my own bad habits and missteps in managing and organizing my rekordbox library. If it helps you too, great! If you find issues or have ideas, contributions are welcome.
 
 ## Contributing
 

{rekordbox_edit-0.4.0.dev38 → rekordbox_edit-0.4.0.dev40}/README.md

@@ -225,9 +225,9 @@ And generally limit the potential impact of a mistake by using filters to target
 
 ## AI Usage
 
-I believe it's important to be aware of and to disclose AI usage. AI seems to be forced upon us without us having much choice in the matter, and I like many others find this to be a gross and oppressive experience. While it has lots of potential to benefit the common good, so far it has mostly furthered capitalist greed.
+I believe it's important to be aware of and to disclose AI usage. In many ways it's being forced upon us without us having much choice in the matter, and it's a gross and oppressive experience. While it has lots of potential to benefit the common good, mostly it's only furthered capitalist greed.
 
-This isn't a soapbox, but an attempt to thoughtfully disclose how generative AI has contributed to building this tool. I might have built it without AI, but it's not usually my preference to spend my free time coding in front of a computer, and using it has drastically reduced the time it would have taken. I have many years of professional experience as a Software Engineer, and while it will probably age poorly to say this in the (hopefully far) future, I don't think AI could have built this tool without me. Please validate the quality of this project yourself--at the end of the day it's just code written by some stranger!
+I'm mostly attempting to thoughtfully disclose that generative AI _has_ been a significant tool in building out this project. I don't personally enjoy too much coding in my personal time, but I feel passionate about making `rekordbox-edit`--AI has admittedly helped me bridge that gap between my capacity and my vision. I'm a career professional software engineer who takes pride in their work, and I don't want to produce a vibe coded mess any more than you want to experience it. Please validate the quality of this project yourself--at the end of the day it's just code written by some stranger.
 
 If it's any consolation, my main test subject has been my own 10,000+ track RekordBox library--a risk I do not take lightly!
 
@@ -235,7 +235,7 @@ If it's any consolation, my main test subject has been my own 10,000+ track Reko
 
 This project exists thanks to [@dylanjones](https://github.com/dylanjones), the creator of [pyrekordbox](https://github.com/dylanljones/pyrekordbox), which provides the Python API for Rekordbox databases.
 
-I built this tool to help correct my own bad habits and misteps in managing and organizing my rekordbox library. If it helps you too, great! If you find issues or have ideas, contributions are welcome.
+I built this tool to help correct my own bad habits and missteps in managing and organizing my rekordbox library. If it helps you too, great! If you find issues or have ideas, contributions are welcome.
 
 ## Contributing
 

{rekordbox_edit-0.4.0.dev38 → rekordbox_edit-0.4.0.dev40}/pyproject.toml

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

{rekordbox_edit-0.4.0.dev38 → rekordbox_edit-0.4.0.dev40}/rekordbox_edit/_click.py

@@ -142,6 +142,25 @@ edit_click_options = [
     ),
 ]
 
+convert_click_options = [
+    click.option(
+        "--delete/--keep",
+        default=None,
+        help="Delete or keep original files after conversion (default: delete for lossless, keep for MP3)",
+    ),
+    click.option(
+        "--overwrite",
+        is_flag=True,
+        help="Overwrite existing output files instead of skipping them",
+    ),
+    click.option(
+        "--format-out",
+        type=click.Choice(["aiff", "flac", "wav", "alac", "mp3"], case_sensitive=False),
+        default="aiff",
+        help="Output format (default: aiff)",
+    ),
+]
+
 
 def add_click_options(options):
     def _add_options(func):

rekordbox_edit-0.4.0.dev40/rekordbox_edit/args.py

@@ -0,0 +1,54 @@
+"""Dataclass containers for CLI argument groups.
+
+These types are the public API of the functional layer below the CLI: callers
+of `get_filtered_content` and the private command helpers receive them in lieu
+of long flat parameter lists. Each `*_from_kwargs` factory packs the matching
+Click parameters into its dataclass.
+"""
+
+from dataclasses import dataclass, field
+
+
+@dataclass
+class FilterArgs:
+    """Filter inputs forwarded to `get_filtered_content`.
+
+    Field names mirror the Click parameter names: `track_ids` holds the
+    positional TRACK_IDS argument (variadic), `track_id` holds the values of
+    the repeated `--track-id` option.
+    """
+
+    track_id: list[str] = field(default_factory=list)
+    track_ids: list[str] = field(default_factory=list)
+    title: list[str] = field(default_factory=list)
+    exact_title: list[str] = field(default_factory=list)
+    playlist: list[str] = field(default_factory=list)
+    exact_playlist: list[str] = field(default_factory=list)
+    artist: list[str] = field(default_factory=list)
+    exact_artist: list[str] = field(default_factory=list)
+    album: list[str] = field(default_factory=list)
+    exact_album: list[str] = field(default_factory=list)
+    path: list[str] = field(default_factory=list)
+    exact_path: list[str] = field(default_factory=list)
+    format: list[str] = field(default_factory=list)
+    match_all: bool = False
+
+
+def filter_args_from_kwargs(**kwargs) -> FilterArgs:
+    """Pack the flat Click kwargs for the `global_click_filters` group into a FilterArgs."""
+    return FilterArgs(
+        track_id=list(kwargs.get("track_id") or []),
+        track_ids=list(kwargs.get("track_ids") or []),
+        title=list(kwargs.get("title") or []),
+        exact_title=list(kwargs.get("exact_title") or []),
+        playlist=list(kwargs.get("playlist") or []),
+        exact_playlist=list(kwargs.get("exact_playlist") or []),
+        artist=list(kwargs.get("artist") or []),
+        exact_artist=list(kwargs.get("exact_artist") or []),
+        album=list(kwargs.get("album") or []),
+        exact_album=list(kwargs.get("exact_album") or []),
+        path=list(kwargs.get("path") or []),
+        exact_path=list(kwargs.get("exact_path") or []),
+        format=list(kwargs.get("format") or []),
+        match_all=bool(kwargs.get("match_all", False)),
+    )

{rekordbox_edit-0.4.0.dev38 → rekordbox_edit-0.4.0.dev40}/rekordbox_edit/commands/convert.py

@@ -16,11 +16,13 @@ from pyrekordbox.utils import get_rekordbox_pid
 from rekordbox_edit._click import (
     PrintChoice,
     add_click_options,
+    convert_click_options,
     global_click_confirmations,
     global_click_filters,
     print_option,
     track_ids_argument,
 )
+from rekordbox_edit.args import filter_args_from_kwargs
 from rekordbox_edit.logger import get_debug_file_path, set_level
 from rekordbox_edit.query import get_filtered_content
 from rekordbox_edit.display import PrintableField, print_track_info
@@ -245,26 +247,11 @@ def get_output_path(content, output_format) -> Tuple[str, str, str]:
 @click.command(
     epilog=f"Debug logs for each run can be found at:\n{get_debug_file_path().parent}"
 )
-@click.option(
-    "--delete/--keep",
-    default=None,
-    help="Delete or keep original files after conversion (default: delete for lossless, keep for MP3)",
-)
-@click.option(
-    "--overwrite",
-    is_flag=True,
-    help="Overwrite existing output files instead of skipping them",
-)
-@click.option(
-    "--format-out",
-    type=click.Choice(["aiff", "flac", "wav", "alac", "mp3"], case_sensitive=False),
-    default="aiff",
-    help="Output format (default: aiff)",
-)
 @add_click_options(
     [
         *global_click_filters,
         *global_click_confirmations,
+        *convert_click_options,
         print_option,
         track_ids_argument,
     ]
@@ -375,23 +362,23 @@ def convert_command(
         logger.debug("Database connection established")
 
         # === QUERY & FILTER ===
-        result = get_filtered_content(
-            db,
-            track_id_args=track_ids,
-            track_ids=track_id,
-            formats=format,
-            playlists=playlist,
-            exact_playlists=exact_playlist,
-            artists=artist,
-            exact_artists=exact_artist,
-            albums=album,
-            exact_albums=exact_album,
-            titles=title,
-            exact_titles=exact_title,
-            paths=path,
-            exact_paths=exact_path,
+        filters = filter_args_from_kwargs(
+            track_id=track_id,
+            track_ids=track_ids,
+            playlist=playlist,
+            exact_playlist=exact_playlist,
+            album=album,
+            exact_album=exact_album,
+            artist=artist,
+            exact_artist=exact_artist,
+            title=title,
+            exact_title=exact_title,
+            path=path,
+            exact_path=exact_path,
+            format=format,
             match_all=match_all,
         )
+        result = get_filtered_content(db, filters)
         filtered_content = result.scalars().all()
         logger.debug(f"Query returned {len(filtered_content)} tracks")
 

{rekordbox_edit-0.4.0.dev38 → rekordbox_edit-0.4.0.dev40}/rekordbox_edit/commands/edit.py

@@ -16,6 +16,7 @@ from rekordbox_edit._click import (
     print_option,
     track_ids_argument,
 )
+from rekordbox_edit.args import filter_args_from_kwargs
 from rekordbox_edit.logger import get_debug_file_path, set_level
 from rekordbox_edit.query import get_filtered_content
 from rekordbox_edit.display import PrintableField, print_track_info
@@ -106,23 +107,23 @@ def edit_command(
     if not db.session:
         raise RuntimeError("Failed to connect to Rekordbox Database: No Session.")
 
-    result = get_filtered_content(
-        db,
-        track_id_args=track_ids,
-        track_ids=track_id,
-        playlists=playlist,
-        exact_playlists=exact_playlist,
-        artists=artist,
-        exact_artists=exact_artist,
-        albums=album,
-        exact_albums=exact_album,
-        titles=title,
-        exact_titles=exact_title,
-        paths=path,
-        exact_paths=exact_path,
-        formats=format,
+    filters = filter_args_from_kwargs(
+        track_id=track_id,
+        track_ids=track_ids,
+        playlist=playlist,
+        exact_playlist=exact_playlist,
+        album=album,
+        exact_album=exact_album,
+        artist=artist,
+        exact_artist=exact_artist,
+        title=title,
+        exact_title=exact_title,
+        path=path,
+        exact_path=exact_path,
+        format=format,
         match_all=match_all,
     )
+    result = get_filtered_content(db, filters)
     tracks = result.scalars().all()
 
     col_name = FIELD_COLUMNS[field]

{rekordbox_edit-0.4.0.dev38 → rekordbox_edit-0.4.0.dev40}/rekordbox_edit/commands/search.py

@@ -14,6 +14,7 @@ from rekordbox_edit._click import (
     print_option,
     track_ids_argument,
 )
+from rekordbox_edit.args import filter_args_from_kwargs
 from rekordbox_edit.logger import get_debug_file_path, set_level
 from rekordbox_edit.query import get_filtered_content
 from rekordbox_edit.display import print_track_info
@@ -51,61 +52,31 @@ def search_command(
         if stdin_data:
             track_ids = list(track_ids or []) + stdin_data.split()
 
-    logger.debug("Connecting to RekordBox database...")
+    filters = filter_args_from_kwargs(
+        track_id=track_id,
+        track_ids=track_ids,
+        playlist=playlist,
+        exact_playlist=exact_playlist,
+        album=album,
+        exact_album=exact_album,
+        artist=artist,
+        exact_artist=exact_artist,
+        title=title,
+        exact_title=exact_title,
+        path=path,
+        exact_path=exact_path,
+        format=format,
+        match_all=match_all,
+    )
 
-    # Log search parameters for troubleshooting
-    filters = []
-    if track_ids:
-        filters.append(f"track_ids={track_ids}")
-    if track_id:
-        filters.append(f"track_id={track_id}")
-    if artist:
-        filters.append(f"artist={artist}")
-    if exact_artist:
-        filters.append(f"exact_artist={exact_artist}")
-    if title:
-        filters.append(f"title={title}")
-    if exact_title:
-        filters.append(f"exact_title={exact_title}")
-    if album:
-        filters.append(f"album={album}")
-    if exact_album:
-        filters.append(f"exact_album={exact_album}")
-    if playlist:
-        filters.append(f"playlist={playlist}")
-    if exact_playlist:
-        filters.append(f"exact_playlist={exact_playlist}")
-    if path:
-        filters.append(f"path={path}")
-    if exact_path:
-        filters.append(f"exact_path={exact_path}")
-    if format:
-        filters.append(f"format={format}")
-    if match_all:
-        filters.append("match_all=True")
-    logger.debug(f"Search filters: {', '.join(filters) if filters else 'none'}")
+    logger.debug(f"Search filters: {filters}")
+    logger.debug("Connecting to RekordBox database...")
 
     db = Rekordbox6Database()
     if not db.session:
         raise RuntimeError("Failed to connect to Rekordbox Database: No Session.")
 
-    filtered_result = get_filtered_content(
-        db,
-        track_id_args=track_ids,
-        track_ids=track_id,
-        playlists=playlist,
-        exact_playlists=exact_playlist,
-        artists=artist,
-        exact_artists=exact_artist,
-        albums=album,
-        exact_albums=exact_album,
-        titles=title,
-        exact_titles=exact_title,
-        paths=path,
-        exact_paths=exact_path,
-        formats=format,
-        match_all=match_all,
-    )
+    filtered_result = get_filtered_content(db, filters)
 
     if print_opt is PrintChoice.SILENT:
         pass

{rekordbox_edit-0.4.0.dev38 → rekordbox_edit-0.4.0.dev40}/rekordbox_edit/query.py

@@ -13,6 +13,8 @@ from pyrekordbox.db6.tables import (
 from sqlalchemy import ColumnElement, Result, and_, func, or_, select
 from sqlalchemy.orm import aliased
 
+from rekordbox_edit.args import FilterArgs
+
 logger = logging.getLogger(__name__)
 
 
@@ -247,20 +249,7 @@ class CollectionQuery:
 
 def get_filtered_content(
     db: Rekordbox6Database,
-    track_id_args: List[str] | None = None,
-    track_ids: List[str] | None = None,
-    formats: List[str] | None = None,
-    playlists: List[str] | None = None,
-    exact_playlists: List[str] | None = None,
-    artists: List[str] | None = None,
-    exact_artists: List[str] | None = None,
-    albums: List[str] | None = None,
-    exact_albums: List[str] | None = None,
-    titles: List[str] | None = None,
-    exact_titles: List[str] | None = None,
-    paths: List[str] | None = None,
-    exact_paths: List[str] | None = None,
-    match_all: bool = False,
+    filters: FilterArgs,
 ) -> Result[Tuple[DjmdContent]]:
     """Query the Rekordbox database with the provided filters."""
     db = db if db is not None else Rekordbox6Database()
@@ -269,59 +258,47 @@ def get_filtered_content(
 
     query = CollectionQuery()
 
-    if track_id_args:
-        logger.debug(f"Filtering by {len(track_id_args)} track ID argument(s)")
-        query = query.by_track_ids(track_ids=track_id_args)
+    if filters.track_ids:
+        logger.debug(f"Filtering by {len(filters.track_ids)} track ID argument(s)")
+        query = query.by_track_ids(track_ids=filters.track_ids)
 
-    if track_ids:
-        for track_id in track_ids:
-            query = query.by_track_ids(track_id)
+    for tid in filters.track_id:
+        query = query.by_track_ids(tid)
 
-    if formats:
-        for fmt in formats:
-            query = query.by_format(fmt)
+    for fmt in filters.format:
+        query = query.by_format(fmt)
 
-    if playlists:
-        for playlist in playlists:
-            query = query.by_playlist(playlist)
+    for playlist in filters.playlist:
+        query = query.by_playlist(playlist)
 
-    if exact_playlists:
-        for exact_playlist in exact_playlists:
-            query = query.by_playlist(exact_playlist, exact=True)
+    for exact_playlist in filters.exact_playlist:
+        query = query.by_playlist(exact_playlist, exact=True)
 
-    if artists:
-        for artist in artists:
-            query = query.by_artist(artist)
+    for artist in filters.artist:
+        query = query.by_artist(artist)
 
-    if exact_artists:
-        for exact_artist in exact_artists:
-            query = query.by_artist(exact_artist, exact=True)
+    for exact_artist in filters.exact_artist:
+        query = query.by_artist(exact_artist, exact=True)
 
-    if albums:
-        for album in albums:
-            query = query.by_album(album)
+    for album in filters.album:
+        query = query.by_album(album)
 
-    if exact_albums:
-        for exact_album in exact_albums:
-            query = query.by_album(exact_album, exact=True)
+    for exact_album in filters.exact_album:
+        query = query.by_album(exact_album, exact=True)
 
-    if titles:
-        for title in titles:
-            query = query.by_title(title)
+    for title in filters.title:
+        query = query.by_title(title)
 
-    if exact_titles:
-        for title in exact_titles:
-            query = query.by_title(title, exact=True)
+    for title in filters.exact_title:
+        query = query.by_title(title, exact=True)
 
-    if paths:
-        for path in paths:
-            query = query.by_path(path)
+    for path in filters.path:
+        query = query.by_path(path)
 
-    if exact_paths:
-        for exact_path in exact_paths:
-            query = query.by_path(exact_path, exact=True)
+    for exact_path in filters.exact_path:
+        query = query.by_path(exact_path, exact=True)
 
-    if match_all:
+    if filters.match_all:
         query = query.match_all()
 
     return query.execute(db)

{rekordbox_edit-0.4.0.dev38 → rekordbox_edit-0.4.0.dev40}/tests/commands/test_convert.py

@@ -709,10 +709,10 @@ class TestConvertCommand:
             ["--dry-run", "--artist", "Daft Punk", "--format", "flac", "--match-all"],
         )
 
-        call_kwargs = mock_get_filtered_content.call_args.kwargs
-        assert call_kwargs["artists"] == ("Daft Punk",)
-        assert call_kwargs["formats"] == ("flac",)
-        assert call_kwargs["match_all"] is True
+        filters = mock_get_filtered_content.call_args.args[1]
+        assert filters.artist == ["Daft Punk"]
+        assert filters.format == ["flac"]
+        assert filters.match_all is True
 
     @patch("rekordbox_edit.commands.convert.get_rekordbox_pid")
     @patch("rekordbox_edit.commands.convert.confirm")
@@ -2074,8 +2074,8 @@ class TestConvertStdinPiping:
             input="190993005 108916663 59476253",
         )
 
-        call_kwargs = mock_get_filtered_content.call_args.kwargs
-        assert call_kwargs["track_id_args"] == ["190993005", "108916663", "59476253"]
+        filters = mock_get_filtered_content.call_args.args[1]
+        assert filters.track_ids == ["190993005", "108916663", "59476253"]
 
     @patch("rekordbox_edit.commands.convert.get_rekordbox_pid")
     @patch("rekordbox_edit.commands.convert.get_filtered_content")
@@ -2109,8 +2109,8 @@ class TestConvertStdinPiping:
             input="59476253 113475696",
         )
 
-        call_kwargs = mock_get_filtered_content.call_args.kwargs
-        assert call_kwargs["track_id_args"] == [
+        filters = mock_get_filtered_content.call_args.args[1]
+        assert filters.track_ids == [
             "190993005",
             "108916663",
             "59476253",
@@ -2154,5 +2154,5 @@ class TestConvertStdinPiping:
         runner = CliRunner()
         runner.invoke(convert_command, ["--dry-run"], input="   ")
 
-        call_kwargs = mock_get_filtered_content.call_args.kwargs
-        assert not call_kwargs["track_id_args"]
+        filters = mock_get_filtered_content.call_args.args[1]
+        assert not filters.track_ids

{rekordbox_edit-0.4.0.dev38 → rekordbox_edit-0.4.0.dev40}/tests/commands/test_edit.py

@@ -219,10 +219,10 @@ class TestEditCommandPhase1:
             ],
         )
 
-        kwargs = mock_gfc.call_args.kwargs
-        assert kwargs["artists"] == ("Bicep",)
-        assert kwargs["formats"] == ("flac",)
-        assert kwargs["match_all"] is True
+        filters = mock_gfc.call_args.args[1]
+        assert filters.artist == ["Bicep"]
+        assert filters.format == ["flac"]
+        assert filters.match_all is True
 
     @patch("rekordbox_edit.commands.edit.confirm")
     @patch("rekordbox_edit.commands.edit.get_filtered_content")

{rekordbox_edit-0.4.0.dev38 → rekordbox_edit-0.4.0.dev40}/tests/commands/test_search.py

@@ -150,12 +150,12 @@ class TestSearchCommand:
             ],
         )
 
-        call_kwargs = mock_get_filtered_content.call_args.kwargs
-        assert call_kwargs["artists"] == ("Daft Punk",)
-        assert call_kwargs["formats"] == ("flac",)
-        assert call_kwargs["paths"] == ("song.mp3",)
-        assert call_kwargs["exact_paths"] == ("/Music/album/track.wav",)
-        assert call_kwargs["match_all"] is True
+        filters = mock_get_filtered_content.call_args.args[1]
+        assert filters.artist == ["Daft Punk"]
+        assert filters.format == ["flac"]
+        assert filters.path == ["song.mp3"]
+        assert filters.exact_path == ["/Music/album/track.wav"]
+        assert filters.match_all is True
 
 
 class TestSearchStdinPiping:
@@ -184,8 +184,8 @@ class TestSearchStdinPiping:
         runner = CliRunner()
         runner.invoke(search_command, [], input="190993005 108916663 59476253")
 
-        call_kwargs = mock_get_filtered_content.call_args.kwargs
-        assert call_kwargs["track_id_args"] == ["190993005", "108916663", "59476253"]
+        filters = mock_get_filtered_content.call_args.args[1]
+        assert filters.track_ids == ["190993005", "108916663", "59476253"]
 
     @patch("rekordbox_edit.commands.search.print_track_info")
     @patch("rekordbox_edit.commands.search.get_filtered_content")
@@ -214,8 +214,8 @@ class TestSearchStdinPiping:
             input="59476253 113475696",
         )
 
-        call_kwargs = mock_get_filtered_content.call_args.kwargs
-        assert call_kwargs["track_id_args"] == [
+        filters = mock_get_filtered_content.call_args.args[1]
+        assert filters.track_ids == [
             "190993005",
             "108916663",
             "59476253",
@@ -245,5 +245,5 @@ class TestSearchStdinPiping:
         runner = CliRunner()
         runner.invoke(search_command, [], input="   ")
 
-        call_kwargs = mock_get_filtered_content.call_args.kwargs
-        assert not call_kwargs["track_id_args"]
+        filters = mock_get_filtered_content.call_args.args[1]
+        assert not filters.track_ids

{rekordbox_edit-0.4.0.dev38 → rekordbox_edit-0.4.0.dev40}/tests/test_query.py

@@ -9,6 +9,7 @@ from unittest.mock import MagicMock
 import pytest
 from sqlalchemy import ColumnElement
 
+from rekordbox_edit.args import FilterArgs
 from rekordbox_edit.query import CollectionQuery, get_filtered_content
 
 
@@ -590,7 +591,7 @@ class TestGetFilteredContent:
     """Tests for the get_filtered_content function."""
 
     def test_no_filters(self, mock_db, mock_query):
-        get_filtered_content(mock_db)
+        get_filtered_content(mock_db, FilterArgs())
         mock_query.by_track_ids.assert_not_called()
         mock_query.by_artist.assert_not_called()
         mock_query.by_title.assert_not_called()
@@ -601,83 +602,84 @@ class TestGetFilteredContent:
         mock_query.execute.assert_called_once_with(mock_db)
 
     def test_track_id_args(self, mock_db, mock_query):
-        get_filtered_content(mock_db, track_id_args=["123", "456"])
+        get_filtered_content(mock_db, FilterArgs(track_ids=["123", "456"]))
         mock_query.by_track_ids.assert_called_once_with(track_ids=["123", "456"])
 
     def test_track_ids(self, mock_db, mock_query):
-        get_filtered_content(mock_db, track_ids=["123", "456"])
+        get_filtered_content(mock_db, FilterArgs(track_id=["123", "456"]))
         assert mock_query.by_track_ids.call_count == 2
         mock_query.by_track_ids.assert_any_call("123")
         mock_query.by_track_ids.assert_any_call("456")
 
     def test_artist(self, mock_db, mock_query):
-        get_filtered_content(mock_db, artists=["Daft Punk"])
+        get_filtered_content(mock_db, FilterArgs(artist=["Daft Punk"]))
         mock_query.by_artist.assert_called_once_with("Daft Punk")
 
     def test_multiple_artists(self, mock_db, mock_query):
-        get_filtered_content(mock_db, artists=["Daft Punk", "Justice"])
+        get_filtered_content(mock_db, FilterArgs(artist=["Daft Punk", "Justice"]))
         assert mock_query.by_artist.call_count == 2
         mock_query.by_artist.assert_any_call("Daft Punk")
         mock_query.by_artist.assert_any_call("Justice")
 
     def test_exact_artist(self, mock_db, mock_query):
-        get_filtered_content(mock_db, exact_artists=["Daft Punk"])
+        get_filtered_content(mock_db, FilterArgs(exact_artist=["Daft Punk"]))
         mock_query.by_artist.assert_called_once_with("Daft Punk", exact=True)
 
     def test_title(self, mock_db, mock_query):
-        get_filtered_content(mock_db, titles=["One More Time"])
+        get_filtered_content(mock_db, FilterArgs(title=["One More Time"]))
         mock_query.by_title.assert_called_once_with("One More Time")
 
     def test_exact_title(self, mock_db, mock_query):
-        get_filtered_content(mock_db, exact_titles=["One More Time"])
+        get_filtered_content(mock_db, FilterArgs(exact_title=["One More Time"]))
         mock_query.by_title.assert_called_once_with("One More Time", exact=True)
 
     def test_album(self, mock_db, mock_query):
-        get_filtered_content(mock_db, albums=["Discovery"])
+        get_filtered_content(mock_db, FilterArgs(album=["Discovery"]))
         mock_query.by_album.assert_called_once_with("Discovery")
 
     def test_exact_album(self, mock_db, mock_query):
-        get_filtered_content(mock_db, exact_albums=["Discovery"])
+        get_filtered_content(mock_db, FilterArgs(exact_album=["Discovery"]))
         mock_query.by_album.assert_called_once_with("Discovery", exact=True)
 
     def test_playlist(self, mock_db, mock_query):
-        get_filtered_content(mock_db, playlists=["My Playlist"])
+        get_filtered_content(mock_db, FilterArgs(playlist=["My Playlist"]))
         mock_query.by_playlist.assert_called_once_with("My Playlist")
 
     def test_exact_playlist(self, mock_db, mock_query):
-        get_filtered_content(mock_db, exact_playlists=["My Playlist"])
+        get_filtered_content(mock_db, FilterArgs(exact_playlist=["My Playlist"]))
         mock_query.by_playlist.assert_called_once_with("My Playlist", exact=True)
 
     def test_path(self, mock_db, mock_query):
-        get_filtered_content(mock_db, paths=["Music/track.mp3"])
+        get_filtered_content(mock_db, FilterArgs(path=["Music/track.mp3"]))
         mock_query.by_path.assert_called_once_with("Music/track.mp3")
 
     def test_exact_path(self, mock_db, mock_query):
-        get_filtered_content(mock_db, exact_paths=["/Music/track.wav"])
+        get_filtered_content(mock_db, FilterArgs(exact_path=["/Music/track.wav"]))
         mock_query.by_path.assert_called_once_with("/Music/track.wav", exact=True)
 
     def test_format(self, mock_db, mock_query):
-        get_filtered_content(mock_db, formats=["flac"])
+        get_filtered_content(mock_db, FilterArgs(format=["flac"]))
         mock_query.by_format.assert_called_once_with("flac")
 
     def test_multiple_formats(self, mock_db, mock_query):
-        get_filtered_content(mock_db, formats=["flac", "aiff"])
+        get_filtered_content(mock_db, FilterArgs(format=["flac", "aiff"]))
         assert mock_query.by_format.call_count == 2
         mock_query.by_format.assert_any_call("flac")
         mock_query.by_format.assert_any_call("aiff")
 
     def test_match_all(self, mock_db, mock_query):
-        get_filtered_content(mock_db, artists=["Daft Punk"], match_all=True)
+        get_filtered_content(mock_db, FilterArgs(artist=["Daft Punk"], match_all=True))
         mock_query.match_all.assert_called_once()
 
     def test_default_no_match_all(self, mock_db, mock_query):
-        get_filtered_content(mock_db, artists=["Daft Punk"])
+        get_filtered_content(mock_db, FilterArgs(artist=["Daft Punk"]))
         mock_query.match_all.assert_not_called()
 
     def test_track_id_args_combined_with_format(self, mock_db, mock_query):
-        """track_id_args should combine with other filters, not override them."""
+        """Positional track IDs should combine with other filters, not override them."""
         get_filtered_content(
-            mock_db, track_id_args=["123"], formats=["flac"], match_all=True
+            mock_db,
+            FilterArgs(track_ids=["123"], format=["flac"], match_all=True),
         )
         mock_query.by_track_ids.assert_called_once_with(track_ids=["123"])
         mock_query.by_format.assert_called_once_with("flac")
@@ -686,7 +688,8 @@ class TestGetFilteredContent:
     def test_track_id_args_combined_with_artist(self, mock_db, mock_query):
         """Piped IDs + artist filter with match_all narrows to artist within that ID set."""
         get_filtered_content(
-            mock_db, track_id_args=["123", "456"], artists=["Justice"], match_all=True
+            mock_db,
+            FilterArgs(track_ids=["123", "456"], artist=["Justice"], match_all=True),
         )
         mock_query.by_track_ids.assert_called_once_with(track_ids=["123", "456"])
         mock_query.by_artist.assert_called_once_with("Justice")
@@ -694,7 +697,7 @@ class TestGetFilteredContent:
 
     def test_track_id_args_or_with_artist(self, mock_db, mock_query):
         """Piped IDs OR'd with artist expands the result set."""
-        get_filtered_content(mock_db, track_id_args=["123"], artists=["Justice"])
+        get_filtered_content(mock_db, FilterArgs(track_ids=["123"], artist=["Justice"]))
         mock_query.by_track_ids.assert_called_once_with(track_ids=["123"])
         mock_query.by_artist.assert_called_once_with("Justice")
         mock_query.match_all.assert_not_called()
@@ -704,7 +707,7 @@ class TestGetFilteredContent:
         mock_db.session = None
 
         with pytest.raises(RuntimeError, match="No Session"):
-            get_filtered_content(mock_db)
+            get_filtered_content(mock_db, FilterArgs())
 
 
 class TestCollectionQueryExecution:

{rekordbox_edit-0.4.0.dev38 → rekordbox_edit-0.4.0.dev40}/uv.lock

@@ -1010,7 +1010,7 @@ wheels = [
 
 [[package]]
 name = "rekordbox-edit"
-version = "0.4.0.dev38"
+version = "0.4.0.dev40"
 source = { editable = "." }
 dependencies = [
     { name = "click" },