feat: improve apple music fuzzy matching

frontend/js/src/common/brainzplayer/AppleMusicPlayer.tsx

@@ -197,8 +197,6 @@ export default class AppleMusicPlayer
     const { onTrackNotFound } = this.props;
     const trackName = getTrackName(listen);
     const artistName = getArtistName(listen);
-    // Album name can give worse results, re;oving it from search terms
-    // const releaseName = _get(listen, "track_metadata.release_name");
     const searchTerm = `${trackName} ${artistName}`;
     if (!searchTerm) {
       onTrackNotFound();
@@ -209,38 +207,44 @@ export default class AppleMusicPlayer
         `/v1/catalog/{{storefrontId}}/search`,
         { term: searchTerm, types: "songs" }
       );
+      const releaseName = _get(listen, "track_metadata.release_name");
       // Remove accents from both the search term and the API results
       const trackNameWithoutAccents = deburr(trackName);
+      const releaseNameWithoutAccents = deburr(releaseName);
       const candidateMatches = response?.data?.results?.songs?.data.map(
         (candidate) => ({
           ...candidate,
           attributes: {
             ...candidate.attributes,
             name: deburr(candidate.attributes.name),
+            albumName: deburr(candidate.attributes.albumName),
           },
         })
       );
-      // Check if the first API result is a match
-      if (
-        new RegExp(escapeRegExp(trackNameWithoutAccents), "igu").test(
-          candidateMatches?.[0]?.attributes.name
-        )
-      ) {
-        // First result matches track title, assume it's the correct result
-        await this.playAppleMusicId(candidateMatches[0].id);
-        return;
-      }
-      // Fallback to best fuzzy match based on track title
-      const fruzzyMatches = fuzzysort.go(
+      const fuzzyMatches = fuzzysort.go(
         trackNameWithoutAccents,
         candidateMatches,
         {
           key: "attributes.name",
-          limit: 1,
         }
       );
-      if (fruzzyMatches[0]) {
-        await this.playAppleMusicId(fruzzyMatches[0].obj.id);
+
+      const matchWithAlbum = fuzzyMatches.find((match) => {
+        const albumMatch = fuzzysort.single(
+          releaseNameWithoutAccents,
+          match.obj.attributes.albumName
+        );
+        return albumMatch && albumMatch.score > 0.8;
+      });
+
+      if (matchWithAlbum) {
+        await this.playAppleMusicId(matchWithAlbum.obj.id);
+        return;
+      }
+
+      // If no match found with album, play the best track match
+      if (fuzzyMatches[0]) {
+        await this.playAppleMusicId(fuzzyMatches[0].obj.id);
         return;
       }
       // No good match, onTrackNotFound will be called in the code block below