lastgenre: Album stage fall back to multi-valued albumartists - #6893
Draft
JOJ0 wants to merge 16 commits into
Draft
lastgenre: Album stage fall back to multi-valued albumartists#6893JOJ0 wants to merge 16 commits into
JOJ0 wants to merge 16 commits into
Conversation
|
Thank you for the PR! The changelog has not been updated, so here is a friendly reminder to check if you need to add an entry. |
JOJ0
changed the title
JOJ0
force-pushed
the
lastgenre_album_albumartists_fallback
branch
from
August 2, 2026 17:36
58675e5 to
054d241
Compare
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## lastgenre_improve_original_fallback #6893 +/- ##
=======================================================================
+ Coverage 76.09% 76.10% +0.01%
=======================================================================
Files 163 163
Lines 21156 21168 +12
Branches 3335 3338 +3
=======================================================================
+ Hits 16098 16110 +12
Misses 4271 4271
Partials 787 787
🚀 New features to boost your workflow:
|
JOJ0
force-pushed
the
lastgenre_album_albumartists_fallback
branch
from
August 2, 2026 21:08
054d241 to
08557bd
Compare
JOJ0
marked this pull request as ready for review
August 2, 2026 21:36
|
Thank you for the PR! The changelog has not been updated, so here is a friendly reminder to check if you need to add an entry. |
JOJ0
force-pushed
the
lastgenre_album_albumartists_fallback
branch
from
August 5, 2026 06:10
251def4 to
e8e5265
Compare
JOJ0
changed the base branch from
lastgenre_refactor_get_genre
to
lastgenre_better_existing_fallback
August 5, 2026 06:49
JOJ0
force-pushed
the
lastgenre_album_albumartists_fallback
branch
from
August 5, 2026 06:50
e8e5265 to
95086dc
Compare
JOJ0
changed the base branch from
lastgenre_better_existing_fallback
to
lastgenre_improve_original_fallback
August 5, 2026 06:52
Contributor
There was a problem hiding this comment.
Pull request overview
PR make lastgenre album stage smarter for multi-artist albums. When Last.fm give no album tags for main albumartist, plugin now try album lookup for each value in multi-valued albumartists, then still fall through to artist stage if nothing found.
Changes:
- Add
_try_resolve_album_stagehelper to hold album-stage logic and multi-valuedalbumartistsfallback. - Add focused unit test that exercises per-albumartist album lookup fallback.
- Document new multi-artist album behavior in
lastgenredocs.
Reviewed changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated 2 comments.
| File | Description |
|---|---|
beetsplug/lastgenre/__init__.py |
Add album-stage helper that falls back to per-albumartists album lookups when primary album lookup empty. |
test/plugins/test_lastgenre.py |
Add direct test for _try_resolve_album_stage fallback behavior. |
docs/plugins/lastgenre.rst |
Document album-stage fallback to multi-valued albumartists before artist source. |
Comment on lines
+528
to
+533
| resolved := self._try_resolve_stage( | ||
| "multi-valued albumartist album", | ||
| keep_genres, | ||
| multi_album_genres, | ||
| artist=None, | ||
| ) |
Member
Author
There was a problem hiding this comment.
I suggest we fix the other places instead. this is difficult to read. multi-valued albumartist album is ok - well already odd but good enough. Or invent something new entirely? Help grug!
Comment on lines
+738
to
+741
| assert plugin._try_resolve_album_stage(item, []) == ( | ||
| ["Rock"], | ||
| "multi-valued albumartist album, any", | ||
| ) |
Member
Author
There was a problem hiding this comment.
we don't change it. so this is not required.
JOJ0
force-pushed
the
lastgenre_album_albumartists_fallback
branch
from
August 12, 2026 04:18
95086dc to
e29ecb9
Compare
- fallback as cached property - Leave force check in main get_genre() - Leave fall back handling in get_genre()
The discrepancy: - Normalization might help to keep more whitelisted genres! - But running through try_resolve_stage would be less code - The difference being that the latter reduces existing genres to the configured count which is not really fitting with a "last resort fallback to original genres" The here suggested solution: - We don't run through try_resolve_stage instantly because we want to make sure the "count" setting doesnt kick out anything but we apply aliases before whitelist check.
Try and concatinate genres of each member of albumartists in the multi-valued field if no genre for the main albumartist could be found.
JOJ0
force-pushed
the
lastgenre_album_albumartists_fallback
branch
from
August 17, 2026 06:37
e29ecb9 to
2cd9998
Compare
JOJ0
marked this pull request as draft
August 17, 2026 06:53
JOJ0
added a commit
that referenced
this pull request
Aug 18, 2026
## Description
The monolithic `_get_genre` method was broken down into several private
instance methods and refactored for readability. The contract is kept
and is already well tested (`test_get_genre`)
- **Core Helpers** - were moved from within `_get_genre` to a reusable
instance method and a `cached_property`:
- `_try_resolve_stage`: Handles the canonicalization and logging of
genres for a specific stage.
- `fallback`: Provides the configured fallback genre. Is used as a last
resort in `_try_resolve_existing_genres` and when `_get_genre` couldn't
find any genre in any stage at all.
- **Lookup Stages** - some were complex enough to deserve their own
instance method for readability, some stay inline in `_get_genre`:
- `_try_resolve_existing_genres`: Manages the initial check for
pre-existing genres and the `cleanup_existing` logic when `force` is
disabled.
- track stage: stays inline
- album stage: indentical to track stage, but not worth moving /
deduplication doesn't buy much (see subsequent PR though)
- `_fetch_artist_stage`: Fetches and resolves artist-level genres,
including multi-valued album artists and "Various Artists" logic.
- `_fetch_va_genres`: specifically handles the plurality logic for
"Various Artists" albums.
- **Fallbacks**:
- `_try_resolve_original_fallback`: Handles the "keep_existing" logic
that attempts to use/canonicalize originally present genres if no new
ones are found.
Make sure to also look at subsequent PR's:
- #6890
- #6893
## To Do
- [x] ~Documentation~
- [x] Changelog. (Not required, refactor only)
- [x] ~Tests~ (_get_genre was already well covered and the signature of
the method was kept)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
Fixes: #6238
If last.fm returns no album genres for
albumartist, fall back to querying the album against each artist inalbumartists(falling through to the artist stage if that also yields nothing.)The album stage reasoning is now slightly more complex and was moved to its own helper method.
Note: Requires #6474
To Do