mirrors/beets
2
0
Fork 0
mirror of https://github.com/beetbox/beets.git synced 2026-07-16 14:07:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

typing: fix beets.library.library

Browse Source
This commit is contained in:
Šarūnas Nejus
2026-07-06 15:30:51 +01:00
parent f167dc29e4
commit 6ccb7c0517
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
beets/dbcore/query.py
View File

@@ -48,7 +48,7 @@ class InvalidQueryError(ParsingError):
"""
def __init__(
self, query: str | Sequence[str] | Query, explanation: Exception
self, query: str | Sequence[str] | Query | None, explanation: Exception
) -> None:
if isinstance(query, list):
query = " ".join(query)

17
beets/library/library.py
View File

@@ -10,6 +10,7 @@ import platformdirs
import beets
from beets import config, context, dbcore
from beets.dbcore.query import Query
from beets.dbcore.sort import NullSort
from beets.exceptions import UserError
from beets.util import normpath
@@ -22,7 +23,6 @@ from .queries import parse_query_parts, parse_query_string
if TYPE_CHECKING:
from collections.abc import Iterator, Sequence
from beets.dbcore.query import Query
from beets.dbcore.sort import Sort
from beets.util import PathLike, Replacements
from beets.util.pathformats import PathFormat
@@ -143,15 +143,22 @@ class Library(dbcore.Database):
the `sort` argument is ignored.
"""
# Parse the query, if necessary.
parsed_sort = None
parsed_query = None
try:
parsed_sort = None
# Query parsing needs the library root, but keeping it scoped here
# avoids leaking one Library's directory into another's work.
with context.music_dir(self.directory):
if isinstance(query, Query):
parsed_query = query
if isinstance(query, str):
query, parsed_sort = parse_query_string(query, model_cls)
parsed_query, parsed_sort = parse_query_string(
query, model_cls
)
elif isinstance(query, (list, tuple)):
query, parsed_sort = parse_query_parts(query, model_cls)
parsed_query, parsed_sort = parse_query_parts(
query, model_cls
)
except dbcore.query.InvalidQueryArgumentValueError as exc:
raise dbcore.InvalidQueryError(query, exc)
@@ -160,7 +167,7 @@ class Library(dbcore.Database):
if parsed_sort and not isinstance(parsed_sort, NullSort):
sort = parsed_sort
return super()._get_results(model_cls, query, sort)
return super()._get_results(model_cls, parsed_query, sort)
@staticmethod
def get_default_album_sort() -> Sort: