convert W/ to feat

Esgrove · Jan 30, 2024 · 4906bd8 · 4906bd8
1 parent 9d57e85
commit 4906bd8
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 0 deletions.
diff --git a/rename/formatter.py b/rename/formatter.py
@@ -69,6 +69,7 @@ def __init__(self):
             (r"\.{2,}", "."),
             (r"\(\s*?\)", ""),
             (r"(\S)\(", r"\1 ("),
+            (r"(?i)\sW/", " feat. "),
         )
         self.filename_regex_substitutes = (
             ('"', "''"),

diff --git a/src/formatter.rs b/src/formatter.rs
@@ -79,6 +79,7 @@ impl TrackFormatter {
                     "Missy Elliott",
                 ),
                 (Regex::new(r"(?i)\bGangstarr\b|\bGangstarr$").unwrap(), "Gang Starr"),
+                (Regex::new(r"(?i)\sW/").unwrap(), " feat. "),
             ],
             filename_regex_substitutes: vec![
                 (Regex::new("\"").unwrap(), "''"),

diff --git a/src/test_formatter.rs b/src/test_formatter.rs
@@ -139,6 +139,12 @@ mod tests {
             title: "Dance (A$$) - Tall Boys Remix (DJcity Intro - Dirty)",
             correct_title: "Dance (A$$) (Tall Boys Remix) (Dirty Intro)",
         },
+        FormattingTestData {
+            artist: "Big Sean W/Taku",
+            correct_artist: "Big Sean feat. Taku",
+            title: "Dance (A$$)",
+            correct_title: "Dance (A$$)",
+        },
     ];
 
     static NESTED_PARENTHESES_TEST_DATA: &[FormattingTestData] = &[

diff --git a/tests/test_data.py b/tests/test_data.py
@@ -195,6 +195,12 @@
         "Lift Me Up (Trayze Drop Leaf Edit) (89 11b)",
         "Lift Me Up (Trayze Drop Leaf Edit)",
     ),
+    (
+        "Big Sean W/Taku",
+        "Big Sean feat. Taku",
+        "Dance (A$$)",
+        "Dance (A$$)",
+    ),
 ]
 
 PARENTHESES_TEST_DATA = [