Releasing 0.17.0

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

diff --git a/sima/mpdclient.py b/sima/mpdclient.py
index 5c32b775feb9906c6317e44172db3cb9838655ea..7eeed94d86fa29e13b717081eba9ca2c2c46da86 100644 (file)
--- 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
@@ -133,12 +134,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 +156,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 +200,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 +344,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)
 
@@ -482,8 +483,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)