MPD client: set some log levels

[mpd-sima.git] / sima / mpdclient.py

diff --git a/sima/mpdclient.py b/sima/mpdclient.py
index 0866e4c59c46a60994c94d51378f139036bc08a6..42c41674c77c464b96c418d8f629622f4d9c3ad9 100644 (file)
--- a/sima/mpdclient.py
+++ b/sima/mpdclient.py
@@ -206,15 +206,20 @@ class MPD(MPDClient):
     def _reset_cache(self):
         """
         Both flushes and instantiates _cache
+
+        * artists: all artists
+        * nombid_artists: artists with no mbid (set only when self.use_mbid is True)
+        * artist_tracks: caching last artist tracks, used in search_track
         """
         if isinstance(self._cache, dict):
             self.log.info('Player: Flushing cache!')
         else:
             self.log.info('Player: Initialising cache!')
         self._cache = {'artists': frozenset(),
-                       'nombid_artists': frozenset()}
+                       'nombid_artists': frozenset(),
+                       'artist_tracks': {}}
         self._cache['artists'] = frozenset(filter(None, self.list('artist')))
-        if Artist.use_mbid:
+        if self.use_mbid:
             artists = self.list('artist', "(MUSICBRAINZ_ARTISTID == '')")
             self._cache['nombid_artists'] = frozenset(filter(None, artists))
 
@@ -226,8 +231,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 +260,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):
@@ -367,9 +374,9 @@ class MPD(MPDClient):
                 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.warning('I got "%s" searching for %r', library, artist)
+                    self.log.debug('I got "%s" searching for %r', library, artist)
                 elif len(library) == 1 and library[0] != artist.name:
-                    self.log.debug('Update artist name %s->%s', artist, library[0])
+                    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']
@@ -379,8 +386,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():
@@ -403,11 +411,11 @@ class MPD(MPDClient):
             if SimaStr(artist.name) == fuzz:
                 found = True
                 artist.add_alias(fuzz)
-                self.log.info('"%s" quite probably matches "%s" (SimaStr)',
-                              fuzz, artist)
+                self.log.debug('"%s" quite probably matches "%s" (SimaStr)',
+                               fuzz, artist)
         if found:
             if artist.aliases:
-                self.log.debug('Found aliases: %s', '/'.join(artist.names))
+                self.log.info('Found aliases: %s', '/'.join(artist.names))
             return artist
         return None
 
@@ -415,26 +423,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):