-
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
Fix lrclib lyrics #5406
base: master
Are you sure you want to change the base?
Fix lrclib lyrics #5406
Conversation
d4bed72
to
829192d
Compare
cb8929f
to
c2807f0
Compare
The build on I will address this in a separate PR and rebase this one accordingly once the fix is merged. Note: this issue popped up now because I added a new |
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.
This is a much better implementation now, well done. I especially like that you've managed to remove the test resources -- I wasn't expecting 2000 lines of lyrics in there.
…5407) See my comment under #5406 for context > The build on win32 is failing to install reflink because it's [only supported until Python 3.7](https://gitlab.com/rubdos/pyreflink/-/blob/master/setup.py?ref_type=heads). > > I will address this in a separate PR and rebase this one accordingly once the fix is merged. > > Note: this issue popped up now because I added a new requests-mock dependency which invalidated cached dependencies.
c2807f0
to
64c0439
Compare
dc02c94
to
622ed3c
Compare
622ed3c
to
3eb04ba
Compare
1ff3ff2
to
4d481d7
Compare
9518b5d
to
27453e3
Compare
Hey, LRCLIB author here 👋. It would be great if you could make the Also, the If you have any ideas for further improvements to LRCLIB's API, feel free to let me know! |
Hi @tranxuanthang, thanks for popping in! Absolutely, that's no problem at all. This should make most lyrics queries even speedier on our side. Now that we're on this topic, I think it may be a good idea to also add caching: for example, if we're getting lyrics for two separate files
Ideally we should only ask for @tranxuanthang thanks for a reliable and performant API! |
I see! You're correct, the plugin now picks any kind of lyrics returned by the first source that returns something.
This makes sense - I am myself after synced lyrics if possible, so if there was another source that provides them, I would indeed try to engineer a way to retrieve them.
This looks like a good approach. This of course depends on knowing in advance which sources provide synced lyrics, so that we can try them first.
I'd say we may even want to have a separate source priority list for non-synced lyrics: for example, I found that I prefer lyrics from LRCLib only if they are synced. Otherwise, I'd rather get them from Genius where they've been reviewed by the community. Alternatively, if users want synced lyrics, we firstly query backends that provide them (respecting their order in the sources configuration), and then query the rest if synced weren't found. This way, if I have the following configuration: lyrics:
sources: [genius, lrclib, tekstowo, bilrcl]
synced: yes The plugin tries LRCLib and bilRCL first and returns the first valid synced lyrics, if found. If not, it tries Genius, then (cached) plain lyrics from LRCLib, then Tekstowo, and finally bilRCL. |
I think your suggestions make perfect sense! If you were to implement it like that, I wouldn't be mad at all. Though this probably warrants a bigger discussion with more maintainers, I would imagine. At any rate, I'll leave this idea with you, since you're working a lot on this plugin and you're way better suited for the task, if you choose to accept it, than I am. |
a4111b8
to
44b4b46
Compare
b879e9c
to
645c12e
Compare
a4b45e9
to
2b80596
Compare
645c12e
to
121ae5f
Compare
2b80596
to
02386cc
Compare
121ae5f
to
788a1d7
Compare
02386cc
to
cc0ac8d
Compare
016ddfa
to
41b49cd
Compare
cc0ac8d
to
78fd959
Compare
41b49cd
to
4b802bd
Compare
652494d
to
e5c006d
Compare
4b802bd
to
6684596
Compare
## Description Fixes #2635 Fixes #5133 I realised that #5406 has gotten too big, thus I'm splitting it into several smaller PRs. This PR refactors lyrics plugin tests and fixes an empty metadata issue in the lyrics logic. #### CI - Added `--extras=lyrics` to the Poetry install command to include the lyrics plugin dependencies. - In the main task which measures coverage, set `LYRICS_UPDATED` environment variable based on changes detected in the lyrics files. #### Test setup - Introduced `ConfigMixin` to centralize configuration setup for tests, reducing redundancy. This can be used by tests based on `pytest`. #### Lyrics logic - Trimmed whitespace from `item.title`, `item.artist`, and `item.artist_sort` in `search_pairs` function. - Added checks to avoid searching for lyrics if either the artist or title is missing. - Improved `_scrape_strip_cruft` function to remove Google Ads tags and unnecessary HTML tags. #### Lyrics tests overhaul - Migrated lyrics tests to use `pytest` for better isolation and configuration management. - Deleted redundant lyrics text files and some unused utils. - Marked tests that should only run when lyrics source code is updated (`LYRICS_UPDATED` is set from the CI) using the `on_lyrics_update` marker. #### Documentation and Dependencies - Added `requests-mock` version `1.12.1` to `pyproject.toml` and `poetry.lock` for mocking HTTP requests in tests. - Updated `setup.cfg` to include a new marker `on_lyrics_update`.
@edgars-supe for now I will keep it as it is, but I noted this idea for the future when another source providing synchronised lyrics pops up! |
Adjust the base URL to perform a '/search' instead of attempting to '/get' specific lyrics where we're unlikely to find lyrics for the specific combination of album, artist, track names and the duration (see https://lrclib.net/docs). Since we receive an array of matching lyrics candidates, rank them by their duration similarity to the item's duration, and whether they contain synced lyrics.
6684596
to
a9e069d
Compare
a9e069d
to
fcde4a6
Compare
Fixes #5102
LRCLib lyrics backend fixes
Bug Fixes
lrclib
source. If lyrics for a specific album, artist, and title combination are not found, the plugin now searches for the artist and title and picks the most relevant result, scoring them bysources
configuration to prioritizelrclib
over other sources for faster and more reliable results.Code Improvements
fetch
method in all backends.LRCLyrics
andLRCLibItem
classes to encapsulate lyrics data and improve code structure.LRCLib
backend. These will be added to the rest of the backends in a separate PR.Tests
To Do
docs/
to describe it.)docs/changelog.rst
to the bottom of one of the lists near the top of the document.)