X-Git-Url: https://git.kaliko.me/?a=blobdiff_plain;f=sima%2Fcore.py;h=5ec0492f5b9c0f9dd9443e93cca49655a335d462;hb=dc148034c495f0fb68ed0549d50ecb212e4c1783;hp=264d97e144e108f45a3794c955c70f232a3156da;hpb=23309f235879380a5ef7db3a51bda4d12e31902e;p=mpd-sima.git

diff --git a/sima/core.py b/sima/core.py
index 264d97e..5ec0492 100644
--- a/sima/core.py
+++ b/sima/core.py
@@ -31,6 +31,7 @@ from .lib.simadb import SimaDB
 from .lib.daemon import Daemon
 from .utils.utils import SigHup
 
+
 class Sima(Daemon):
     """Main class, plugin and player management
     """
@@ -73,10 +74,10 @@ class Sima(Daemon):
 
     def foreach_plugin(self, method, *args, **kwds):
         """Plugin's callbacks dispatcher"""
+        self.log.trace('dispatching %s to plugins', method)  # pylint: disable=no-member
         for plugin in self.core_plugins:
             getattr(plugin, method)(*args, **kwds)
         for plugin in self.plugins:
-            #self.log.debug('dispatching {0} to {1}'.format(method, plugin))
             getattr(plugin, method)(*args, **kwds)
 
     @property
@@ -93,10 +94,13 @@ class Sima(Daemon):
         if not self.enabled:
             self.log.debug('Queueing disabled!')
             return False
-        queue = self.player.queue
         queue_trigger = self.config.getint('sima', 'queue_length')
-        self.log.debug('Currently {0} track(s) ahead. (target {1})'.format(
-                       len(queue), queue_trigger))
+        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)
+        else:
+            queue = self.player.queue
+            self.log.debug('Currently %s track(s) ahead. (target %s)', len(queue), queue_trigger)
         if len(queue) < queue_trigger:
             return True
         return False
@@ -104,7 +108,7 @@ class Sima(Daemon):
     def queue(self):
         to_add = list()
         for plugin in self.plugins:
-            self.log.info('running {}'.format(plugin))
+            self.log.info('running %s', plugin)
             pl_candidates = getattr(plugin, 'callback_need_track')()
             if pl_candidates:
                 to_add.extend(pl_candidates)
@@ -130,7 +134,7 @@ class Sima(Daemon):
                 continue
             except PlayerUnHandledError as err:
                 #TODO: unhandled Player exceptions
-                self.log.warning('Unhandled player exception: %s' % err)
+                self.log.warning('Unhandled player exception: %s', err)
             self.log.info('Got reconnected')
             break
         self.foreach_plugin('start')
@@ -162,21 +166,21 @@ class Sima(Daemon):
         try:
             self.log.info('Connecting MPD: {0}:{1}'.format(*self.player._mpd))
             self.player.connect()
+            self.foreach_plugin('start')
         except (PlayerError, PlayerUnHandledError) as err:
-            self.log.warning('Player: {}'.format(err))
+            self.log.warning('Player: %s', err)
             self.reconnect_player()
-        self.foreach_plugin('start')
         while 42:
             try:
                 self.loop()
             except PlayerUnHandledError as err:
                 #TODO: unhandled Player exceptions
-                self.log.warning('Unhandled player exception: {}'.format(err))
+                self.log.warning('Unhandled player exception: %s', err)
                 del self.player
                 self.player = PlayerClient()
                 time.sleep(10)
             except PlayerError as err:
-                self.log.warning('Player error: %s' % err)
+                self.log.warning('Player error: %s', err)
                 self.reconnect_player()
                 del self.changed
 
@@ -188,17 +192,16 @@ class Sima(Daemon):
             self.changed = self.player.monitor()
         else:  # first iteration goes through else
             self.changed = ['playlist', 'player', 'skipped']
-        self.log.debug('changed: {}'.format(', '.join(self.changed)))
+        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):
+        if 'player' in self.changed or 'options' in self.changed:
             self.foreach_plugin('callback_player')
         if 'database' in self.changed:
             self.foreach_plugin('callback_player_database')
         if 'skipped' in self.changed:
             if self.player.state == 'play':
-                self.log.info('Playing: {}'.format(self.player.current))
+                self.log.info('Playing: %s', self.player.current)
                 self.add_history()
                 self.foreach_plugin('callback_next_song')
         if self.need_tracks():