X-Git-Url: https://git.kaliko.me/?a=blobdiff_plain;f=sima%2Fmpdclient.py;h=bccdb97c7f83790e7541c0765cfe567b72ad724f;hb=45cf8271f3d364c33dd3c6fa2bcceca494176c0d;hp=5c32b775feb9906c6317e44172db3cb9838655ea;hpb=d1650da737a01f0c480ffe8035fb56051e3cef1d;p=mpd-sima.git

diff --git a/sima/mpdclient.py b/sima/mpdclient.py
index 5c32b77..bccdb97 100644
--- a/sima/mpdclient.py
+++ b/sima/mpdclient.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (c) 2009-2020 kaliko <kaliko@azylum.org>
+# Copyright (c) 2009-2021 kaliko <kaliko@azylum.org>
 #
 #  This file is part of sima
 #
@@ -20,6 +20,7 @@
 from difflib import get_close_matches
 from functools import wraps
 from itertools import dropwhile
+from logging import getLogger
 
 # external module
 from musicpd import MPDClient, MPDError
@@ -47,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:
@@ -74,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)
 
@@ -91,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
@@ -133,12 +135,11 @@ class MPD(MPDClient):
                           'MUSICBRAINZ_RELEASETRACKID', 'MUSICBRAINZ_WORKID'}
     database = None
 
-    def __init__(self, daemon):
+    def __init__(self, config):
         super().__init__()
         self.use_mbid = True
-        self.daemon = daemon
-        self.log = daemon.log
-        self.config = self.daemon.config['MPD']
+        self.log = getLogger('sima')
+        self.config = config
         self._cache = None
 
     # ######### Overriding MPDClient ###########
@@ -156,10 +157,11 @@ class MPD(MPDClient):
 
     def connect(self):
         """Overriding explicitly MPDClient.connect()"""
+        mpd_config = self.config['MPD']
         # host, port, password
-        host = self.config.get('host')
-        port = self.config.get('port')
-        password = self.config.get('password', fallback=None)
+        host = mpd_config.get('host')
+        port = mpd_config.get('port')
+        password = mpd_config.get('password', fallback=None)
         self.disconnect()
         try:
             super().connect(host, port)
@@ -199,7 +201,7 @@ class MPD(MPDClient):
         for tag in MPD.needed_mbid_tags:
             self.tagtypes('enable', tag)
         # Controls use of MusicBrainzIdentifier
-        if self.daemon.config.get('sima', 'musicbrainzid'):
+        if self.config.getboolean('sima', 'musicbrainzid'):
             tt = set(self.tagtypes())
             if len(MPD.needed_mbid_tags & tt) != len(MPD.needed_mbid_tags):
                 self.log.warning('Use of MusicBrainzIdentifier is set but MPD '
@@ -343,7 +345,7 @@ class MPD(MPDClient):
         tracks = set()
         if artist.mbid:
             tracks |= set(self.find('musicbrainz_artistid', artist.mbid))
-        for name in artist.names_sz:
+        for name in artist.names:
             tracks |= set(self.find('artist', name))
         return list(tracks)
 
@@ -436,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
         """
@@ -466,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"
 
@@ -482,8 +484,9 @@ class MPD(MPDClient):
             self.log.debug('Searching album for %s aliases: "%s"',
                            artist, artist.aliases)
         for name_sz in artist.names_sz:
-            raw_albums = self.list('album', f"( albumartist == '{name_sz}')")
-            albums = [Album(a, albumartist=artist.name, artist=artist) for a in raw_albums if a]
+            mpd_filter = f"((albumartist == '{name_sz}') AND ( album != ''))"
+            raw_albums = self.list('album', mpd_filter)
+            albums = [Album(a, albumartist=artist.name, artist=artist) for a in raw_albums]
         candidates = []
         for album in albums:
             album_trks = self.find_tracks(album)