rekordbox-edit 0.9.0.dev22__tar.gz → 0.9.0.dev29__tar.gz

{rekordbox_edit-0.9.0.dev22 → rekordbox_edit-0.9.0.dev29}/.pre-commit-config.yaml

@@ -19,7 +19,7 @@ repos:
     -   id: check-toml
     -   id: check-case-conflict
 -   repo: https://github.com/commitizen-tools/commitizen
-    rev: v4.17.0
+    rev: v4.18.0
     hooks:
     -   id: commitizen
         stages: [commit-msg]
@@ -32,7 +32,7 @@ repos:
         files: pyproject\.toml$
         pass_filenames: false
 -   repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.16.3
+    rev: v0.16.4
     hooks:
     -   id: ruff-check
         args: [--fix]

{rekordbox_edit-0.9.0.dev22 → rekordbox_edit-0.9.0.dev29}/CHANGELOG.md

@@ -1,6 +1,29 @@
-## v0.9.0.dev22 (2026-08-21)
-
-
+## v0.9.0.dev29 (2026-08-25)
+
+
+- docs(filtering): document grouped default and --match-any
+- test(e2e): cover grouped default and --match-any against the fixture DB
+- Locks in the original bug report (--title + --format now intersect
+instead of union) plus the new --match-any flat-OR escape hatch.
+- feat(query): add --match-any flat-OR mode
+- Grouped mode is now the default (previous commit), so --match-all's
+old job — flattening everything into one OR-vs-AND switch — needs an
+explicit OR counterpart for anyone who still wants the old fully-broad
+search. match_all and match_any are mutually exclusive.
+- feat(query)!: group filter conditions by kind, OR within a kind and AND across kinds
+- CollectionQuery previously combined every condition in one flat list
+with a single OR/AND switch, so combining two different filters (e.g.
+--title and --format) matched their union instead of their
+intersection. Conditions now bucket by filter kind (title, artist,
+album, playlist, format, path, track_id); the default groups OR
+within a bucket and ANDs across buckets. match_all()/match_any() still
+flatten everything into one AND/OR, unchanged in meaning.
+- chore(deps): update pre-commit hook astral-sh/ruff-pre-commit to v0.16.4 (#184)
+- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
+- chore(deps): update pre-commit hook commitizen-tools/commitizen to v4.18.0 (#183)
+- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
+- chore(deps): update pre-commit hook commitizen-tools/commitizen to v4.17.1 (#181)
+- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 - docs: add research directory with reverse-engineering findings
 - Promote the durable Rekordbox behavior research out of the ignored ai-docs
 tree into a committed, per-investigation research/ directory. Each folder is

{rekordbox_edit-0.9.0.dev22 → rekordbox_edit-0.9.0.dev29}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: rekordbox-edit
-Version: 0.9.0.dev22
+Version: 0.9.0.dev29
 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.9.0.dev22 → rekordbox_edit-0.9.0.dev29}/docs/api.md

@@ -8,11 +8,13 @@ from rekordbox_edit.api import search
 from rekordbox_edit.models import SearchRequest
 
 db = Rekordbox6Database()
-response = search(db, SearchRequest(artist=["Daft Punk"], format=["flac"], match_all=True))
+response = search(db, SearchRequest(artist=["Daft Punk"], format=["flac"]))
 for track in response.tracks:
     print(track.ID, track.Title)
 ```
 
+Different filter kinds — `artist` and `format` above — AND together by default; repeated values of the same filter OR together. Pass `match_all=True` to flatten everything into one AND, or `match_any=True` to flatten everything into one OR.
+
 `--print json` on any CLI command emits exactly these response envelopes, so the models below also document the JSON you get when scripting.
 
 ## Functions
@@ -28,65 +30,65 @@ for track in response.tracks:
 The models form three layers: the [`FilterArgs`][rekordbox_edit.models.FilterArgs] base that every command shares, the per-command requests and responses, and the lower-level domain types those req/resp models are built from.
 
 ::: rekordbox_edit.models.FilterArgs
-    options:
-      heading_level: 3
+options:
+heading_level: 3
 
 ### Search
 
 ::: rekordbox_edit.models.SearchRequest
-    options:
-      heading_level: 4
+options:
+heading_level: 4
 
 ::: rekordbox_edit.models.SearchResponse
-    options:
-      heading_level: 4
+options:
+heading_level: 4
 
 ### Edit
 
 ::: rekordbox_edit.models.EditRequest
-    options:
-      heading_level: 4
+options:
+heading_level: 4
 
 ::: rekordbox_edit.models.EditResponse
-    options:
-      heading_level: 4
+options:
+heading_level: 4
 
 ::: rekordbox_edit.models.EditResult
-    options:
-      heading_level: 4
+options:
+heading_level: 4
 
 ### Convert
 
 ::: rekordbox_edit.models.ConvertRequest
-    options:
-      heading_level: 4
+options:
+heading_level: 4
 
 ::: rekordbox_edit.models.ConvertResponse
-    options:
-      heading_level: 4
+options:
+heading_level: 4
 
 ::: rekordbox_edit.models.ConvertResult
-    options:
-      heading_level: 4
+options:
+heading_level: 4
 
 ### Miscellaneous
 
 ::: rekordbox_edit.models.Track
-    options:
-      heading_level: 4
+options:
+heading_level: 4
 
 ::: rekordbox_edit.models.EditOp
-    options:
-      heading_level: 4
+options:
+heading_level: 4
 
 ::: rekordbox_edit.models.ConvertOp
-    options:
-      heading_level: 4
+options:
+heading_level: 4
 
 ::: rekordbox_edit.models.SkippedTrack
-    options:
-      heading_level: 4
+options:
+heading_level: 4
 
 ::: rekordbox_edit.models.SkipReason
-    options:
-      heading_level: 4
+options:
+heading_level: 4

{rekordbox_edit-0.9.0.dev22 → rekordbox_edit-0.9.0.dev29}/docs/commands/search.md

@@ -11,8 +11,8 @@ rbe search --artist "Aphex Twin" --format flac
 # Get all the track IDs in a playlist
 rbe search --playlist "Techno" --print ids
 
-# Find tracks matching ALL filters (AND logic)
-rbe search --artist "Burial" --album "Untrue" --match-all
+# Tracks that are either flac, or in this playlist
+rbe search --playlist "Techno" --format flac --match-any
 
 # Feed results to another command
 rbe search --artist "Lauryn Hill" --print ids | rbe convert --yes
@@ -23,7 +23,7 @@ See [Filtering](../filtering.md) for the full filter language and piping recipes
 ## Reference
 
 ::: mkdocs-click
-    :module: rekordbox_edit.cli.search
-    :command: search_command
-    :prog_name: rbe search
-    :depth: 1
+:module: rekordbox_edit.cli.search
+:command: search_command
+:prog_name: rbe search
+:depth: 1

rekordbox_edit-0.9.0.dev29/docs/filtering.md

@@ -0,0 +1,108 @@
+# Filtering
+
+Every command supports filtering by all of the [`FilterArgs`][rekordbox_edit.models.FilterArgs]. The filters determine which tracks a command operates on.
+
+## Filter Options
+
+By default any filters provided are grouped by kind: repeating the _same_ filter with different values matches tracks that satisfy _any_ of those values (an OR), while combining _different_ filters narrows to tracks that satisfy every one of them (an AND). Pass `--match-all` to find results that match each and every filter value. Pass `--match-any` to instead match tracks that satisfy any single filter value provided.
+
+| Option                  | Matches tracks whose...                                                                               |
+| ----------------------- | ----------------------------------------------------------------------------------------------------- |
+| `--track-id ID`         | database track ID equals `ID`                                                                         |
+| `--title TEXT`          | title contains `TEXT`                                                                                 |
+| `--exact-title TEXT`    | title is exactly `TEXT`                                                                               |
+| `--artist TEXT`         | artist name contains `TEXT`                                                                           |
+| `--exact-artist TEXT`   | artist name is exactly `TEXT`                                                                         |
+| `--album TEXT`          | album name contains `TEXT`                                                                            |
+| `--exact-album TEXT`    | album name is exactly `TEXT`                                                                          |
+| `--playlist TEXT`       | playlist name contains `TEXT`                                                                         |
+| `--exact-playlist TEXT` | playlist name is exactly `TEXT`                                                                       |
+| `--format FMT`          | Rekordbox file type is `FMT` (`mp3`, `mp4`, `aac`, `flac`, `alac`, `wav`, `aiff`, `video`, `invalid`) |
+| `--path TEXT`           | file path contains `TEXT`, case-insensitive                                                           |
+| `--resolved-path TEXT`  | file path contains `TEXT` after resolving it to an absolute path, case-insensitive                    |
+| `--first N`             | return only the first N results                                                                       |
+| `--last N`              | return only the last N results                                                                        |
+
+> [!TIP]
+> Filters that are "exact" are case-sensitive (e.g. `--exact-artist 'HOOBASTANK'` won't match "Hoobastank") whereas their counterparts (`--artist`) are case-insensitive and match substrings.
+
+> [!NOTE]
+> Path filters match case-insensitively on every platform because the filesystems Rekordbox supports (NTFS and APFS) treat paths case-insensitively themselves.
+
+### Examples
+
+```bash
+# Tracks by either artist (repeated filters OR together, by default)
+rbe search --artist "Daft Punk" --artist "Justice"
+
+# Tracks matching artist AND format (different filters AND together, by default)
+rbe search --artist "Aphex Twin" --format flac
+
+# Tracks that are either flac, or by Aphex Twin
+rbe search --artist "Aphex Twin" --format flac --match-any
+
+# Tracks that match both Tom Petty and The Heartbreakers
+rbe search --artist "Tom Petty" --artist "The Heartbreakers" --match-all
+
+# All the songs in this playlist
+rbe search --exact-playlist "Main Room 2024"
+
+# All the songs in any "house" or "disco" playlists
+rbe search --playlist "house" --playlist "disco"
+
+# All the songs in my library that aren't in any playlist
+rbe search --playlist ""
+
+# The first 10 tracks that either live under a "Favorites" folder or have the word "remix" somewhere in the file path
+rbe search --path "Favorites/" --path "remix" --first 10
+
+# The track at an exact location
+rbe search --resolved-path "/Users/djmustard/Music/banger.mp3"
+
+# Every track under a folder, given relative to the current directory
+rbe search --resolved-path "../Music/house/"
+```
+
+## Track ID Arguments
+
+Any positional argument that is not a defined option is interpreted as one or more track IDs:
+
+```bash
+rbe search 12345 67890
+```
+
+Track IDs can also arrive on stdin (see [Scripting and Piping](#scripting-and-piping)). Piped IDs require `--yes` or `--dry-run`, since prompting would interrupt a pipeline.
+
+## Output Levels
+
+All commands take `--print [silent|ids|info|debug|json]`:
+
+- `info` (default): human-readable output
+- `debug`: adds application state detail; debug logs for every run are also written to a log file (the path to which is shown in `--help`)
+- `silent`: no output at all
+- `ids`: print only the matching track IDs, space-separated — designed for piping between consecutive `rbe` commands.
+- `json`: dump the full response envelope as JSON — a list of [`Track`][rekordbox_edit.models.Track] records plus a result summary (see the response models in the [API Reference](api.md))
+
+!!! note
+
+    `silent`, `ids`, and `json` are non-interactive print modes, so they require `--yes` or `--dry-run`.
+
+## Scripting and Piping
+
+`--print ids` output feeds straight into another command's track-ID arguments:
+
+```bash
+# Convert all of the items found by the initial search command
+rbe search --artist "Lauryn Hill" --print ids | rbe convert --yes
+```
+
+**OR between AND-groups** — merge results from two commands using a subshell:
+
+```bash
+# Convert all (Daft Punk AND flac) OR (Justice AND aiff)
+{ rbe search --artist "Daft Punk" --format flac --print ids; \
+  rbe search --artist "Justice" --format aiff --print ids; } \
+  | rbe convert --format-out mp3 --dry-run
+```
+
+For richer pipelines, `--print json` emits the same selection as a structured database dump for `jq` and other shell tools. Use the [API functions](api.md#functions) if you want to build a more complex python script.

{rekordbox_edit-0.9.0.dev22 → rekordbox_edit-0.9.0.dev29}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "rekordbox-edit"
-version = "0.9.0.dev22"
+version = "0.9.0.dev29"
 description = "Tools for managing and modifying a RekordBox library en-masse"
 authors = [{ name = "James Viall", email= "jamesviall@pm.me"}]
 license = "MIT"
@@ -62,6 +62,9 @@ exclude-newer = "3 days"
 
 [tool.coverage.run]
 branch = true
+omit = [
+  "research"
+]
 data_file = ".coverage/coverage.db"
 [tool.coverage.html]
 directory = ".coverage/html/"
@@ -78,6 +81,9 @@ python-version = "3.11"
 [tool.ty.analysis]
 allowed-unresolved-imports = ["pyrekordbox", "ffmpeg"]
 
+[tool.ty.src]
+exclude = ["research/"]
+
 [tool.commitizen]
 name = "cz_customize"
 tag_format = "v$version"

{rekordbox_edit-0.9.0.dev22 → rekordbox_edit-0.9.0.dev29}/rekordbox_edit/_click.py

@@ -115,7 +115,13 @@ global_click_filters = [
         "--match-all",
         type=bool,
         is_flag=True,
-        help="Results must match all given filters",
+        help="Flatten every filter value, including repeats, into one AND",
+    ),
+    click.option(
+        "--match-any",
+        type=bool,
+        is_flag=True,
+        help="Flatten every filter value into one OR, ignoring the default grouping",
     ),
 ]
 

{rekordbox_edit-0.9.0.dev22 → rekordbox_edit-0.9.0.dev29}/rekordbox_edit/cli/_utils.py

@@ -81,6 +81,7 @@ def _narrow_to_track_ids(args, ids: list[str]):
             setattr(narrowed, field_name, [])
     narrowed.track_ids = list(ids)
     narrowed.match_all = False
+    narrowed.match_any = False
     narrowed.first = None
     narrowed.last = None
     return narrowed

{rekordbox_edit-0.9.0.dev22 → rekordbox_edit-0.9.0.dev29}/rekordbox_edit/models.py

@@ -50,6 +50,7 @@ class FilterArgs(BaseModel):
     first: int | None = Field(default=None, gt=0)
     last: int | None = Field(default=None, gt=0)
     match_all: bool = False
+    match_any: bool = False
 
     @model_validator(mode="after")
     def _check_first_last_exclusive(self) -> "FilterArgs":
@@ -57,6 +58,12 @@ class FilterArgs(BaseModel):
             raise ValueError("'first' and 'last' are mutually exclusive")
         return self
 
+    @model_validator(mode="after")
+    def _check_match_mode_exclusive(self) -> "FilterArgs":
+        if self.match_all and self.match_any:
+            raise ValueError("'match_all' and 'match_any' are mutually exclusive")
+        return self
+
 
 # ── Command args ──────────────────────────────────────────────────────────
 

{rekordbox_edit-0.9.0.dev22 → rekordbox_edit-0.9.0.dev29}/rekordbox_edit/query.py

@@ -1,7 +1,7 @@
 import logging
 import os
 from pathlib import Path
-from typing import List, Tuple, Union
+from typing import List, Literal, Tuple, Union
 
 from pyrekordbox import Rekordbox6Database
 from pyrekordbox.db6.tables import (
@@ -18,35 +18,47 @@ from rekordbox_edit.models import FilterArgs
 
 logger = logging.getLogger(__name__)
 
+MatchMode = Literal["grouped", "all", "any"]
+
 
 class CollectionQuery:
-    def __init__(self, match_all=False):
+    def __init__(self, mode: MatchMode = "grouped"):
         self._stmt = select(DjmdContent)
-        self._conditions: list[ColumnElement[bool]] = []
+        self._conditions: dict[str, list[ColumnElement[bool]]] = {}
         self._limit_count = None
         self._last_count = None
-        self._match_all = match_all
+        self._mode: MatchMode = mode
+
+    @property
+    def _flat_conditions(self) -> list[ColumnElement[bool]]:
+        """Every condition across every filter-kind bucket, as one flat list."""
+        return [c for conditions in self._conditions.values() for c in conditions]
 
     def _copy(self) -> "CollectionQuery":
         """Create a copy of this query in its current state."""
         new_inst = CollectionQuery.__new__(CollectionQuery)
         new_inst._stmt = self._stmt._clone()
-        new_inst._conditions = self._conditions.copy()
+        new_inst._conditions = {
+            group: conditions.copy() for group, conditions in self._conditions.items()
+        }
         new_inst._limit_count = self._limit_count
         new_inst._last_count = self._last_count
-        new_inst._match_all = self._match_all
+        new_inst._mode = self._mode
         return new_inst
 
+    def _append_condition(self, group: str, condition: ColumnElement[bool]) -> None:
+        self._conditions.setdefault(group, []).append(condition)
+
     def match_any(self) -> "CollectionQuery":
-        """Set the filter combination logic to use the OR operator (the default)."""
+        """Flatten every condition, across every filter kind, into one OR."""
         new_inst = self._copy()
-        new_inst._match_all = False
+        new_inst._mode = "any"
         return new_inst
 
     def match_all(self) -> "CollectionQuery":
-        """Set the filter combination logic to use the AND operator."""
+        """Flatten every condition, across every filter kind, into one AND."""
         new_inst = self._copy()
-        new_inst._match_all = True
+        new_inst._mode = "all"
         return new_inst
 
     def by_track_ids(self, track_ids: Union[str, List[str]]) -> "CollectionQuery":
@@ -54,7 +66,7 @@ class CollectionQuery:
         new_inst = self._copy()
         if isinstance(track_ids, str):
             track_ids = [track_ids]
-        new_inst._conditions.append(DjmdContent.ID.in_(track_ids))
+        new_inst._append_condition("track_id", DjmdContent.ID.in_(track_ids))
         return new_inst
 
     def by_artist(self, artist_name: str, exact: bool = False) -> "CollectionQuery":
@@ -73,7 +85,7 @@ class CollectionQuery:
         else:
             condition = ArtistAlias.Name.ilike(f"%{artist_name}%")
 
-        new_inst._conditions.append(condition)
+        new_inst._append_condition("artist", condition)
         return new_inst
 
     def by_title(self, title: str, exact: bool = False) -> "CollectionQuery":
@@ -88,7 +100,7 @@ class CollectionQuery:
         else:
             condition = DjmdContent.Title.ilike(f"%{title}%")
 
-        new_inst._conditions.append(condition)
+        new_inst._append_condition("title", condition)
         return new_inst
 
     def by_album(self, album_name: str, exact: bool = False) -> "CollectionQuery":
@@ -107,7 +119,7 @@ class CollectionQuery:
         else:
             condition = AlbumAlias.Name.ilike(f"%{album_name}%")
 
-        new_inst._conditions.append(condition)
+        new_inst._append_condition("album", condition)
         return new_inst
 
     def by_playlist(self, playlist_name: str, exact: bool = False) -> "CollectionQuery":
@@ -128,7 +140,7 @@ class CollectionQuery:
         else:
             condition = PlaylistAlias.Name.ilike(f"%{playlist_name}%")
 
-        new_inst._conditions.append(condition)
+        new_inst._append_condition("playlist", condition)
         return new_inst
 
     def by_format(self, format_name: str) -> "CollectionQuery":
@@ -144,7 +156,7 @@ class CollectionQuery:
         try:
             file_type_codes = get_file_type_codes_for_format(format_name)
             condition = DjmdContent.FileType.in_(file_type_codes)
-            new_inst._conditions.append(condition)
+            new_inst._append_condition("format", condition)
         except ValueError:
             logger.warning(f"Invalid format: {format_name}")
         return new_inst
@@ -174,7 +186,7 @@ class CollectionQuery:
         else:
             pattern = path_str.replace("\\", "/")
 
-        new_inst._conditions.append(DjmdContent.FolderPath.ilike(f"%{pattern}%"))
+        new_inst._append_condition("path", DjmdContent.FolderPath.ilike(f"%{pattern}%"))
         return new_inst
 
     def limit(self, count: int) -> "CollectionQuery":
@@ -214,14 +226,24 @@ class CollectionQuery:
         stmt = self._stmt
 
         if self._conditions:
-            logic = "AND" if self._match_all else "OR"
-            logger.debug(
-                f"Building query with {len(self._conditions)} condition(s) using {logic} logic"
-            )
-            if self._match_all:
-                combined_condition = and_(*self._conditions)
+            if self._mode == "all":
+                logger.debug(
+                    f"Building query with {len(self._flat_conditions)} condition(s) using flat AND logic"
+                )
+                combined_condition = and_(*self._flat_conditions)
+            elif self._mode == "any":
+                logger.debug(
+                    f"Building query with {len(self._flat_conditions)} condition(s) using flat OR logic"
+                )
+                combined_condition = or_(*self._flat_conditions)
             else:
-                combined_condition = or_(*self._conditions)
+                logger.debug(
+                    f"Building query with {len(self._conditions)} filter group(s) using grouped AND-of-OR logic"
+                )
+                group_conditions = [
+                    or_(*conditions) for conditions in self._conditions.values()
+                ]
+                combined_condition = and_(*group_conditions)
             stmt = stmt.where(combined_condition)
 
         if self._last_count is not None:
@@ -298,6 +320,8 @@ def get_filtered_content(
 
     if filters.match_all:
         query = query.match_all()
+    elif filters.match_any:
+        query = query.match_any()
 
     if filters.first is not None:
         query = query.limit(filters.first)

{rekordbox_edit-0.9.0.dev22 → rekordbox_edit-0.9.0.dev29}/tests/cli/test_search.py

@@ -98,6 +98,15 @@ class TestSearchCommand:
         assert result.exit_code == 2
         assert "mutually exclusive" in result.output
 
+    @patch("rekordbox_edit.cli._utils.Rekordbox6Database")
+    def test_match_all_and_match_any_together_is_usage_error(self, mock_db_class):
+        mock_db_class.return_value = Mock(session=Mock())
+
+        result = CliRunner().invoke(search_command, ["--match-all", "--match-any"])
+
+        assert result.exit_code == 2
+        assert "mutually exclusive" in result.output
+
     @patch("rekordbox_edit.cli._utils.Rekordbox6Database")
     def test_first_rejects_zero(self, mock_db_class):
         mock_db_class.return_value = Mock(session=Mock())

{rekordbox_edit-0.9.0.dev22 → rekordbox_edit-0.9.0.dev29}/tests/cli/test_utils.py

@@ -140,6 +140,14 @@ class TestNarrowToTrackIds:
 
         assert narrowed.last is None
 
+    def test_clears_match_modes(self):
+        args = SearchRequest(match_any=True)
+
+        narrowed = _narrow_to_track_ids(args, ["a"])
+
+        assert narrowed.match_all is False
+        assert narrowed.match_any is False
+
 
 class TestPrintResponseIds:
     def test_prints_space_separated_ids(self, capsys):

{rekordbox_edit-0.9.0.dev22 → rekordbox_edit-0.9.0.dev29}/tests/e2e/test_journey.py

@@ -88,6 +88,45 @@ def test_search_match_all_combo(cli):
     assert len(matches) == 1
 
 
+def test_search_title_and_format_intersect_by_default(cli):
+    """The original bug report: different filter kinds AND by default now.
+    Title narrows to track 1 ("Wave Alpha"); format narrows to all 3 FLACs.
+    The intersection is just track 1 — no --match-all needed."""
+    matches = _tracks(
+        cli(
+            "search", "--title", WAVE_ALPHA_TITLE, "--format", "flac", "--print", "json"
+        )
+    )
+    assert len(matches) == 1
+
+
+def test_search_default_matches_old_match_all_combo(cli):
+    """Same combo as test_search_match_all_combo, without the flag —
+    different filter kinds (format, artist) AND by default now."""
+    matches = _tracks(
+        cli("search", "--format", "flac", "--artist", "Beta", "--print", "json")
+    )
+    assert len(matches) == 1
+
+
+def test_search_match_any_flattens_across_filter_kinds(cli):
+    """--match-any flattens everything to OR: track 1 (by title) plus both
+    mp3 tracks (by format) — zero overlap, since track 1 is FLAC."""
+    matches = _tracks(
+        cli(
+            "search",
+            "--title",
+            WAVE_ALPHA_TITLE,
+            "--format",
+            "mp3",
+            "--match-any",
+            "--print",
+            "json",
+        )
+    )
+    assert len(matches) == 3
+
+
 def test_search_empty_result_exits_zero(cli):
     result = cli("search", "--title", "DefinitelyNotInLibrary", "--print", "json")
     assert result.returncode == 0

{rekordbox_edit-0.9.0.dev22 → rekordbox_edit-0.9.0.dev29}/tests/test_models.py

@@ -73,6 +73,13 @@ class TestFilterArgs:
         with pytest.raises(ValidationError, match="mutually exclusive"):
             FilterArgs(first=2, last=3)
 
+    def test_match_any_defaults_false(self):
+        assert FilterArgs().match_any is False
+
+    def test_match_all_and_match_any_mutually_exclusive(self):
+        with pytest.raises(ValidationError, match="mutually exclusive"):
+            FilterArgs(match_all=True, match_any=True)
+
 
 class TestSearchRequest:
     def test_is_filter_args(self):