From e945b478f7d61440f39510c7536fb8e7079f8828 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=A1s=20Tamargo?= Date: Tue, 3 Aug 2021 15:20:34 +0300 Subject: [PATCH 1/2] MBS-11833: Drop "f." from the featured artists reports Almost all cases I can see are false positives: stuff like "(F. Chopin), or just "F. Whatever remix". It seems to be pretty uncommon for f. X to actually be used as feat, so while it could make sense to support it on the guess feat button (where it would be used mostly if the user already knows there's featured artists on a tracklist or title), the false positives make it unwise to have it on the reports. For what it's worth, we don't seem to even use this in featRegex for the button either. --- lib/MusicBrainz/Server/Report/FeaturingRecordings.pm | 2 +- lib/MusicBrainz/Server/Report/FeaturingReleaseGroups.pm | 2 +- lib/MusicBrainz/Server/Report/FeaturingReleases.pm | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/MusicBrainz/Server/Report/FeaturingRecordings.pm b/lib/MusicBrainz/Server/Report/FeaturingRecordings.pm index b51a7b8d9f6..7792c730dd4 100644 --- a/lib/MusicBrainz/Server/Report/FeaturingRecordings.pm +++ b/lib/MusicBrainz/Server/Report/FeaturingRecordings.pm @@ -13,7 +13,7 @@ sub query { FROM recording r JOIN artist_credit ac ON r.artist_credit = ac.id WHERE - r.name COLLATE musicbrainz ~* E' \\\\((duet with|συμμετέχει|(f|w)/|(f|feat|ｆｅａｔ|ft|συμμ)(\\\\.|．)|(featuring|ｆｅａｔｕｒｉｎｇ)) ' + r.name COLLATE musicbrainz ~* E' \\\\((duet with|συμμετέχει|(f|w)/|(feat|ｆｅａｔ|ft|συμμ)(\\\\.|．)|(featuring|ｆｅａｔｕｒｉｎｇ)) ' "; } diff --git a/lib/MusicBrainz/Server/Report/FeaturingReleaseGroups.pm b/lib/MusicBrainz/Server/Report/FeaturingReleaseGroups.pm index 7abe1330ea3..7e857f6e348 100644 --- a/lib/MusicBrainz/Server/Report/FeaturingReleaseGroups.pm +++ b/lib/MusicBrainz/Server/Report/FeaturingReleaseGroups.pm @@ -15,7 +15,7 @@ sub query { JOIN artist_credit ac ON rg.artist_credit = ac.id JOIN release_group_meta rm ON rg.id = rm.id WHERE - rg.name COLLATE musicbrainz ~* E' \\\\((duet with|συμμετέχει|(f|w)/|(f|feat|ｆｅａｔ|ft|συμμ)(\\\\.|．)|(featuring|ｆｅａｔｕｒｉｎｇ)) ' + rg.name COLLATE musicbrainz ~* E' \\\\((duet with|συμμετέχει|(f|w)/|(feat|ｆｅａｔ|ft|συμμ)(\\\\.|．)|(featuring|ｆｅａｔｕｒｉｎｇ)) ' "; } diff --git a/lib/MusicBrainz/Server/Report/FeaturingReleases.pm b/lib/MusicBrainz/Server/Report/FeaturingReleases.pm index 5ca5071c0d7..26749fb2463 100644 --- a/lib/MusicBrainz/Server/Report/FeaturingReleases.pm +++ b/lib/MusicBrainz/Server/Report/FeaturingReleases.pm @@ -15,7 +15,7 @@ sub query { JOIN artist_credit ac ON r.artist_credit = ac.id JOIN release_meta rm ON r.id = rm.id WHERE - r.name COLLATE musicbrainz ~* E' \\\\((duet with|συμμετέχει|(f|w)/|(f|feat|ｆｅａｔ|ft|συμμ)(\\\\.|．)|(featuring|ｆｅａｔｕｒｉｎｇ)) ' + r.name COLLATE musicbrainz ~* E' \\\\((duet with|συμμετέχει|(f|w)/|(feat|ｆｅａｔ|ft|συμμ)(\\\\.|．)|(featuring|ｆｅａｔｕｒｉｎｇ)) ' "; } From ae5274a9f28b8e0f2256da1f9997318fba758b54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=A1s=20Tamargo?= Date: Tue, 3 Aug 2021 15:27:06 +0300 Subject: [PATCH 2/2] MBS-11824: Don't require space after feat. in reports This still requires a space after full words (featuring, duet with) but not after feat. and other abbreviations, to help find and fix the not too uncommon cases where the original editor missed the space. --- lib/MusicBrainz/Server/Report/FeaturingRecordings.pm | 2 +- lib/MusicBrainz/Server/Report/FeaturingReleaseGroups.pm | 2 +- lib/MusicBrainz/Server/Report/FeaturingReleases.pm | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/MusicBrainz/Server/Report/FeaturingRecordings.pm b/lib/MusicBrainz/Server/Report/FeaturingRecordings.pm index 7792c730dd4..5ae37bc7ddb 100644 --- a/lib/MusicBrainz/Server/Report/FeaturingRecordings.pm +++ b/lib/MusicBrainz/Server/Report/FeaturingRecordings.pm @@ -13,7 +13,7 @@ sub query { FROM recording r JOIN artist_credit ac ON r.artist_credit = ac.id WHERE - r.name COLLATE musicbrainz ~* E' \\\\((duet with|συμμετέχει|(f|w)/|(feat|ｆｅａｔ|ft|συμμ)(\\\\.|．)|(featuring|ｆｅａｔｕｒｉｎｇ)) ' + r.name COLLATE musicbrainz ~* E' \\\\(((f|w)/|(feat|ｆｅａｔ|ft|συμμ)(\\\\.|．)|(duet with|συμμετέχει|featuring|ｆｅａｔｕｒｉｎｇ) )' "; } diff --git a/lib/MusicBrainz/Server/Report/FeaturingReleaseGroups.pm b/lib/MusicBrainz/Server/Report/FeaturingReleaseGroups.pm index 7e857f6e348..3ee95d7ae4f 100644 --- a/lib/MusicBrainz/Server/Report/FeaturingReleaseGroups.pm +++ b/lib/MusicBrainz/Server/Report/FeaturingReleaseGroups.pm @@ -15,7 +15,7 @@ sub query { JOIN artist_credit ac ON rg.artist_credit = ac.id JOIN release_group_meta rm ON rg.id = rm.id WHERE - rg.name COLLATE musicbrainz ~* E' \\\\((duet with|συμμετέχει|(f|w)/|(feat|ｆｅａｔ|ft|συμμ)(\\\\.|．)|(featuring|ｆｅａｔｕｒｉｎｇ)) ' + rg.name COLLATE musicbrainz ~* E' \\\\(((f|w)/|(feat|ｆｅａｔ|ft|συμμ)(\\\\.|．)|(duet with|συμμετέχει|featuring|ｆｅａｔｕｒｉｎｇ) )' "; } diff --git a/lib/MusicBrainz/Server/Report/FeaturingReleases.pm b/lib/MusicBrainz/Server/Report/FeaturingReleases.pm index 26749fb2463..228288455cd 100644 --- a/lib/MusicBrainz/Server/Report/FeaturingReleases.pm +++ b/lib/MusicBrainz/Server/Report/FeaturingReleases.pm @@ -15,7 +15,7 @@ sub query { JOIN artist_credit ac ON r.artist_credit = ac.id JOIN release_meta rm ON r.id = rm.id WHERE - r.name COLLATE musicbrainz ~* E' \\\\((duet with|συμμετέχει|(f|w)/|(feat|ｆｅａｔ|ft|συμμ)(\\\\.|．)|(featuring|ｆｅａｔｕｒｉｎｇ)) ' + r.name COLLATE musicbrainz ~* E' \\\\(((f|w)/|(feat|ｆｅａｔ|ft|συμμ)(\\\\.|．)|(duet with|συμμετέχει|featuring|ｆｅａｔｕｒｉｎｇ) )' "; }