X-Git-Url: https://git.kaliko.me/?a=blobdiff_plain;f=sima%2Fmpdclient.py;h=1ad5100e9ea7ce8a6bdb7fe961d02c5b2cd5dc31;hb=7ac027b7a735bde1521f7a916a7629d3986e36c9;hp=7eeed94d86fa29e13b717081eba9ca2c2c46da86;hpb=b28f13f997df47e9e0618a2251ac69000aa483cc;p=mpd-sima.git

diff --git a/sima/mpdclient.py b/sima/mpdclient.py
index 7eeed94..1ad5100 100644
--- a/sima/mpdclient.py
+++ b/sima/mpdclient.py
@@ -48,8 +48,9 @@ def bl_artist(func):
             return None
         names = list()
         for art in result.names:
-            if cls.database.get_bl_artist(art, add_not=True):
-                cls.log.debug('Blacklisted "%s"', art)
+            artist = Artist(name=art, mbid=result.mbid)
+            if cls.database.get_bl_artist(artist, add=False):
+                cls.log.debug('Artist "%s" in blocklist!', artist)
                 continue
             names.append(art)
         if not names:
@@ -75,7 +76,7 @@ def tracks_wrapper(func):
 # / decorators
 
 
-def blacklist(artist=False, album=False, track=False):
+def blocklist(album=False, track=False):
     # pylint: disable=C0111,W0212
     field = (album, track)
 
@@ -92,13 +93,13 @@ def blacklist(artist=False, album=False, track=False):
             #cls.log.debug('using {0} as bl filter'.format(bl_getter.__name__))
             results = list()
             for elem in func(*args, **kwargs):
-                if bl_getter(elem, add_not=True):
+                if bl_getter(elem, add=False):
                     #cls.log.debug('Blacklisted "{0}"'.format(elem))
                     continue
-                if track and cls.database.get_bl_album(elem, add_not=True):
+                if track and cls.database.get_bl_album(elem, add=False):
                     # filter album as well in track mode
                     # (artist have already been)
-                    cls.log.debug('Blacklisted alb. "%s"', elem)
+                    cls.log.debug('Album "%s" in blocklist', elem)
                     continue
                 results.append(elem)
             return results
@@ -352,11 +353,11 @@ class MPD(MPDClient):
         if not hasattr(album, 'artist'):
             raise PlayerError('Album object have no artist attribute')
         albums = []
-        if self.use_mbid and album.mbid:
+        if album.mbid:
             filt = f"(MUSICBRAINZ_ALBUMID == '{album.mbid}')"
             albums = self.find(filt)
         # Now look for album with no MusicBrainzIdentifier
-        if not albums and album.artist.mbid and self.use_mbid:  # Use album artist MBID if possible
+        if not albums and album.artist.mbid:  # Use album artist MBID if possible
             filt = f"((MUSICBRAINZ_ALBUMARTISTID == '{album.artist.mbid}') AND (album == '{album.name_sz}'))"
             albums = self.find(filt)
         if not albums:  # Falls back to (album)?artist/album name
@@ -381,7 +382,7 @@ class MPD(MPDClient):
         Returns an Artist object
         """
         found = False
-        if self.use_mbid and artist.mbid:
+        if artist.mbid:
             # look for exact search w/ musicbrainz_artistid
             library = self.list('artist', f"(MUSICBRAINZ_ARTISTID == '{artist.mbid}')")
             if library:
@@ -437,7 +438,7 @@ class MPD(MPDClient):
             return artist
         return None
 
-    @blacklist(track=True)
+    @blocklist(track=True)
     def search_track(self, artist, title):
         """Fuzzy search of title by an artist
         """
@@ -467,7 +468,7 @@ class MPD(MPDClient):
                                mtitle, title, leven)
         return tracks
 
-    @blacklist(album=True)
+    @blocklist(album=True)
     def search_albums(self, artist):
         """Find potential albums for "artist"