-
Notifications
You must be signed in to change notification settings - Fork 1.8k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Lastgenre: Fix track-level handling, multi-genre keep, force behaviour, logging #4982
base: master
Are you sure you want to change the base?
Conversation
I'd request a review from you @sampsyo since I think you initially created it. Also @rain0r would be good since 5 years ago they added the In short: I think I fixed the plugin to now really reflect what's documented. Any nitpicking in my code or functionality-wise is appreciated. One question already. Here we do not state that a When I started out with using this plugin I was confused a verry long time about this option. As far as I understand it now: It doesn't do anything since it is default. So why keep it? Or is having a I think the both of you decided these options should look like that around here: #3220 (comment) |
Thanks for the extra context, @JOJ0! About the existence of |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for the ping!! Here are a couple of straightforward comments.
1e81209
to
89ae925
Compare
89ae925
to
31ce30d
Compare
I'd like to pull out this conversation #4982 (comment) into a new thread, to make it more obvious for others as well. I think it could be a broader discussion of where this plugin should go. Basically we were talking about the current So from my point of view, the main problem with the current behaviour when The following idea would require a new config setting as well as a whole new branch of behaviour (Case 3): Case 1
Case 2
keep any string in present genre tag, only write last.fm genres when empty Case 3
keep present genres when whitelisted and add new last.fm genres (this is a new branch of behaviour and needs to be coded, I think there is open feature requests for it. Update: Something was feature-requested, but it might not be exactly as I'm proposing here: #4750) Case 4
cleanup only - keep present genres when whitelisted but don't add new last.fm genres; Only when genre is empty, add last.fm genres. That last combination is weird though....but it's what I proposed for Which of these would now make sense to be the new default? The new @sampsyo brainstorming request 🧐 |
Some more context / cross-linking: The initial reason why I got my hands dirty with this plugin was when I realised that comma separated multi-genres where not recognized: #4751 (comment) Here @arsaboo requests a feature that goes in direction of Case 3 above: #4750 |
So, we have two config options - Case 1: overwrite all, only fresh last.fm genres remain force: yes
keep_allowed: no Case 2: Since force: no
keep_allowed: no Case 3: keep present genres when whitelisted and add new last.fm genres force: yes
keep_allowed: yes Case 4: keep any string in the present genre tag; only write last.fm genres when empty. This will not touch pre-existing genre tags. force: no
keep_allowed: yes Thus, Case 4 seems like the best default choice. It does not affect existing genre tags and updates the empty ones. Case 3, on the other hand, is the most useful one (at least for me). |
This brainstorming honestly sounds great, y'all. It is indeed really weird that the |
Ähem I might be slow or too tired already. Which of those 4 cases are now different from my proposal @arsaboo ? Sorry I must have missed it! Help! :-) |
Not different....just a little more explicit about the |
fb9f58d
to
c12b26b
Compare
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. |
Hi @arsaboo! I finally managed to find time to almost finish this PR. The general behaviour and docs of the new config options combinations are finished. If you want to, an "early" review would be super helpful. Since it probably also for you is a long time ago it might be interesting what you think if you read through the docs. Is it 100% clear what force/keep_allowed options do? Certainly but only if you have the time, some playing around and checking if it also really works that way would be great. Thanks a ton! |
@JOJ0 this is AWESOME 🎉🎉 The docs look reasonably clear. I will play with this. The debug logs are great to see what is going on. |
796a3bf
to
a56098f
Compare
When `lastgenre.source: track` is configured, - `lastgenre -a` _should not_ fall back to the album level genre (by making use of the with_album=False kwarg of the Libary's get method). - `lastgenre -a`, when finally storing the genres of _an album_, should _not_ also write the tracks genres (by making use of the inherit=False kwarg of the Album's store method.
Hi @arsaboo, thanks for testing! Awesome! I'm sorry I just force-pushed. Please reset your branch. I'm heavily working on refactoring tests for _get_genre() and fix a couple of bugs I notice. Please test with the current state and keep me posted if your issue remains. I will look into it! Thanks! |
Keep me posted. I just updated and tested the latest build and saw the exact same thing. I can test it when you have fixed the bugs. Let us get this done. |
Try setting your separator to a simple comma @arsaboo. genre is not a multifield yet. It's a regular string field. I mean basically it should work with any unicode character but I never tried it that way. |
I'm not sure if I'm writing your null character correctly. Is it unicode 0000 ? I just added a testcase for it. It seems to work. You can run the test like this:
This is the testcase: beets/test/plugins/test_lastgenre.py Lines 381 to 395 in 022af4b
test runs fine, but I'm not sure if I wrote the null char correct, as mentioned above ;-) |
What is |
Updated to the latest branch and ran with the following config: lastgenre:
auto: no
source: album
count: 5
separator: ', '
force: yes
keep_allowed: yes
whitelist: ~/.config/beets/genres/genres.txt Log: $ beet -v lastgenre
user configuration: /home/arsaboo/.config/beets/config.yaml
data directory: /home/arsaboo/.config/beets
plugin paths: /home/arsaboo/Downloads/whatlastgenre-master/plugin/beets/beetsplug
inline: adding item field initial_char
inline: adding item field folder
inline: adding item field clean_comments
inline: adding album field plex_matched
rewrite: adding template field artist Rahul Dev Burman
fetchart: google: Disabling art source due to missing key
fetchart: lastfm: Disabling art source due to missing key
Failed to set up Google AI: google.api_key not found
lyrics: Disabling google source: no API key configured.
Sending event: pluginload
library database: /home/arsaboo/.config/beets/musiclibrary.blb
library directory: /data/music
Sending event: library_opened
Parsed query: AndQuery([TrueQuery()])
Parsed sort: NullSort()
lastgenre: last.fm error: The artist you supplied could not be found
lastgenre: genre for album "Pagglait (Original Motion Picture Soundtrack)" (original): Filmi
Sending event: database_change
Sending event: database_change
...
Sending event: write
Sending event: after_write
lastgenre: genre for album "Rocky Aur Rani Kii Prem Kahaani (Original Motion Picture Soundtrack)" (original): Filmi
Sending event: database_change
...
Sending event: after_write
Sending event: cli_exit It would be nice to see more logging so we can diagnose what is going on. |
I'm aware of this PR. The genre tag is not implemented yet as multi-valued-tag. What are you suggesting? I don't think that this lastgenre PR I'm working on is the right place for starting to implement multi-valued tags. This should be done in another PR, otherwise this will never be finished LOL ;-) |
I added some debug messages. Look for something like this:
Hope that helps, looking forward to see your logs :-) |
Another hint. This log message here indicates that a "fallback" to the (original) value is the outcome of the main process
So this means that neither a last.fm search on Also doublecheck if your |
Now I am seeing some relevant information in the logs: lastgenre: _last_lookup receives: album, get_album, ('Arijit Singh, Neelesh Mishra, Raftaar', 'Pagglait (Original Motion Picture Soundtrack)')
lastgenre: _resolve_genres received: []
lastgenre: fetch_genre returns (whitelist checked): None
lastgenre: _last_lookup returns: None
lastgenre: _last_lookup receives: artist, get_artist, ('Arijit Singh, Neelesh Mishra, Raftaar',)
lastgenre: last.fm error: The artist you supplied could not be found
lastgenre: _resolve_genres received: []
lastgenre: fetch_genre returns (whitelist checked): None
lastgenre: _last_lookup returns: None
lastgenre: _resolve_genres received: ['Filmi']
lastgenre: _resolve_genres (canonicalized and whitelist filtered): ['Filmi']
lastgenre: genre for album "Pagglait (Original Motion Picture Soundtrack)" (original): Filmi
lastgenre: _last_lookup receives: album, get_album, ('Various Artists', 'Rocky Aur Rani Kii Prem Kahaani (Original Motion Picture Soundtrack)')
lastgenre: _resolve_genres received: []
lastgenre: fetch_genre returns (whitelist checked): None
lastgenre: _last_lookup returns: None
lastgenre: _last_lookup receives: artist, get_artist, ('Pritam, Arijit Singh, Jonita Gandhi, Ranveer Singh, Amitabh Bhattacharya',)
lastgenre: _resolve_genres received: []
lastgenre: fetch_genre returns (whitelist checked): None
lastgenre: _last_lookup returns: None
lastgenre: _last_lookup receives: artist, get_artist, ('Pritam, Arijit Singh, Shreya Ghoshal, Amitabh Bhattacharya',)
lastgenre: _resolve_genres received: []
lastgenre: fetch_genre returns (whitelist checked): None
lastgenre: _last_lookup returns: None
lastgenre: _last_lookup receives: artist, get_artist, ('Pritam, Arijit Singh, Shreya Ghoshal, Amitabh Bhattacharya',)
lastgenre: _last_lookup returns: None
lastgenre: _last_lookup receives: artist, get_artist, ('Pritam, Arijit Singh, Shreya Ghoshal, Shadab Faridi, Altamash Faridi, Amitabh Bhattacharya',)
lastgenre: _resolve_genres received: []
lastgenre: fetch_genre returns (whitelist checked): None
lastgenre: _last_lookup returns: None
lastgenre: _last_lookup receives: artist, get_artist, ('Pritam, Darshan Raval, Bhoomi Trivedi, Amitabh Bhattacharya',)
lastgenre: _resolve_genres received: []
lastgenre: fetch_genre returns (whitelist checked): None
lastgenre: _last_lookup returns: None
lastgenre: _last_lookup receives: artist, get_artist, ('Pritam, Dev Negi, Amitabh Bhattacharya',)
lastgenre: _resolve_genres received: []
lastgenre: fetch_genre returns (whitelist checked): None
lastgenre: _last_lookup returns: None
lastgenre: _last_lookup receives: artist, get_artist, ('Pritam, Sachet Tandon, Amitabh Bhattacharya',)
lastgenre: _resolve_genres received: []
lastgenre: fetch_genre returns (whitelist checked): None
lastgenre: _last_lookup returns: None
lastgenre: _last_lookup receives: artist, get_artist, ('Pritam, Shadab Faridi, Altamash Faridi, Asees Kaur, Amitabh Bhattacharya',)
lastgenre: _resolve_genres received: []
lastgenre: fetch_genre returns (whitelist checked): None
lastgenre: _last_lookup returns: None
lastgenre: _last_lookup receives: artist, get_artist, ('Pritam, Shahid Mallya, Amitabh Bhattacharya',)
lastgenre: _resolve_genres received: []
lastgenre: fetch_genre returns (whitelist checked): None
lastgenre: _last_lookup returns: None
lastgenre: _last_lookup receives: artist, get_artist, ('Pritam, Shashwat Singh, Jonita Gandhi, Anand Bakshi, Santosh Anand',)
lastgenre: _resolve_genres received: []
lastgenre: fetch_genre returns (whitelist checked): None
lastgenre: _last_lookup returns: None
lastgenre: _last_lookup receives: artist, get_artist, ('Pritam, Shreya Ghoshal, Amitabh Bhattacharya',)
lastgenre: _resolve_genres received: []
lastgenre: fetch_genre returns (whitelist checked): None
lastgenre: _last_lookup returns: None
lastgenre: _last_lookup receives: artist, get_artist, ('Pritam, Sonu Nigam, Shilpa Rao, Amitabh Bhattacharya',)
lastgenre: _resolve_genres received: []
lastgenre: fetch_genre returns (whitelist checked): None
lastgenre: _last_lookup returns: None
lastgenre: _last_lookup receives: artist, get_artist, ('Pritam, TUSHAR JOSHI, Shreya Ghoshal, Amitabh Bhattacharya',)
lastgenre: _resolve_genres received: []
lastgenre: fetch_genre returns (whitelist checked): None
lastgenre: _last_lookup returns: None
lastgenre: _resolve_genres received: ['Filmi']
lastgenre: _resolve_genres (canonicalized and whitelist filtered): ['Filmi']
lastgenre: genre for album "Rocky Aur Rani Kii Prem Kahaani (Original Motion Picture Soundtrack)" (original): Filmi I will test with a few more albums. I wonder why the LastFM matching is not so great (something we can work on in a separate PR). Similarly, we can work on the multi-valued tag later. |
just as a test, try disabling white list 🤔 |
I think it is because of the multiple artists being queried:
The artist for the above album is When I modified the artist for one of the album to match the artist on LastFM, I saw: lastgenre: _last_lookup receives: album, get_album, ('Pritam', 'Rocky Aur Rani Kii Prem Kahaani (Original Motion Picture Soundtrack)')
lastgenre: _resolve_genres received: []
lastgenre: fetch_genre returns (whitelist checked): None
lastgenre: _last_lookup returns: None
lastgenre: _last_lookup receives: artist, get_artist, ('Pritam',)
lastgenre: _resolve_genres received: ['bollywood', 'hindi', 'indian', 'pritam', 'soundtrack', 'world', 'india', 'world music', 'desi']
lastgenre: _resolve_genres (canonicalized and whitelist filtered): ['World Music', 'Desi']
lastgenre: fetch_genre returns (whitelist checked): World Music, Desi
lastgenre: _last_lookup returns: World Music, Desi
lastgenre: genre for album "Rocky Aur Rani Kii Prem Kahaani (Original Motion Picture Soundtrack)" (keep + artist): Filmi, World Music, Desi We will have to update our search procedure to allow for such variations, e.g., search with one artist or only album name, etc.. |
- Refactor and simplify logic of _get_genre() - Add a config validation function. - New default force: yes, keep_existing: yes (closest to original behaviour)
and decide to use the original default whitelist. Some of the existing tests do it that way as well.
we want to learn if maybe it's called wrongly, passed wrong data types, etc.
When original genres were kept (keep_existing option), the final genre count was "off". The reason was that reducing genres to that count is handled in _resolve_genre which wasn't run. - This fixes it by ensuring a run of _resolve_genre in _combine_and_label_genres. - There is a small caveat though: New genres have been run through _resolve_genres already. When they are combined with the old ones, they run through it again. Let's take this into account for now and hope performance doesn't suffer too much. - FIXME: Also fix the regression that even when _resolve_genre is run for a combined list of old/new genres, it was assumed the order is according to the canonicalization tree already. Now it's made sure that the _sort_by_depth method is always run (not only when prefer_specific is configured). - FIXME: Add config validation for prefer_specific and canonical option combination. This was a (tiny) issue in the original plugin already and is now catched.
It seems self.whitelist being falsy is not relyable.
- Keep fetched genres as a list - Split out reducing to count and joining to delimited string to separate method - Leave a couple of temporary debug messages
- No idea where a missing separator (which is default) could happen...just set it explicitely. - Since we now refactored fetch_genre to returning a list we can add mock multiple fetched gernes easier.
Description
Edit 2023-09: The original idea of this PR was:
Several fixes I had in the queue for months. Some of it required fixes in the library code which are through by now.
force
option: Don't always overwrite comma-separated multi-genres, compile a list and keep what's in the whitelist.lastgenre -A
in combination with config optionsource: track
- Tracks receive the album's genre even when this option is setEdit 2023-09: Additional option
keep_allowed
During review and discussions it turned out that besides the existing
force
option a second option would be required to really achieve a typical (expected) behaviour of aforce
option. This is what we came up with (copied over and slightly edited from #4982 (comment)):Two config options,
force
andkeep_allowed
, i.e. 4 possible settings:Case 1
Overwrite all. Only fresh last.fm genres remain.
Case 2
Add new last.fm genres when empty. Present tags stay untouched.
Case 3
Add new last.fm genres. Keep whitelisted genres in present tags.
Case 4 (default)
Add new last.fm genres when empty. Keep whitelisted genres in present tags.
To Do