From a1469791b0e2ed70d4526b4dc1fc0cb96b08fa28 Mon Sep 17 00:00:00 2001
From: They Who Shall Be Named
 <93336740+theywhoshallbenamed@users.noreply.github.com>
Date: Sat, 16 Aug 2025 04:11:01 -0400
Subject: [PATCH 1/2] Change fallback query to add artist and use Deezer's
 advanced search

Including artist name ensures that tracks with identical titles and album titles don't get included in results.

Deezer advanced search provides more accurate results.
---
 deezspot/deezloader/__init__.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/deezspot/deezloader/__init__.py b/deezspot/deezloader/__init__.py
index 058a3b7..3c66cf0 100644
--- a/deezspot/deezloader/__init__.py
+++ b/deezspot/deezloader/__init__.py
@@ -419,7 +419,9 @@ class DeeLogin:
         spo_title = track_json.get('name', '')
         spo_album_title = (track_json.get('album') or {}).get('name', '')
         spo_tracknum = int(track_json.get('track_number') or 0)
-        
+        spo_artists = track_json.get('artists') or []
+        spo_main_artist = (spo_artists[0].get('name') if spo_artists else '') or ''
+
         try:
             dz = API.get_track_json(f"isrc:{spo_isrc}")
             if dz and dz.get('id'):
@@ -435,8 +437,8 @@ class DeeLogin:
         except Exception:
             pass
         
-        # Fallback: search by title + album
-        query = f'"{spo_title} {spo_album_title}"'
+        # Fallback: search by title + artist + album
+        query = f'"track:\'{spo_title}\' artist:\'{spo_main_artist}\' album:\'{spo_album_title}\'"'
         try:
             candidates = API.search_tracks_raw(query, limit=5)
         except Exception:

From 69cade2d6b5e076ca7dfd07976d298f29499972c Mon Sep 17 00:00:00 2001
From: They Who Shall Be Named
 <93336740+theywhoshallbenamed@users.noreply.github.com>
Date: Sat, 16 Aug 2025 04:20:34 -0400
Subject: [PATCH 2/2] Remove parentheses from candidate title when match
 initially fails

Track titles may have parentheses in them that note that the song features another artist (eg. (feat. artist)).

This means that, if a track title has this note on Spotify, but not Deezer (or vice versa), the "is title matching" check fails.

This is fixed by removing these notes from the title when comparing.
---
 deezspot/deezloader/__init__.py | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/deezspot/deezloader/__init__.py b/deezspot/deezloader/__init__.py
index 3c66cf0..17665e1 100644
--- a/deezspot/deezloader/__init__.py
+++ b/deezspot/deezloader/__init__.py
@@ -72,6 +72,11 @@ def _sim(a: str, b: str) -> float:
         return 0.0
     return SequenceMatcher(None, a, b).ratio()
 
+# Clean for searching on Deezer
+def _remove_parentheses(string: str) -> str:
+    # remove () and [] and {}, as well as anything inside
+    return re.sub(r'\{[^)]*\}', '', re.sub(r'\[[^)]*\]', '', re.sub(r'\([^)]*\)', '', string)))
+
 API()
 
 # Create a logger for the deezspot library
@@ -445,7 +450,15 @@ class DeeLogin:
             candidates = []
         
         for cand in candidates:
-            if max(_sim(spo_title, cand.get('title', '')), _sim(spo_title, cand.get('title_short', ''))) < 0.90:
+            title_match_1 = max(
+                _sim(spo_title, dz_json.get('title', '')),
+                _sim(spo_title, dz_json.get('title_short', ''))
+            )
+            title_match_2 = max(
+                _sim(_remove_parentheses(spo_title), _remove_parentheses(dz_json.get('title', ''))),
+                _sim(_remove_parentheses(spo_title), _remove_parentheses(dz_json.get('title_short', '')))
+            )
+            if max(title_match_1, title_match_2) < 0.90:
                 continue
             c_id = cand.get('id')
             if not c_id: