X-Git-Url: https://git.kaliko.me/?a=blobdiff_plain;f=sima%2Fcore.py;h=badc7b20240701412d86ddeb92d1eb1eeebac6b3;hb=ee72bcb36793822f1bd01eba010a28daced75cc3;hp=27735bdd9b285e1b2de75012cdc6ec58eee37f91;hpb=5aa6ec2f4b449797fbe8269c0d8d7da66bd2c9bc;p=mpd-sima.git

diff --git a/sima/core.py b/sima/core.py
index 27735bd..badc7b2 100644
--- a/sima/core.py
+++ b/sima/core.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (c) 2009-2015, 2020 kaliko <kaliko@azylum.org>
+# Copyright (c) 2009-2015, 2020, 2021 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
@@ -37,17 +37,18 @@ class Sima(Daemon):
     """
 
     def __init__(self, conf):
-        ## Set daemon
+        # Set daemon
         Daemon.__init__(self, conf.get('daemon', 'pidfile'))
         self.enabled = True
         self.config = conf
         self.sdb = SimaDB(db_path=conf.get('sima', 'db_file'))
         PlayerClient.database = self.sdb
         self.log = getLogger('sima')
-        self._plugins = list()
-        self._core_plugins = list()
-        self.player = PlayerClient(self)  # Player client
+        self._plugins = []
+        self._core_plugins = []
+        self.player = PlayerClient(conf)  # MPD client
         self.short_history = deque(maxlen=60)
+        self.changed = None
 
     def add_history(self):
         """Handle local, in memory, short history"""
@@ -80,7 +81,8 @@ class Sima(Daemon):
 
     @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"""
@@ -90,7 +92,8 @@ class Sima(Daemon):
         queue_trigger = self.config.getint('sima', 'queue_length')
         if self.player.playmode.get('random'):
             queue = self.player.playlist
-            self.log.debug('Currently %s track(s) in the playlist. (target %s)', len(queue), queue_trigger)
+            self.log.debug('Currently %s track(s) in the playlist. (target %s)',
+                           len(queue), queue_trigger)
         else:
             queue = self.player.queue
             self.log.debug('Currently %s track(s) ahead. (target %s)', len(queue), queue_trigger)
@@ -99,9 +102,9 @@ class Sima(Daemon):
         return False
 
     def queue(self):
-        to_add = list()
+        to_add = []
         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)
@@ -115,6 +118,8 @@ class Sima(Daemon):
         cycle : 5s 10s 1m 5m 20m 1h
         """
         sleepfor = [5, 10, 60, 300, 1200, 3600]
+        # reset change
+        self.changed = None
         while True:
             tmp = sleepfor.pop(0)
             sleepfor.append(tmp)
@@ -125,9 +130,6 @@ class Sima(Daemon):
             except PlayerError as err:
                 self.log.debug(err)
                 continue
-            except MPDError as err:
-                #TODO: unhandled Player exceptions
-                self.log.warning('Unhandled player exception: %s', err)
             self.log.info('Got reconnected')
             break
         self.foreach_plugin('start')
@@ -145,41 +147,40 @@ class Sima(Daemon):
         """
         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...')
 
     def run(self):
-        """
-        """
         try:
             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
 
     def loop(self):
         """Dispatching callbacks to plugins
         """
         # 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
+        if self.changed is None:  # first iteration goes through else
             self.changed = ['playlist', 'player', 'skipped']
-        self.log.debug('changed: %s', ', '.join(self.changed))
+        else:  # Wait for a change
+            self.changed = self.player.monitor()
+            self.log.debug('changed: %s', ', '.join(self.changed))
         if 'playlist' in self.changed:
             self.foreach_plugin('callback_playlist')
         if 'player' in self.changed or 'options' in self.changed: