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.

Sign up for GitHub

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

Jump to bottom

ftintitle: Fix false positives in "feat. X" detection in title #5442

Merged
merged 8 commits into from
Oct 1, 2024
Merged

ftintitle: Fix false positives in "feat. X" detection in title #5442

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c66eb10
Fix false positives in "feat. X" detection in ftintitle
klb2 Sep 26, 2024
6cb2e59
Add unit tests for separate "feat. X" detection
klb2 Sep 26, 2024
85fc8e5
Add changelog about fixing false positives in "feat. X" detection
klb2 Sep 26, 2024
ab86b2d
Merge branch 'beetbox:master' into fix_false_positive_ftintitle
klb2 Sep 30, 2024
71b5a96
Add reference to ftintitle plugin in changelog
klb2 Sep 30, 2024
ed627c0
Hardcode for_artist keyword in ftintitle plugin
klb2 Sep 30, 2024
669307c
Update ftintitle.contains_feat unit tests
klb2 Sep 30, 2024
37879d0
Remove redundant unit tests for ftintitle plugin
klb2 Oct 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion beetsplug/ftintitle.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,13 @@ def split_on_feat(artist):

def contains_feat(title):
"""Determine whether the title contains a "featured" marker."""
return bool(re.search(plugins.feat_tokens(), title, flags=re.IGNORECASE))
return bool(
re.search(
plugins.feat_tokens(for_artist=False),
title,
flags=re.IGNORECASE,
)
)


def find_feat_part(artist, albumartist):
Expand Down
4 changes: 3 additions & 1 deletion docs/changelog.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,9 @@ New features:

Bug fixes:

* The detection of a "feat. X" part now also matches such parts if they are in
* :doc:`plugins/ftintitle`: The detection of a "feat. X" part in a song title does not produce any false
positives caused by words like "and" or "with" anymore. :bug:`5441`
* :doc:`plugins/ftintitle`: The detection of a "feat. X" part now also matches such parts if they are in
parentheses or brackets. :bug:`5436`
* Improve naming of temporary files by separating the random part with the file extension.
* Fix the ``auto`` value for the :ref:`reflink` config option.
Expand Down
5 changes: 2 additions & 3 deletions test/plugins/test_ftintitle.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,13 +180,12 @@ def test_contains_feat(self):
assert ftintitle.contains_feat("Alice feat. Bob")
assert ftintitle.contains_feat("Alice feat Bob")
assert ftintitle.contains_feat("Alice featuring Bob")
assert ftintitle.contains_feat("Alice & Bob")
assert ftintitle.contains_feat("Alice and Bob")
assert ftintitle.contains_feat("Alice With Bob")
assert ftintitle.contains_feat("Alice (ft. Bob)")
assert ftintitle.contains_feat("Alice (feat. Bob)")
assert ftintitle.contains_feat("Alice [ft. Bob]")
assert ftintitle.contains_feat("Alice [feat. Bob]")
assert not ftintitle.contains_feat("Alice defeat Bob")
assert not ftintitle.contains_feat("Aliceft.Bob")
assert not ftintitle.contains_feat("Alice (defeat Bob)")
assert not ftintitle.contains_feat("Live and Let Go")
assert not ftintitle.contains_feat("Come With Me")
Loading