PlayerError inherit from MPDError instead of plain Exception

[mpd-sima.git] / sima / utils / blcli.py

diff --git a/sima/utils/blcli.py b/sima/utils/blcli.py
index 4522e06d736f0d07822e71c64c0879f110540d18..63d3bf41113dd150158c1727971c32b826c13f04 100644 (file)
--- a/sima/utils/blcli.py
+++ b/sima/utils/blcli.py
@@ -21,7 +21,7 @@ import atexit
 import sys
 
 # local import
-from ..mpdclient import MPD, PlayerError, Artist, Album
+from ..mpdclient import MPD, MPDError, Artist, Album
 from ..lib.simadb import SimaDB
 
 
@@ -37,7 +37,7 @@ class BLCli(MPD):
             return
         try:
             getattr(self, cmd.replace('-', '_'))()
-        except PlayerError as err:
+        except MPDError as err:
             self.log.error(err)
             sys.exit(1)
 
@@ -46,14 +46,14 @@ class BLCli(MPD):
         for entry in ['artist', 'album', 'title']:
             header = False
             for bl in blocklist:
-                art = bl.get(entry, '')
+                val = bl.get(entry, '')
                 mbid = bl.get(f'musicbrainz_{entry}', '')
-                if art or mbid:
+                if val or mbid:
                     if not header:
                         header = True
                         self.log.info(f'{entry.capitalize()}'
                                       '(id name musicbranzID):')
-                    self.log.info(f'{bl["id"]} "{art}"\t\t{mbid}')
+                    self.log.info(f'{bl["id"]} "{val}"\t\t{mbid}')
 
     def bl_add_artist(self):
         artist = self.options.get('artist', None)
@@ -112,9 +112,8 @@ class BLCli(MPD):
                 return
             track = tracks[0]
             album = Album(name=track.album, mbid=track.musicbrainz_albumid)
-            artist = Artist(name=track.artist, mbid=track.musicbrainz_artistid)
             self.log.info('Found album in library: %s (by "%s")',
-                          album, artist)
+                          album, track.Artist.albumartist)
         if self.sdb.get_bl_album(album, add=False):
             self.log.info('Already in blocklist')
             return