X-Git-Url: https://git.kaliko.me/?a=blobdiff_plain;f=sima%2Fclient.py;h=236ab10cbec3f1138448cf7c7e813659a735b4e9;hb=29344ced1f406ec9a3d718ece10c5a2b183a7b6f;hp=3ae7d9261672f3fe7f5d77e2498f47ebfe0b3158;hpb=f0912ba70260d43fc4885f6d75c2e83b6fb5a8d1;p=mpd-sima.git

diff --git a/sima/client.py b/sima/client.py
index 3ae7d92..236ab10 100644
--- a/sima/client.py
+++ b/sima/client.py
@@ -136,7 +136,6 @@ class PlayerClient(Player):
                           "search", "sticker find",]
         track_obj = ['currentsong']
         if self._comm in tracks_listing + track_obj:
-            # pylint: disable=star-args
             if isinstance(ans, list):
                 return [Track(**track) for track in ans]
             elif isinstance(ans, dict):
@@ -160,9 +159,9 @@ class PlayerClient(Player):
             self.log.info('Player: Initialising cache!')
         self._cache = {'artists': frozenset(),
                        'nombid_artists': frozenset(),}
-        self._cache['artists'] = frozenset(self._execute('list', ['artist']))
+        self._cache['artists'] = frozenset(filter(None, self._execute('list', ['artist'])))
         if Artist.use_mbid:
-            self._cache['nombid_artists'] = frozenset(self._execute('list', ['artist', 'musicbrainz_artistid', '']))
+            self._cache['nombid_artists'] = frozenset(filter(None, self._execute('list', ['artist', 'musicbrainz_artistid', ''])))
 
     @blacklist(track=True)
     def find_track(self, artist, title=None):
@@ -287,7 +286,7 @@ class PlayerClient(Player):
             kwalbart = {'albumartist':name, 'artist':name}
             for album in self.list('album', 'albumartist', artist):
                 if album and album not in albums:
-                    albums.append(Album(name=album, **kwalbart))  # pylint: disable=star-args
+                    albums.append(Album(name=album, **kwalbart))
             for album in self.list('album', 'artist', artist):
                 album_trks = [trk for trk in self.find('album', album)]
                 if 'Various Artists' in [tr.albumartist for tr in album_trks]:
@@ -379,18 +378,8 @@ class PlayerClient(Player):
         if password:
             try:
                 self._client.password(password)
-
-            # Catch errors with the password command (e.g., wrong password)
-            except CommandError as err:
-                raise PlayerError("Could not connect to '%s': "
-                                  "password command failed: %s" %
-                                  (host, err))
-
-            # Catch all other possible errors
             except (MPDError, IOError) as err:
-                raise PlayerError("Could not connect to '%s': "
-                                  "error with password command: %s" %
-                                  (host, err))
+                raise PlayerError("Could not connect to '%s': %s", (host, err))
         # Controls we have sufficient rights
         needed_cmds = ['status', 'stats', 'add', 'find', \
                        'search', 'currentsong', 'ping']