X-Git-Url: https://git.kaliko.me/?a=blobdiff_plain;f=sima%2Fmpdclient.py;h=bf3ce5dbfb08d2f99b07c33813f17d8817c0e1e7;hb=62332aa0d68f28de54880e96a62b51c6e7bab08a;hp=ed2fbcdb37ec31bf93f3b9f497ad4612096bb2fa;hpb=45e8a0624444617ee9e86fe4576d9bb4aedfbb8a;p=mpd-sima.git

diff --git a/sima/mpdclient.py b/sima/mpdclient.py
index ed2fbcd..bf3ce5d 100644
--- a/sima/mpdclient.py
+++ b/sima/mpdclient.py
@@ -213,10 +213,12 @@ class MPD(MPDClient):
             self.log.info('Player: Initialising cache!')
         self._cache = {'artists': frozenset(),
                        'nombid_artists': frozenset()}
-        self._cache['artists'] = frozenset(filter(None, self.list('artist')))
-        if Artist.use_mbid:
+        self._cache['artist_tracks'] = {}
+        if self.use_mbid:
             artists = self.list('artist', "(MUSICBRAINZ_ARTISTID == '')")
             self._cache['nombid_artists'] = frozenset(filter(None, artists))
+        else:
+            self._cache['artists'] = frozenset(filter(None, self.list('artist')))
 
     def _skipped_track(self, previous):
         if (self.state == 'stop'
@@ -226,8 +228,7 @@ class MPD(MPDClient):
         return self.current.id != previous.id  # pylint: disable=no-member
 
     def monitor(self):
-        """OLD socket Idler
-        Monitor player for change
+        """Monitor player for change
         Returns a list a events among:
 
             * database  player media library has changed
@@ -256,7 +257,10 @@ class MPD(MPDClient):
             self.log.warning('pending commands: %s', self._pending)
 
     def add(self, payload):
-        """Overriding MPD's add method to accept Track objects"""
+        """Overriding MPD's add method to accept Track objects
+
+        :param Track,list payload: Either a single :py:obj:`Track` or a list of it
+        """
         if isinstance(payload, Track):
             super().__getattr__('add')(payload.file)
         elif isinstance(payload, list):
@@ -361,9 +365,16 @@ class MPD(MPDClient):
         found = False
         if self.use_mbid and artist.mbid:
             # look for exact search w/ musicbrainz_artistid
-            found = bool(self.list('artist', f"(MUSICBRAINZ_ARTISTID == '{artist.mbid}')"))
-            if found:
+            library = self.list('artist', f"(MUSICBRAINZ_ARTISTID == '{artist.mbid}')")
+            if library:
+                found = True
                 self.log.trace('Found mbid "%r" in library', artist)
+                # library could fetch several artist name for a single MUSICBRAINZ_ARTISTID
+                if len(library) > 1:
+                    self.log.debug('I got "%s" searching for %r', library, artist)
+                elif len(library) == 1 and library[0] != artist.name:
+                    self.log.info('Update artist name %s->%s', artist, library[0])
+                    artist = Artist(name=library[0], mbid=artist.mbid)
             # Fetches remaining artists for potential match
             artists = self._cache['nombid_artists']
         else:  # not using MusicBrainzIDs
@@ -372,8 +383,9 @@ class MPD(MPDClient):
         if not match and not found:
             return None
         if len(match) > 1:
-            self.log.debug('found close match for "%s": %s', artist, '/'.join(match))
-        # Forst lowercased comparison
+            self.log.debug('found close match for "%s": %s',
+                           artist, '/'.join(match))
+        # First lowercased comparison
         for close_art in match:
             # Regular lowered string comparison
             if artist.name.lower() == close_art.lower():
@@ -387,6 +399,7 @@ class MPD(MPDClient):
             self.log.trace('no fuzzy matching for %r', artist)
             if found:
                 return artist
+            return None
         # Now perform fuzzy search
         for fuzz in match:
             if fuzz in artist.names:  # Already found in lower cased comparison
@@ -407,26 +420,31 @@ class MPD(MPDClient):
     def search_track(self, artist, title):
         """Fuzzy search of title by an artist
         """
+        cache = self._cache.get('artist_tracks').get(artist)
         # Retrieve all tracks from artist
-        all_tracks = self.find_tracks(artist)
+        all_tracks = cache or self.find_tracks(artist)
+        if not cache:
+            self._cache['artist_tracks'] = {}  # clean up
+            self._cache.get('artist_tracks')[artist] = all_tracks
         # Get all titles (filter missing titles set to 'None')
         all_artist_titles = frozenset([tr.title for tr in all_tracks
                                        if tr.title is not None])
         match = get_close_matches(title, all_artist_titles, 50, 0.78)
+        tracks = []
         if not match:
             return []
         for mtitle in match:
-            leven = levenshtein_ratio(title.lower(), mtitle.lower())
+            leven = levenshtein_ratio(title, mtitle)
             if leven == 1:
-                pass
-            elif leven >= 0.79:  # PARAM
+                tracks.extend([t for t in all_tracks if t.title == mtitle])
+            elif leven >= 0.77:
                 self.log.debug('title: "%s" should match "%s" (lr=%1.3f)',
                                mtitle, title, leven)
+                tracks.extend([t for t in all_tracks if t.title == mtitle])
             else:
                 self.log.debug('title: "%s" does not match "%s" (lr=%1.3f)',
                                mtitle, title, leven)
-                return []
-            return self.find('artist', artist, 'title', mtitle)
+        return tracks
 
     @blacklist(album=True)
     def search_albums(self, artist):