Skip to content

Commit 1a91d17

Browse files
committed
Get rid of drop/norm helper again
1 parent 9a8cf69 commit 1a91d17

2 files changed

Lines changed: 6 additions & 18 deletions

File tree

beetsplug/lastgenre/__init__.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
from beets import config, library, plugins, ui
3838
from beets.library import Album, Item
3939
from beets.util import plurality, unique_list
40-
from beetsplug.lastgenre.utils import is_ignored, normalize_genre, normalize_and_drop_ignored
40+
from beetsplug.lastgenre.utils import is_ignored, normalize_genre
4141

4242
from .client import LastFmClient
4343

@@ -433,9 +433,11 @@ def _filter_valid(
433433
for g in cleaned
434434
if not self.whitelist or g.lower() in self.whitelist
435435
]
436-
return normalize_and_drop_ignored(
437-
self._log, self.ignorelist, whitelisted, artist, self.aliases
438-
)
436+
return [
437+
g
438+
for g in whitelisted
439+
if not is_ignored(self._log, self.ignorelist, g, artist)
440+
]
439441

440442
# Genre resolution pipeline.
441443

beetsplug/lastgenre/utils.py

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -34,20 +34,6 @@
3434
"""Ordered list of (pattern, replacement_template) alias entries."""
3535

3636

37-
def drop_ignored_genres(
38-
logger: BeetsLogger,
39-
ignorelist: Ignorelist,
40-
genres: list[str],
41-
artist: str | None = None,
42-
) -> list[str]:
43-
"""Drop genres that match the ignorelist."""
44-
return [
45-
g
46-
for g in genres
47-
if not is_ignored(logger, ignorelist, g, artist)
48-
]
49-
50-
5137
def is_ignored(
5238
logger: BeetsLogger,
5339
ignorelist: Ignorelist,

0 commit comments

Comments
 (0)