update bpm remove regex and early exit

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "track-rename"
-version = "1.26.1"
+version = "1.27.0"
 edition = "2021"
 authors = ["Esgrove <[email protected]>"]
 description = "CLI tool for formatting and renaming audio tracks"

src/formatting.rs

@@ -188,9 +188,10 @@ static RE_BPM_WITH_KEY: LazyLock<Regex> =
 
 // Matches BPM followed by two or three letters (likely denoting key or mode),
 // formatted within parentheses at the end of a string
+static RE_BPM_WITH_TEXT: LazyLock<Regex> = LazyLock::new(|| Regex::new(r"\b\d{2,3}bpm\)$").unwrap());
 static RE_BPM_WITH_TEXT_PARENTHESES: LazyLock<Regex> =
     LazyLock::new(|| Regex::new(r"\s\(\d{2,3}\s?[a-zA-Z]{2,3}\)$").unwrap());
-static RE_BPM_WITH_TEXT: LazyLock<Regex> = LazyLock::new(|| Regex::new(r"\b\d{2,3}\s?[a-zA-Z]{2,3}\)$").unwrap());
+static RE_BPM_WITH_EXTRA_TEXT: LazyLock<Regex> = LazyLock::new(|| Regex::new(r"\b\d{2,3}\s?[a-zA-Z]{2,3}\)$").unwrap());
 
 // Matches any text within parentheses that contains a dash, separating it into two groups
 static RE_DASH_IN_PARENTHESES: LazyLock<Regex> = LazyLock::new(|| Regex::new(r"\((.*?) - (.*?)\)").unwrap());
@@ -521,10 +522,19 @@ fn remove_bpm_in_parentheses_from_end(text: &mut String) {
     }
 
     let mut result = (*text).to_string();
-    result = RE_BPM_IN_PARENTHESES.replace_all(&result, "").to_string();
-    result = RE_BPM_WITH_KEY.replace_all(&result, "").to_string();
-    result = RE_BPM_WITH_TEXT_PARENTHESES.replace_all(&result, "").to_string();
-    result = RE_BPM_WITH_TEXT.replace_all(&result, "").to_string();
+    let regexes = [
+        &RE_BPM_IN_PARENTHESES,
+        &RE_BPM_WITH_TEXT,
+        &RE_BPM_WITH_KEY,
+        &RE_BPM_WITH_TEXT_PARENTHESES,
+        &RE_BPM_WITH_EXTRA_TEXT,
+    ];
+    for re in regexes {
+        if re.is_match(&result) {
+            result = re.replace_all(&result, "").to_string();
+            break;
+        }
+    }
 
     *text = result;
 }

tests/test_formatting.rs

@@ -495,6 +495,12 @@ static REMOVE_BPM_AND_KEY_TEST_DATA: &[FormattingTestData] = &[
         title: "People (Trayze Remix) (113 4b)",
         correct_title: "People (Trayze Remix)",
     },
+    FormattingTestData {
+        artist: "Donna Summer",
+        correct_artist: "Donna Summer",
+        title: "Hot Stuff [The Reflex Revision] 120bpm",
+        correct_title: "Hot Stuff (The Reflex Revision)",
+    },
 ];
 
 static WHITESPACE_TEST_DATA: &[FormattingTestData] = &[