Cleanup Exceptions

[mpd-sima.git] / sima / core.py

diff --git a/sima/core.py b/sima/core.py
index 62d123ae9e1afa626a144568b57319501e87e048..7f3631cfb610c03346218c032da5d95e9ce143ad 100644 (file)
--- a/sima/core.py
+++ b/sima/core.py
@@ -1,5 +1,5 @@
 # -*- 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
 #
@@ -26,7 +26,7 @@ from collections import deque
 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
@@ -46,7 +46,7 @@ class Sima(Daemon):
         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):
@@ -101,7 +101,7 @@ class Sima(Daemon):
     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)
@@ -118,14 +118,14 @@ class Sima(Daemon):
         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:
+            except PlayerError as err:
                 #TODO: unhandled Player exceptions
                 self.log.warning('Unhandled player exception: %s', err)
             self.log.info('Got reconnected')
@@ -160,13 +160,13 @@ class Sima(Daemon):
             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