Revert previous refactoring around Exceptions

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

diff --git a/sima/utils/blcli.py b/sima/utils/blcli.py
index 4522e06d736f0d07822e71c64c0879f110540d18..4442abef59931cd4dc74362c42424bff7009ca24 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, Artist, Album
 from ..lib.simadb import SimaDB
 
 
@@ -35,25 +35,21 @@ class BLCli(MPD):
         cmd = options.get('command', None)
         if not cmd or not cmd.startswith('bl-'):
             return
-        try:
-            getattr(self, cmd.replace('-', '_'))()
-        except PlayerError as err:
-            self.log.error(err)
-            sys.exit(1)
+        getattr(self, cmd.replace('-', '_'))()
 
     def bl_view(self):
         blocklist = self.sdb.view_bl()
         for entry in ['artist', 'album', 'title']:
             header = False
-            for bl in blocklist:
-                art = bl.get(entry, '')
-                mbid = bl.get(f'musicbrainz_{entry}', '')
-                if art or mbid:
+            for blitem in blocklist:
+                val = blitem.get(entry, '')
+                mbid = blitem.get(f'musicbrainz_{entry}', '')
+                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'{blitem["id"]} "{val}"\t\t{mbid}')
 
     def bl_add_artist(self):
         artist = self.options.get('artist', None)
@@ -112,9 +108,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