X-Git-Url: https://git.kaliko.me/?a=blobdiff_plain;f=sima%2Fmpdclient.py;h=338c3cff192af2509f635e1865dc5a4cfa27e6e4;hb=b36c71a;hp=0883b009e8f45826226f66694f9c7b3ba754a634;hpb=4ce63ab3966acacc48c3b05be167af441a2a087c;p=mpd-sima.git

diff --git a/sima/mpdclient.py b/sima/mpdclient.py
index 0883b00..338c3cf 100644
--- a/sima/mpdclient.py
+++ b/sima/mpdclient.py
@@ -32,7 +32,7 @@ from .lib.simastr import SimaStr
 from .utils.leven import levenshtein_ratio
 
 
-class PlayerError(Exception):
+class PlayerError(MPDError):
     """Fatal error in the player."""
 
 
@@ -42,20 +42,26 @@ def bl_artist(func):
         cls = args[0]
         if not cls.database:
             return func(*args, **kwargs)
-        results = func(*args, **kwargs)
-        if not results:
+        result = func(*args, **kwargs)
+        if not result:
             return None
-        for art in results.names:
-            mbid = results.mbid
-            if not mbid:
-                mbid = cls._find_musicbrainz_artistid(results)
-            artist = Artist(name=art, mbid=mbid)
+        for art in result.names:
+            artist = Artist(name=art, mbid=result.mbid)
             if cls.database.get_bl_artist(artist, add=False):
                 cls.log.debug('Artist in blocklist: %s', artist)
                 return None
-        return results
+        return result
     return wrapper
 
+def set_artist_mbid(func):
+    def wrapper(*args, **kwargs):
+        cls = args[0]
+        result = func(*args, **kwargs)
+        if Meta.use_mbid:
+            if result and not result.mbid:
+                result.mbid = cls._find_musicbrainz_artistid(result)
+        return result
+    return wrapper
 
 def tracks_wrapper(func):
     """Convert plain track mapping as returned by MPDClient into :py:obj:Track
@@ -316,7 +322,7 @@ class MPD(MPDClient):
         for name in artist.names:
             tracks |= set(self.find('artist', name))
         # album blocklist
-        albums = {Album(trk.album, mbid=trk.musicbrainz_albumid)
+        albums = {Album(trk.Album.name, mbid=trk.musicbrainz_albumid)
                   for trk in tracks}
         bl_albums = {Album(a.get('album'), mbid=a.get('musicbrainz_album'))
                      for a in self.database.view_bl() if a.get('album')}
@@ -355,6 +361,11 @@ class MPD(MPDClient):
 
 # #### Search Methods #####
     def _find_musicbrainz_artistid(self, artist):
+        """Find MusicBrainzArtistID when possible.
+        For artist with aliases having a mbid but not the main name, no mbid is
+        fetched…
+        Searching for Artist('Russian Circls') do not reslove the MBID
+        """
         if not self.use_mbid:
             return None
         mbids = self.list('MUSICBRAINZ_ARTISTID',
@@ -372,6 +383,7 @@ class MPD(MPDClient):
             return mbids[0]
 
     @bl_artist
+    @set_artist_mbid
     def search_artist(self, artist):
         """
         Search artists based on a fuzzy search in the media library
@@ -517,6 +529,8 @@ class MPD(MPDClient):
         candidates = []
         for album in albums:
             album_trks = self.find_tracks(album)
+            if not album_trks:  # find_track result can be empty, blocklist applied
+                continue
             album_artists = {tr.albumartist for tr in album_trks if tr.albumartist}
             if album.Artist.names & album_artists:
                 candidates.append(album)
@@ -548,9 +562,6 @@ class MPD(MPDClient):
                 self.log.debug('"%s" probably not an album of "%s" (ratio=%.2f)',
                                album, artist, ratio)
             continue
-        for alb in albums:
-            if self.database.get_bl_album(album, add=False):
-                candidates.remove(album)
         return candidates
 # #### / Search Methods ###