Improve match/link logic (#334)

Improve match logic

diff --git a/music_assistant/controllers/music/albums.py b/music_assistant/controllers/music/albums.py
index cab856a4f1e83350fc8299d846d1074355eea66b..72d97fa531aa41d251dd7406fb50fb0b411016f3 100644 (file)
--- a/music_assistant/controllers/music/albums.py
+++ b/music_assistant/controllers/music/albums.py
@@ -208,20 +208,27 @@ class AlbumsController(MediaControllerBase[Album]):
                 "Trying to match album %s on provider %s", db_album.name, provider.name
             )
             match_found = False
-            search_result = await self.search(db_album.name, provider.id)
-            for search_result_item in search_result:
-                if not search_result_item.available:
-                    continue
-                if not compare_album(search_result_item, db_album):
-                    continue
-                # we must fetch the full album version, search results are simplified objects
-                prov_album = await self.get_provider_item(
-                    search_result_item.item_id, search_result_item.provider
-                )
-                if compare_album(prov_album, db_album):
-                    # 100% match, we can simply update the db with additional provider ids
-                    await self.update_db_item(db_album.item_id, prov_album)
-                    match_found = True
+            for search_str in (
+                db_album.name,
+                f"{db_album.artist.name} - {db_album.name}",
+                f"{db_album.artist.name} {db_album.name}",
+            ):
+                if match_found:
+                    break
+                search_result = await self.search(search_str, provider.id)
+                for search_result_item in search_result:
+                    if not search_result_item.available:
+                        continue
+                    if not compare_album(search_result_item, db_album):
+                        continue
+                    # we must fetch the full album version, search results are simplified objects
+                    prov_album = await self.get_provider_item(
+                        search_result_item.item_id, search_result_item.provider
+                    )
+                    if compare_album(prov_album, db_album):
+                        # 100% match, we can simply update the db with additional provider ids
+                        await self.update_db_item(db_album.item_id, prov_album)
+                        match_found = True
             return match_found
 
         # try to find match on all providers

diff --git a/music_assistant/controllers/music/artists.py b/music_assistant/controllers/music/artists.py
index b7d277ec6fda2fe02566a6ca1c0982bccfcda3b8..346871c12b6b4c267ae8cdd27118faa6b88e5cb2 100644 (file)
--- a/music_assistant/controllers/music/artists.py
+++ b/music_assistant/controllers/music/artists.py
@@ -6,12 +6,6 @@ from typing import Dict, List, Optional
 
 from databases import Database as Db
 
-from music_assistant.helpers.compare import (
-    compare_album,
-    compare_artist,
-    compare_strings,
-    compare_track,
-)
 from music_assistant.helpers.database import TABLE_ARTISTS
 from music_assistant.helpers.json import json_serializer
 from music_assistant.models.enums import EventType, ProviderType
@@ -159,7 +153,8 @@ class ArtistsController(MediaControllerBase[Artist]):
                     self.db_table, match, db=db
                 ):
                     row_artist = Artist.from_db_row(row)
-                    if compare_strings(row_artist.sort_name, artist.sort_name):
+                    if row_artist.sort_name == artist.sort_name:
+                        # just to be sure ?!
                         cur_item = row_artist
                         break
             if cur_item:
@@ -219,43 +214,60 @@ class ArtistsController(MediaControllerBase[Artist]):
                 ref_track = await self.mass.music.tracks.get(
                     ref_track.item_id, ref_track.provider
                 )
-            search_results = await self.mass.music.tracks.search(
-                ref_track.name, provider.type
-            )
-            for search_result_item in search_results:
-                if not compare_track(search_result_item, ref_track):
-                    continue
-                # get matching artist from track
-                for search_item_artist in search_result_item.artists:
-                    if not compare_artist(db_artist, search_item_artist):
+            for search_str in (
+                f"{db_artist.name} - {ref_track.name}",
+                f"{db_artist.name} {ref_track.name}",
+                ref_track.name,
+            ):
+                search_results = await self.mass.music.tracks.search(
+                    search_str, provider.type
+                )
+                for search_result_item in search_results:
+                    if search_result_item.sort_name != ref_track.sort_name:
                         continue
