Remove additional arists filter (#351)

web-scrobbler · Jun 20, 2024 · cc1c8a3 · cc1c8a3
1 parent 451eb33
commit cc1c8a3
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 0 deletions.
diff --git a/src/functions.ts b/src/functions.ts
@@ -12,6 +12,7 @@ import {
 	YOUTUBE_TRACK_FILTER_RULES,
 	VARIOUS_ARTISTS_FILTER_RULES,
 	FilterRule,
+	ADDITIONAL_ARTISTS_FILTER_RULES,
 } from './rules';
 
 const escapeHtmlEntityMap: Record<string, RegExp> = {
@@ -135,6 +136,17 @@ export function removeFeature(text: string): string {
 	return filterWithFilterRules(text, FEATURE_FILTER_RULES);
 }
 
+/**
+ * Remove "&" and "x"-like strings from the text.
+ *
+ * @param text String to be filtered
+ *
+ * @return Filtered string
+ */
+export function removeAdditionalArtists(text: string): string {
+	return filterWithFilterRules(text, ADDITIONAL_ARTISTS_FILTER_RULES);
+}
+
 /**
  * Remove "Live..."-like strings from the text.
  *

diff --git a/src/rules.ts b/src/rules.ts
@@ -28,6 +28,7 @@ export const CLEAN_EXPLICIT_FILTER_RULES: FilterRule[] = [
 export const FEATURE_FILTER_RULES: FilterRule[] = [
 	// [Feat. Artist] or (Feat. Artist)
 	{ source: /\s[([]feat. .+[)\]]/i, target: '' },
+	{ source: /\s(feat. .+)/i, target: '' },
 ];
 
 export const LIVE_FILTER_RULES: FilterRule[] = [
@@ -227,3 +228,8 @@ export const YOUTUBE_TRACK_FILTER_RULES: FilterRule[] = [
 	// Sub Español
 	{ source: /sub\s*español/i, target: '' },
 ];
+
+export const ADDITIONAL_ARTISTS_FILTER_RULES: FilterRule[] = [
+	{ source: /\s(& .+)/i, target: '' },
+	{ source: /\s(x .+)/i, target: '' },
+];
diff --git a/test/fixtures/functions/remove-additional-artists.json b/test/fixtures/functions/remove-additional-artists.json
@@ -0,0 +1,12 @@
+[
+  {
+    "description": "should x artist from suffix",
+    "funcParameter": "Artist A x Artist B",
+    "expectedValue": "Artist A"
+  },
+  {
+    "description": "should & artist from suffix",
+    "funcParameter": "Artist A & Artist B",
+    "expectedValue": "Artist A"
+  }
+]
diff --git a/test/fixtures/functions/remove-feature.json b/test/fixtures/functions/remove-feature.json
@@ -8,5 +8,10 @@
     "description": "should remove featured artist from suffix",
     "funcParameter": "Artist A (feat. Artist B)",
     "expectedValue": "Artist A"
+  },
+  {
+    "description": "should remove featured artist from suffix",
+    "funcParameter": "Artist A feat. Artist B",
+    "expectedValue": "Artist A"
   }
 ]
diff --git a/test/functions.spec.ts b/test/functions.spec.ts
@@ -19,6 +19,7 @@ import {
 	removeVersion,
 	removeParody,
 	removeFeature,
+	removeAdditionalArtists,
 	youtube,
 	fixVariousArtists,
 	replaceSmartQuotes,
@@ -39,6 +40,7 @@ const functionsToTest = {
 	'remove-version': removeVersion,
 	'remove-parody': removeParody,
 	'remove-feature': removeFeature,
+	'remove-additional-artists': removeAdditionalArtists,
 	'replace-smart-quotes': replaceSmartQuotes,
 	youtube: youtube,
 };