From 569ba7301689e12dd2efed998809fbbffb014eb5 Mon Sep 17 00:00:00 2001 From: J0J0 Todos Date: Mon, 6 Jan 2025 23:13:12 +0100 Subject: [PATCH] Refactor again _combine_and_label_genres --- beetsplug/lastgenre/__init__.py | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/beetsplug/lastgenre/__init__.py b/beetsplug/lastgenre/__init__.py index 81d290de4..7cad29a06 100644 --- a/beetsplug/lastgenre/__init__.py +++ b/beetsplug/lastgenre/__init__.py @@ -381,15 +381,14 @@ class LastGenrePlugin(plugins.BeetsPlugin): 'logging label'. """ self._log.debug(f"_combine got type new_genres: {new_genres}") + combined = deduplicate(keep_genres + new_genres) + resolved = self._resolve_genres(combined) + reduced = self._to_delimited_genre_string(resolved) + if new_genres and keep_genres: - combined_genres = deduplicate(keep_genres + new_genres) - resolved_genres = self._resolve_genres(combined_genres) - reduced_genres = self._to_delimited_genre_string(resolved_genres) - return reduced_genres, f"keep + {log_label}" + return reduced, f"keep + {log_label}" if new_genres: - resolved_genres = self._resolve_genres(new_genres) - reduced_genres = self._to_delimited_genre_string(resolved_genres) - return reduced_genres, log_label + return reduced, log_label return None, log_label def _get_genre(self, obj):