Update bash completion

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

diff --git a/sima/mpdclient.py b/sima/mpdclient.py
index 23b263e1ee92b24460b097034b421b794f4a2be4..cced48c34e4df1f77ba1c962b4520246c6e43d5f 100644 (file)
--- a/sima/mpdclient.py
+++ b/sima/mpdclient.py
@@ -149,7 +149,7 @@ class MPD(MPDClient):
         # 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:
+        except PlayerError as err:
             raise PlayerError(f'Could not connect to "{host}:{port}": {err}') from err
         if password:
             try:
@@ -189,7 +189,13 @@ class MPD(MPDClient):
             self.log.warning('Use of MusicBrainzIdentifier disabled!')
             self.log.info('Consider using MusicBrainzIdentifier for your music library')
             self.use_mbid = Meta.use_mbid = False
-        self._reset_cache()
+        # TODO: Why do I need to intercept OSError here?
+        # why is it not wrapped in PlayerError in __getattr__?
+        # (cf. commit message for more)
+        try:
+            self._reset_cache()
+        except OSError as err:
+            raise PlayerError(f'Error during cache init: {err}') from err
     # ######### / Overriding MPDClient #########
 
     def _reset_cache(self):