from logging import getLogger
# external module
-from musicpd import MPDClient, MPDError
+from musicpd import MPDClient, MPDError as PlayerError
# local import
from .utils.leven import levenshtein_ratio
-class PlayerError(MPDError):
- """Fatal error in the player."""
-
-
# Some decorators
def bl_artist(func):
def wrapper(*args, **kwargs):
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)
def disconnect(self):
"""Overriding explicitly MPDClient.disconnect()"""
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))
# 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:
+ except PlayerError as err:
raise PlayerError('Could not connect to "%s:%s": %s' %
(host, port, err))
if password:
try:
self.password(password)
- except (MPDError, IOError) as err:
+ except (PlayerError, OSError) as err:
raise PlayerError("Could not connect to '%s': %s" % (host, err))
# Controls we have sufficient rights
available_cmd = self.commands()
* 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)
+ ret = self.idle('database', 'playlist', 'player', 'options')
if self._skipped_track(curr):
ret.append('skipped')
if 'database' in ret: