From d5655249651320f9b21f6a3f8a19b37142f8f32b Mon Sep 17 00:00:00 2001 From: dunkla Date: Sun, 28 Dec 2025 15:12:32 +0100 Subject: [PATCH] simplify check for fallback in beetsplug/lastgenre/__init__.py MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Šarūnas Nejus --- beetsplug/lastgenre/__init__.py | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/beetsplug/lastgenre/__init__.py b/beetsplug/lastgenre/__init__.py index 3cf6a9849..50eccabf3 100644 --- a/beetsplug/lastgenre/__init__.py +++ b/beetsplug/lastgenre/__init__.py @@ -448,15 +448,14 @@ class LastGenrePlugin(plugins.BeetsPlugin): return result # Nothing found, leave original if configured and valid. - if genres and self.config["keep_existing"]: - # Check if at least one genre is valid - valid_genres = [ - g - for g in genres - if not self.whitelist or self._is_valid(g.lower()) - ] - if valid_genres: - return valid_genres, "original fallback" + # Nothing found, leave original if configured and valid. + if ( + genres + and self.config["keep_existing"] + and (valid_genres := self._filter_valid(genres)) + ): + return valid_genres, "original fallback" + # Return fallback as a list. if fallback := self.config["fallback"].get():