X-Git-Url: https://git.kaliko.me/?a=blobdiff_plain;f=sima%2Fmpdclient.py;h=c4ebadeaa7e1d4453aa92d8bbda5830c0715842e;hb=94c7b5c9c88a414afd30aa91b133afec6f3c4b6a;hp=c2daae361b6ad20e96e42d4104b7faa60614bb24;hpb=e86c25ed9e97c5dd3e0672d5b17bed01d4a23fdf;p=mpd-sima.git

diff --git a/sima/mpdclient.py b/sima/mpdclient.py
index c2daae3..c4ebade 100644
--- a/sima/mpdclient.py
+++ b/sima/mpdclient.py
@@ -128,7 +128,9 @@ class MPD(MPDClient):
             if cmd in track_wrapped:
                 return tracks_wrapper(super().__getattr__(cmd))
             return super().__getattr__(cmd)
-        except OSError as 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):
@@ -148,28 +150,25 @@ 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)) from err
+            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 MPDError as err:
-            raise PlayerError('Could not connect to "%s:%s": %s' %
-                              (host, port, err)) from err
+            raise PlayerError(f'Could not connect to "{host}:{port}": {err}') from err
         if password:
             try:
                 self.password(password)
             except (MPDError, OSError) as err:
-                raise PlayerError("Could not connect to '%s': %s" % (host, err)) from 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)
@@ -239,21 +238,23 @@ class MPD(MPDClient):
         """
         curr = self.current
         select_timeout = 5
-        while True:
-            self.send_idle('database', 'playlist', 'player', 'options')
-            _read, _, _ = select([self], [], [], select_timeout)
-            if _read:  # tries to read response
-                ret = self.fetch_idle()
-                if self._skipped_track(curr):
-                    ret.append('skipped')
-                if 'database' in ret:
-                    self._reset_cache()
-                return ret
-            #  Nothing to read, canceling idle
-            try:  # noidle cmd does not go through __getattr__, need to catch OSError then
+        try:  # noidle cmd does not go through __getattr__, need to catch OSError then
+            while True:
+                self.send_idle('database', 'playlist', 'player', 'options')
+                _read, _, _ = select([self], [], [], select_timeout)
+                if _read:  # tries to read response
+                    ret = self.fetch_idle()
+                    if self._skipped_track(curr):
+                        ret.append('skipped')
+                    if 'database' in ret:
+                        self._reset_cache()
+                    return ret
+                #  Nothing to read, canceling idle
                 self.noidle()
-            except OSError as err:
-                raise PlayerError(err) from err
+        except OSError as err:
+            raise PlayerError(err) from err
+        except MPDError as err:  # hight level MPD client errors
+            raise PlayerError(err) from err
 
     def clean(self):
         """Clean blocking event (idle) and pending commands
@@ -294,7 +295,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