X-Git-Url: https://git.kaliko.me/?a=blobdiff_plain;f=sima%2Fmpdclient.py;h=53a62d0ceddfe9bd74584494a210584e37c3f719;hb=774e755;hp=45d3dcdf767ab4bbc21c77a2629d45a0b60a3bbc;hpb=d1af78455dfab9e371770228191e28ed8386bd2f;p=mpd-sima.git

diff --git a/sima/mpdclient.py b/sima/mpdclient.py
index 45d3dcd..53a62d0 100644
--- a/sima/mpdclient.py
+++ b/sima/mpdclient.py
@@ -20,6 +20,7 @@
 from difflib import get_close_matches
 from functools import wraps
 from logging import getLogger
+from select import select
 
 # external module
 from musicpd import MPDClient, MPDError
@@ -30,9 +31,10 @@ 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(MPDError):
+class PlayerError(MPDSimaException):
     """Fatal error in the player."""
 
 
@@ -53,6 +55,7 @@ def bl_artist(func):
         return result
     return wrapper
 
+
 def set_artist_mbid(func):
     def wrapper(*args, **kwargs):
         cls = args[0]
@@ -66,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.
@@ -110,6 +114,7 @@ class MPD(MPDClient):
 
     def __init__(self, config):
         super().__init__()
+        self.socket_timeout = 10
         self.use_mbid = True
         self.log = getLogger('sima')
         self.config = config
@@ -119,9 +124,12 @@ class MPD(MPDClient):
     def __getattr__(self, cmd):
         """Wrapper around MPDClient calls for abstract overriding"""
         track_wrapped = {'currentsong', 'find', 'playlistinfo', }
-        if cmd in track_wrapped:
-            return tracks_wrapper(super().__getattr__(cmd))
-        return super().__getattr__(cmd)
+        try:
+            if cmd in track_wrapped:
+                return tracks_wrapper(super().__getattr__(cmd))
+            return super().__getattr__(cmd)
+        except OSError as err:
+            raise PlayerError(err) from err
 
     def disconnect(self):
         """Overriding explicitly MPDClient.disconnect()"""
@@ -139,21 +147,21 @@ class MPD(MPDClient):
         try:
             super().connect(host, port)
         # Catch socket errors
-        except IOError as err:
+        except OSError as err:
             raise PlayerError('Could not connect to "%s:%s": %s' %
-                              (host, port, err.strerror))
+                              (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))
+                              (host, port, err)) from err
         if password:
             try:
                 self.password(password)
-            except (MPDError, IOError) as err:
-                raise PlayerError("Could not connect to '%s': %s" % (host, err))
+            except (MPDError, OSError) as err:
+                raise PlayerError("Could not connect to '%s': %s" % (host, err)) from err
         # Controls we have sufficient rights
         available_cmd = self.commands()
         for cmd in MPD.needed_cmds:
@@ -230,15 +238,22 @@ class MPD(MPDClient):
             * skipped   current track skipped
         """
         curr = self.current
-        try:
-            ret = self.idle('database', 'playlist', 'player', 'options')
-        except (MPDError, IOError) as err:
-            raise PlayerError("Couldn't init idle: %s" % err)
-        if self._skipped_track(curr):
-            ret.append('skipped')
-        if 'database' in ret:
-            self._reset_cache()
-        return ret
+        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
+                self.noidle()
+            except OSError as err:
+                raise PlayerError(err) from err
 
     def clean(self):
         """Clean blocking event (idle) and pending commands