-                    # 100% album match
-                    # get full artist details so we have all metadata
-                    prov_artist = await self.get_provider_item(
-                        search_item_artist.item_id, search_item_artist.provider
-                    )
-                    await self.update_db_item(db_artist.item_id, prov_artist)
-                    return True
+                    # get matching artist from track
+                    for search_item_artist in search_result_item.artists:
+                        if search_item_artist.sort_name != db_artist.sort_name:
+                            continue
+                        # 100% album match
+                        # get full artist details so we have all metadata
+                        prov_artist = await self.get_provider_item(
+                            search_item_artist.item_id, search_item_artist.provider
+                        )
+                        await self.update_db_item(db_artist.item_id, prov_artist)
+                        return True
         # try to get a match with some reference albums of this artist
         artist_albums = await self.albums(db_artist.item_id, db_artist.provider)
         for ref_album in artist_albums:
             if ref_album.album_type == AlbumType.COMPILATION:
                 continue
-            search_result = await self.mass.music.albums.search(
-                ref_album.name, provider.type
-            )
-            for search_result_item in search_result:
-                # artist must match 100%
-                if not compare_artist(db_artist, search_result_item.artist):
-                    continue
-                if not compare_album(search_result_item, ref_album):
-                    continue
-                # 100% match
-                # get full artist details so we have all metadata
-                prov_artist = await self.get_provider_item(
-                    search_result_item.artist.item_id,
-                    search_result_item.artist.provider,
+            if ref_album.artist is None:
+                continue
+            for search_str in (
+                ref_album.name,
+                f"{db_artist.name} - {ref_album.name}",
+                f"{db_artist.name} {ref_album.name}",
+            ):
+                search_result = await self.mass.music.albums.search(
+                    search_str, provider.type
                 )
-                await self.update_db_item(db_artist.item_id, prov_artist)
-                return True
+                for search_result_item in search_result:
+                    if search_result_item.artist is None:
+                        continue
+                    if search_result_item.sort_name != ref_album.sort_name:
+                        continue
+                    # artist must match 100%
+                    if (
+                        search_result_item.artist.sort_name
+                        != ref_album.artist.sort_name
+                    ):
+                        continue
+                    # 100% match
+                    # get full artist details so we have all metadata
+                    prov_artist = await self.get_provider_item(
+                        search_result_item.artist.item_id,
+                        search_result_item.artist.provider,
+                    )
+                    await self.update_db_item(db_artist.item_id, prov_artist)
+                    return True
         return False

diff --git a/music_assistant/controllers/music/tracks.py b/music_assistant/controllers/music/tracks.py
index 5331980f1f64b2bd77141861ab22f1c4ff7402b8..8448aa3a596e575d31e1ccd1a1b57b40851222bc 100644 (file)
--- a/music_assistant/controllers/music/tracks.py
+++ b/music_assistant/controllers/music/tracks.py
@@ -96,14 +96,21 @@ class TracksController(MediaControllerBase[Track]):
                 "Trying to match track %s on provider %s", db_track.name, provider.name
             )
             match_found = False
-            search_result = await self.search(db_track.name, provider.type)
-            for search_result_item in search_result:
-                if not search_result_item.available:
-                    continue
-                if compare_track(search_result_item, db_track):
-                    # 100% match, we can simply update the db with additional provider ids
-                    match_found = True
-                    await self.update_db_item(db_track.item_id, search_result_item)
+            for search_str in (
+                db_track.name,
+                f"{db_track.artists[0].name} - {db_track.name}",
+                f"{db_track.artists[0].name} {db_track.name}",
+            ):
+                if match_found:
+                    break
+                search_result = await self.search(search_str, provider.type)
+                for search_result_item in search_result:
+                    if not search_result_item.available:
+                        continue
+                    if compare_track(search_result_item, db_track):
+                        # 100% match, we can simply update the db with additional provider ids
+                        match_found = True
+                        await self.update_db_item(db_track.item_id, search_result_item)
 
             if not match_found:
                 self.logger.debug(