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
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):
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)
except PlayerError as err:
self.log.debug(err)
continue
- except MPDError as err:
+ except PlayerError as err:
#TODO: unhandled Player exceptions
self.log.warning('Unhandled player exception: %s', err)
self.log.info('Got reconnected')
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