X-Git-Url: https://git.kaliko.me/?a=blobdiff_plain;f=sima%2Fmpdclient.py;h=99f69474258a513cbe6567dce875b11f012c4446;hb=refs%2Fheads%2Fdev;hp=3bd13aef7b4b3705c092f086c034723d1b364680;hpb=48e9d961a1dce5739ad59301b179a3bd0cc02754;p=mpd-sima.git

diff --git a/sima/mpdclient.py b/sima/mpdclient.py
index 3bd13ae..99f6947 100644
--- a/sima/mpdclient.py
+++ b/sima/mpdclient.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (c) 2009-2021 kaliko <kaliko@azylum.org>
+# Copyright (c) 2009-2022, 2024 kaliko <kaliko@azylum.org>
 #
 #  This file is part of sima
 #
@@ -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,7 @@ 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."""
+from .utils.utils import get_decorator
 
 
 # Some decorators
@@ -81,6 +77,9 @@ def tracks_wrapper(func):
             return Track(**ret)
         return [Track(**t) for t in ret]
     return wrapper
+
+# Decorator to wrap non MPDError exceptions from musicpd in PlayerError
+we = get_decorator(errors=(OSError, TimeoutError), wrap_into=PlayerError)
 # / decorators
 
 
@@ -121,17 +120,13 @@ class MPD(MPDClient):
         self._cache = None
 
     # ######### Overriding MPDClient ###########
+    @we
     def __getattr__(self, cmd):
         """Wrapper around MPDClient calls for abstract overriding"""
         track_wrapped = {'currentsong', 'find', 'playlistinfo', }
-        try:
-            if cmd in track_wrapped:
-                return tracks_wrapper(super().__getattr__(cmd))
-            return super().__getattr__(cmd)
-        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
+        if cmd in track_wrapped:
+            return tracks_wrapper(super().__getattr__(cmd))
+        return super().__getattr__(cmd)
 
     def disconnect(self):
         """Overriding explicitly MPDClient.disconnect()"""
@@ -146,32 +141,18 @@ class MPD(MPDClient):
         port = mpd_config.get('port')
         password = mpd_config.get('password', fallback=None)
         self.disconnect()
-        try:
-            super().connect(host, port)
-        # Catch socket errors
-        except OSError as 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(f'Could not connect to "{host}:{port}": {err}') from err
+        super().connect(host, port)
         if password:
-            try:
-                self.password(password)
-            except (MPDError, OSError) as err:
-                raise PlayerError(f"Could not connect to '{host}': {err}") from err
+            self.password(password)
         # 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(f'Could connect to "{host}", but command "{cmd}" not available')
-        self.tagtypes('clear')
+        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):
@@ -179,7 +160,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())
@@ -226,6 +207,7 @@ class MPD(MPDClient):
             return False
         return self.current.id != previous.id  # pylint: disable=no-member
 
+    @we
     def monitor(self):
         """Monitor player for change
         Returns a list a events among:
@@ -249,10 +231,7 @@ class MPD(MPDClient):
                     self._reset_cache()
                 return ret
             #  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
+            self.noidle()
 
     def clean(self):
         """Clean blocking event (idle) and pending commands
@@ -262,6 +241,7 @@ class MPD(MPDClient):
         elif self._pending:
             self.log.warning('pending commands: %s', self._pending)
 
+    @we
     def add(self, payload):
         """Overriding MPD's add method to accept Track objects
 
@@ -429,12 +409,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