# -*- 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 collections import deque
from logging import getLogger
-from .client import PlayerClient
-from .client import PlayerError, PlayerUnHandledError
+from .mpdclient import MPD as PlayerClient
+from .mpdclient import PlayerError, MPDError
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 = self.__get_player() # Player client
+ self.player = PlayerClient(self) # Player client
self.short_history = deque(maxlen=60)
- def __get_player(self):
- """Instanciate the player"""
- host = self.config.get('MPD', 'host')
- port = self.config.get('MPD', 'port')
- pswd = self.config.get('MPD', 'password', fallback=None)
- return PlayerClient(host, port, pswd)
-
def add_history(self):
"""Handle local, in memory, short history"""
self.short_history.appendleft(self.player.current)
def queue(self):
to_add = list()
for plugin in self.plugins:
- self.log.info('running %s', plugin)
+ self.log.info('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 PlayerUnHandledError as err:
+ except MPDError as err:
#TODO: unhandled Player exceptions
self.log.warning('Unhandled player exception: %s', err)
self.log.info('Got reconnected')
"""
"""
try:
- self.log.info('Connecting MPD: {0}:{1}'.format(*self.player._mpd))
+ self.log.info('Connecting MPD: %(host)s:%(port)s', self.config['MPD'])
self.player.connect()
self.foreach_plugin('start')
- except (PlayerError, PlayerUnHandledError) as err:
+ except (PlayerError, MPDError) as err:
self.log.warning('Player: %s', err)
self.reconnect_player()
while 42:
try:
self.loop()
- except PlayerUnHandledError as err:
- #TODO: unhandled Player exceptions
- self.log.warning('Unhandled player exception: %s', err)
- del self.player
- self.player = PlayerClient()
- time.sleep(10)
- except PlayerError as err:
+ except (PlayerError, MPDError) as err:
self.log.warning('Player error: %s', err)
self.reconnect_player()
del self.changed
def loop(self):
"""Dispatching callbacks to plugins
"""
- # hanging here untill a monitored event is raised in the player
+ # hanging here until a monitored event is raised in the player
if getattr(self, 'changed', False): # first iteration exception
self.changed = self.player.monitor()
else: # first iteration goes through else