Catch forgotten exception in mpdclient (Closes #59)

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

diff --git a/sima/mpdclient.py b/sima/mpdclient.py
index d528b96bb25aa4dff2260e3475cf380ce050ac1a..3bd13aef7b4b3705c092f086c034723d1b364680 100644 (file)
--- a/sima/mpdclient.py
+++ b/sima/mpdclient.py
@@ -23,7 +23,7 @@ from logging import getLogger
 from select import select
 
 # external module
-from musicpd import MPDClient, MPDError as PlayerError
+from musicpd import MPDClient, MPDError
 
 
 # local import
@@ -31,6 +31,11 @@ from .lib.meta import Meta, Artist, Album
 from .lib.track import Track
 from .lib.simastr import SimaStr
 from .utils.leven import levenshtein_ratio
+from .utils.utils import MPDSimaException
+
+
+class PlayerError(MPDSimaException):
+    """Fatal error in the player."""
 
 
 # Some decorators
@@ -50,6 +55,7 @@ def bl_artist(func):
         return result
     return wrapper
 
+
 def set_artist_mbid(func):
     def wrapper(*args, **kwargs):
         cls = args[0]
@@ -63,6 +69,7 @@ def set_artist_mbid(func):
         return result
     return wrapper
 
+
 def tracks_wrapper(func):
     """Convert plain track mapping as returned by MPDClient into :py:obj:`sima.lib.track.Track`
     objects. This decorator accepts single track or list of tracks as input.
@@ -121,8 +128,10 @@ class MPD(MPDClient):
             if cmd in track_wrapped:
                 return tracks_wrapper(super().__getattr__(cmd))
             return super().__getattr__(cmd)
-        except OSError as err:
-            raise PlayerError(err)
+        except OSError as err:  # socket errors
+            raise PlayerError(err) from err
+        except MPDError as err:  # hight level MPD client errors
+            raise PlayerError(err) from err
 
     def disconnect(self):
         """Overriding explicitly MPDClient.disconnect()"""
@@ -141,50 +150,47 @@ class MPD(MPDClient):
             super().connect(host, port)
         # Catch socket errors
         except OSError as err:
-            raise PlayerError('Could not connect to "%s:%s": %s' %
-                              (host, port, err.strerror))
+            raise PlayerError(f'Could not connect to "{host}:{port}": {err.strerror}'
+                             ) from err
         # Catch all other possible errors
         # ConnectionError and ProtocolError are always fatal.  Others may not
         # be, but we don't know how to handle them here, so treat them as if
         # they are instead of ignoring them.
-        except PlayerError as err:
-            raise PlayerError('Could not connect to "%s:%s": %s' %
-                              (host, port, err))
+        except MPDError as err:
+            raise PlayerError(f'Could not connect to "{host}:{port}": {err}') from err
         if password:
             try:
                 self.password(password)
-            except (PlayerError, OSError) as err:
-                raise PlayerError("Could not connect to '%s': %s" % (host, err))
+            except (MPDError, OSError) as err:
+                raise PlayerError(f"Could not connect to '{host}': {err}") from err
         # Controls we have sufficient rights
         available_cmd = self.commands()
         for cmd in MPD.needed_cmds:
             if cmd not in available_cmd:
                 self.disconnect()
-                raise PlayerError('Could connect to "%s", '
-                                  'but command "%s" not available' %
-                                  (host, cmd))
+                raise PlayerError(f'Could connect to "{host}", but command "{cmd}" not available')
         self.tagtypes('clear')
         for tag in MPD.needed_tags:
             self.tagtypes('enable', tag)
-        tt = set(map(str.lower, self.tagtypes()))
+        ltt = set(map(str.lower, self.tagtypes()))
         needed_tags = set(map(str.lower, MPD.needed_tags))
-        if len(needed_tags & tt) != len(MPD.needed_tags):
-            self.log.warning('MPD exposes: %s', tt)
+        if len(needed_tags & ltt) != len(MPD.needed_tags):
+            self.log.warning('MPD exposes: %s', ltt)
             self.log.warning('Tags needed: %s', needed_tags)
             raise PlayerError('Missing mandatory metadata!')
         for tag in MPD.needed_mbid_tags:
             self.tagtypes('enable', tag)
         # Controls use of MusicBrainzIdentifier
         if self.config.getboolean('sima', 'musicbrainzid'):
-            tt = set(self.tagtypes())
-            if len(MPD.needed_mbid_tags & tt) != len(MPD.needed_mbid_tags):
+            ltt = set(self.tagtypes())
+            if len(MPD.needed_mbid_tags & ltt) != len(MPD.needed_mbid_tags):
                 self.log.warning('Use of MusicBrainzIdentifier is set but MPD '
                                  'is not providing related metadata')
-                self.log.info(tt)
+                self.log.info(ltt)
                 self.log.warning('Disabling MusicBrainzIdentifier')
                 self.use_mbid = Meta.use_mbid = False
             else:
-                self.log.debug('Available metadata: %s', tt)
+                self.log.debug('Available metadata: %s', ltt)
                 self.use_mbid = Meta.use_mbid = True
         else:
             self.log.warning('Use of MusicBrainzIdentifier disabled!')
@@ -242,11 +248,11 @@ class MPD(MPDClient):
                 if 'database' in ret:
                     self._reset_cache()
                 return ret
-            else:
-                try:  # noidle cmd does not go through __getattr__, need to catch OSError then
-                    self.noidle()
-                except OSError as err:
-                    raise PlayerError(err)
+            #  Nothing to read, canceling idle
+            try:  # noidle cmd does not go through __getattr__, need to catch OSError then
+                self.noidle()
+            except OSError as err:
+                raise PlayerError(err) from err
 
     def clean(self):
         """Clean blocking event (idle) and pending commands
@@ -287,7 +293,7 @@ class MPD(MPDClient):
         plm = {'repeat': None, 'single': None,
                'random': None, 'consume': None, }
         for key, val in self.status().items():
-            if key in plm.keys():
+            if key in plm:
                 plm.update({key: bool(int(val))})
         return plm
 
@@ -393,6 +399,7 @@ class MPD(MPDClient):
                          artist.name, mbids[0], artist.mbid)
         else:
             return mbids[0]
+        return None
 
     @bl_artist
     @set_artist_mbid
@@ -551,9 +558,9 @@ class MPD(MPDClient):
                 if artist.mbid == album_trks[0].musicbrainz_albumartistid:
                     candidates.append(album)
                     continue
-                else:
-                    self.log.debug('Discarding "%s", "%r" not set as musicbrainz_albumartistid', album, album.Artist)
-                    continue
+                self.log.debug('Discarding "%s", "%r" not set as musicbrainz_albumartistid',
+                               album, album.Artist)
+                continue
             if 'Various Artists' in album_artists:
                 self.log.debug('Discarding %s ("Various Artists" set)', album)
                 continue