simadb_cli executable is removed.
* Removed obsolete --create-db and --generate-config options
* Fixed crash when setting XDG_CONFIG_HOME (closes #50)
- * Add abstract unix socket support for MPD connection (need at least
- python-musicpd 0.6.0)
+ * Add abstract unix socket support for MPD connection
+ * Better MPD connection management.
+ * Need at least python-musicpd 0.7.0.
+ Abstract socket in v0.6.0 and socket timeout in v0.7.0
-- kaliko <kaliko@azylum.org> Wed, 28 Apr 2021 17:21:39 +0200
keywords='MPD',
long_description=DESCRIPTION,
classifiers=classifiers,
- install_requires=['python-musicpd>=0.4.1', 'requests>= 2.20.0'],
+ install_requires=['python-musicpd>=0.7.0', 'requests>= 2.20.0'],
packages=find_packages(exclude=["tests"]),
include_package_data=True,
data_files=data_files,
"""
self.log.warning('Starting shutdown.')
# Cleaning pending command
- self.player.clean()
- self.foreach_plugin('shutdown')
- self.player.disconnect()
-
+ try:
+ self.player.clean()
+ self.foreach_plugin('shutdown')
+ self.player.disconnect()
+ except PlayerError as err:
+ self.log.error('Player error during shutdown: %s', err)
self.log.info('The way is shut, it was made by those who are dead. '
'And the dead keep it…')
self.log.info('bye...')
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 as PlayerError
def __init__(self, config):
super().__init__()
+ self.socket_timeout = 10
self.use_mbid = True
self.log = getLogger('sima')
self.config = config
* skipped current track skipped
"""
curr = self.current
- ret = self.idle('database', 'playlist', 'player', 'options')
- 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
+ else:
+ try: # noidle cmd does not go through __getattr__, need to catch OSError then
+ self.noidle()
+ except OSError as err:
+ raise PlayerError(err)
def clean(self):
"""Clean blocking event (idle) and pending commands