Skip to content
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

fromfilename plugin: proposed fix for #5218, some improvements #5311

Open
wants to merge 4 commits into
base: master
Choose a base branch
from

Conversation

Vrihub
Copy link
Contributor

@Vrihub Vrihub commented Jun 15, 2024

Description

b5216a0 is a proposed fix for #5218

We don't assume anymore that if the pattern lacks the "artist" group it also has the "title" group (this was causing the "title" KeyError, when the pattern containg only the ?P<track> group is used).
Instead, we check for existence of "title" before assigning "title_field", otherwise we let the last pattern (which will always match) to assign it. The only slight drawback is that files like "01.mp3" will also get "01" as title (besides the "1" track number), instead of having no title, but I guess that is not going to cause any major problem in the rest of the import procedure (e.g. track matching after a search). On the other hand, I guess allowing a file to have no title would require a substantial rewriting of the plugin, since the empty string is in BAD_TITLE_PATTERNS.

0966042 adds a log message about the pattern being tried

This is useful while debugging changes to the regexps in PATTERNS.
I used loglevel "debug" for this message, should we use "debug" also for other messages (currently using level "info")?

e6b7735 refactors the regexps in PATTERNS

I reviewed the regexps (especially after the changes I made some time ago in 84cf336) and tried to make them cleaner.

  • Allow " - " and "-" as separator between track/artist/title fields: that should cover two common filename conventions: using spaces (e.g. 01 - Artist Name - Title of the song) or not using spaces (e.g. 01-artist_name-title_of_the_song). Some regexp groups are non-greedy, to avoid capturing unwanted leading/trailing spaces in artist/titles; we could think about some other enhancements, e.g. automatically converting underscores to spaces in artist/title names, but I guess the main use of the plugin is not to produce a perfectly formatted title, but a sufficient meaningful one to be used as reference in the following stages of the update procedure.
  • Allow ?P<tag> groups by making them optional in the first two patterns (instead of having two versions of the pattern, with or without tag). BTW I'm not sure what these groups are about: we optionally check for them in the plugin, but we never use them to assign any metadata.
  • Allow optional "." after the track number
  • In the third pattern: also allow "_" as separator (e.g. for file names like 01_some_tack.mp3)

Copy link

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.

@snejus
Copy link
Member

snejus commented Jun 16, 2024

Could you by any chance add some tests that show the range of filenames that can be parsed? This would be very useful going forward.

@Serene-Arc
Copy link
Contributor

Second @snejus here! Thanks for the PR too. Regex is so complicated and obtuse to many people, so it's always good to have as complete a testing regimen in place as possible, both to find bugs with the provided patterns and to ensure that the same strings are matched going forward with any changes.

@Vrihub
Copy link
Contributor Author

Vrihub commented Jun 17, 2024

Ok, I'll have a look at how the tests machinery works and I'll give it a try.

(Feel free to pull the first commit of this PR to quickly fix the crash bug, if you agree with the proposed solution)

@Vrihub
Copy link
Contributor Author

Vrihub commented Jun 26, 2024

I've added tests for the plugin, covering almost all the use cases for the regexps in PATTERNS (as re-written by the previous commits in this PR).

To set up mock objects for the items to be imported I haven't used the tools in /beets/test, only plain unittest.mock, so maybe there's a more beets-esque way to implement these: suggestions are welcome.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants