Improve lyrics lookup by removing remix & remaster info in query.

Author: Icelk

lyric_finder/src/lib.rs

@@ -58,6 +58,8 @@ impl Client {
 
     /// Search songs satisfying a given `query`.
     pub async fn search_songs(&self, query: &str) -> anyhow::Result<Vec<search::Result>> {
+        let query = improve_query(query);
+
         log::debug!("search songs: query={query}");
 
         let body = self
@@ -136,6 +138,60 @@ impl Default for Client {
     }
 }
 
+/// Returns `query` without `remaster` & `remix` information from track/artist query.
+/// Returned value is lowercase.
+/// These caused wildly invalid lyrics to be found.
+/// (try yourself adding remastered 2011 to a song's name when searching in Genius!)
+fn improve_query(query: &str) -> String {
+    let is_dash = |c: char| c == '-' || c == '—' || c == '–';
+
+    // reverse finder for non-filler (space, dashes) chars.
+    // Acts like a trim to remove undesired spaces and dashes.
+    let r_no_filler = |s: &str, idx: usize| {
+        let Some(s) = s.get(..idx) else { return idx };
+        s.char_indices()
+            .rev()
+            .find(|(_, c)| !(is_dash(*c) || c.is_whitespace()))
+            .map_or(idx, |(idx, c)| idx + c.len_utf8())
+    };
+    // used to handle longer variants of words: `remixed`, `remastered`, etc.
+    let end_of_word = |s: &str, idx: usize| {
+        let Some(s) = s.get(idx..) else { return idx };
+        s.find(|c| !c.is_alphanumeric())
+            .map_or(idx, |found| found + idx)
+    };
+
+    let mut query = query.to_lowercase();
+    // just cut xxxx Remaster from query
+    if let Some(remaster_start) = query.find("remaster") {
+        let end = remaster_start + "remaster".len();
+        let mut trim_start = remaster_start.saturating_sub(1);
+        let prev = query.get(..remaster_start.saturating_sub(2)).unwrap_or("");
+        let end_of_prev_word = prev.rfind(' ').unwrap_or(0);
+
+        if let Some(year) = query.get(end_of_prev_word + 1..remaster_start.saturating_sub(1)) {
+            if year.chars().all(|c| c.is_whitespace() || c.is_numeric()) {
+                trim_start = end_of_prev_word;
+            }
+        }
+        trim_start = r_no_filler(&query, trim_start);
+        let end = end_of_word(&query, end);
+        query.drain(trim_start..end);
+    }
+    // just cut anything off after - for remix
+    if let Some(remix_start) = query.find("remix") {
+        let end = remix_start + "remix".len();
+        let end = end_of_word(&query, end);
+        if let Some(metadata_start) = query.rfind(is_dash) {
+            if metadata_start > 4 {
+                let start = r_no_filler(&query, metadata_start);
+                query.drain(start..end);
+            }
+        }
+    }
+    query
+}
+
 mod parse {
     use html5ever::tendril::TendrilSink;
     use html5ever::*;