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

diff --git a/sima/mpdclient.py b/sima/mpdclient.py
index c2daae3..b50df91 100644
--- 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
+from musicpd import MPDClient, MPDError as PlayerError
 
 
 # local import
@@ -31,11 +31,6 @@ 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
@@ -128,7 +123,7 @@ 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
 
     def disconnect(self):
@@ -148,31 +143,28 @@ 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
+        except PlayerError as 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
+            except 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))
-        self.tagtypes('clear')
+                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)
+            self.tagtypes_enable(tag)
         ltt = set(map(str.lower, self.tagtypes()))
         needed_tags = set(map(str.lower, MPD.needed_tags))
         if len(needed_tags & ltt) != len(MPD.needed_tags):
@@ -180,7 +172,7 @@ class MPD(MPDClient):
             self.log.warning('Tags needed: %s', needed_tags)
             raise PlayerError('Missing mandatory metadata!')
         for tag in MPD.needed_mbid_tags:
-            self.tagtypes('enable', tag)
+            self.tagtypes_enable(tag)
         # Controls use of MusicBrainzIdentifier
         if self.config.getboolean('sima', 'musicbrainzid'):
             ltt = set(self.tagtypes())
@@ -239,21 +231,21 @@ 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
 
     def clean(self):
         """Clean blocking event (idle) and pending commands
@@ -294,7 +286,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
 
@@ -430,12 +422,6 @@ class MPD(MPDClient):
                         if SimaStr(artist.name) == name and name != artist.name:
                             self.log.debug('add alias for %s: %s', artist, name)
                             artist.add_alias(name)
-                elif len(library) == 1 and library[0] != artist.name:
-                    new_alias = artist.name
-                    self.log.info('Update artist name %s->%s', artist, library[0])
-                    self.log.debug('Also add alias for %s: %s', artist, new_alias)
-                    artist = Artist(name=library[0], mbid=artist.mbid)
-                    artist.add_alias(new_alias)
             # Fetches remaining artists for potential match
             artists = self._cache['nombid_artists']
         else:  # not using MusicBrainzIDs