# -*- coding: utf-8 -*-
-# Copyright (c) 2009, 2010, 2011, 2013, 2014, 2015 Jack Kaliko <kaliko@azylum.org>
+# Copyright (c) 2009-2015, 2020 kaliko <kaliko@azylum.org>
#
# This file is part of sima
#
from logging import getLogger
from .mpdclient import MPD as PlayerClient
-from .mpdclient import PlayerError, MPDError
+from .mpdclient import PlayerError
from .lib.simadb import SimaDB
from .lib.daemon import Daemon
from .utils.utils import SigHup
"""
def __init__(self, conf):
- ## Set daemon
+ # Set daemon
Daemon.__init__(self, conf.get('daemon', 'pidfile'))
self.enabled = True
self.config = conf
self.log = getLogger('sima')
self._plugins = list()
self._core_plugins = list()
- self.player = PlayerClient(self) # Player client
+ self.player = PlayerClient(conf) # MPD client
self.short_history = deque(maxlen=60)
def add_history(self):
@property
def plugins(self):
- return [plugin[1] for plugin in sorted(self._plugins, key=lambda pl: pl[0], reverse=True)]
+ return [plugin[1] for plugin in
+ sorted(self._plugins, key=lambda pl: pl[0], reverse=True)]
def need_tracks(self):
"""Is the player in need for tracks"""
def queue(self):
to_add = list()
for plugin in self.plugins:
- self.log.info('callback_need_track: %s', plugin)
+ self.log.debug('callback_need_track: %s', plugin)
pl_candidates = getattr(plugin, 'callback_need_track')()
if pl_candidates:
to_add.extend(pl_candidates)
while True:
tmp = sleepfor.pop(0)
sleepfor.append(tmp)
- self.log.info('Trying to reconnect in {:>4d} seconds'.format(tmp))
+ self.log.info('Trying to reconnect in %4d seconds', tmp)
time.sleep(tmp)
try:
self.player.connect()
except PlayerError as err:
self.log.debug(err)
continue
- except MPDError as err:
- #TODO: unhandled Player exceptions
+ except PlayerError as err:
+ # TODO: unhandled Player exceptions
self.log.warning('Unhandled player exception: %s', err)
self.log.info('Got reconnected')
break
"""
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...')
self.log.info('Connecting MPD: %(host)s:%(port)s', self.config['MPD'])
self.player.connect()
self.foreach_plugin('start')
- except (PlayerError, MPDError) as err:
+ except PlayerError as err:
self.log.warning('Player: %s', err)
self.reconnect_player()
while 42:
try:
self.loop()
- except (PlayerError, MPDError) as err:
+ except PlayerError as err:
self.log.warning('Player error: %s', err)
self.reconnect_player()
del self.changed
"""Dispatching callbacks to plugins
"""
# hanging here until a monitored event is raised in the player
- if getattr(self, 'changed', False): # first iteration exception
+ if getattr(self, 'changed', False): # first iteration exception
self.changed = self.player.monitor()
else: # first iteration goes through else
self.changed = ['playlist', 'player', 'skipped']