X-Git-Url: https://git.kaliko.me/?a=blobdiff_plain;f=sima%2Fcore.py;h=ce1b0782ef0e682e0c30a99dcbe2a6d3542877dc;hb=80162143f725cbe604f7241e4dfc4929833470e5;hp=3532c88e951e1f06e13c563debcc64909f5ed84f;hpb=5adf0b495521a6f15f208474a026c088476e5018;p=mpd-sima.git diff --git a/sima/core.py b/sima/core.py index 3532c88..ce1b078 100644 --- a/sima/core.py +++ b/sima/core.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2009, 2010, 2011, 2013, 2014 Jack Kaliko +# Copyright (c) 2009, 2010, 2011, 2013, 2014, 2015 Jack Kaliko # # This file is part of sima # @@ -43,7 +43,8 @@ class Sima(Daemon): self.sdb = SimaDB(db_path=conf.get('sima', 'db_file')) PlayerClient.database = self.sdb self.log = getLogger('sima') - self.plugins = list() + self._plugins = list() + self._core_plugins = list() self.player = self.__get_player() # Player client self.short_history = deque(maxlen=60) @@ -55,28 +56,50 @@ class Sima(Daemon): return PlayerClient(host, port, pswd) def add_history(self): - """Handle local short history""" + """Handle local, in memory, short history""" self.short_history.appendleft(self.player.current) def register_plugin(self, plugin_class): """Registers plugin in Sima instance...""" - self.plugins.append(plugin_class(self)) + plgn = plugin_class(self) + prio = int(plgn.priority) + self._plugins.append((prio, plgn)) + + def register_core_plugin(self, plugin_class): + """Registers core plugins""" + plgn = plugin_class(self) + prio = int(plgn.priority) + self._core_plugins.append((prio, plgn)) 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 + def core_plugins(self): + return [plugin[1] for plugin in + sorted(self._core_plugins, key=lambda pl: pl[0], reverse=True)] + + @property + def plugins(self): + 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""" 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 @@ -84,15 +107,12 @@ class Sima(Daemon): def queue(self): to_add = list() for plugin in self.plugins: - pl_callback = getattr(plugin, 'callback_need_track')() - if pl_callback: - to_add.extend(pl_callback) - if not to_add: - self.log.warning('Queue plugins returned nothing!') - for plugin in self.plugins: - pl_callback = getattr(plugin, 'callback_need_track_fb')() - if pl_callback: - to_add.extend(pl_callback) + self.log.info('running %s', plugin) + pl_candidates = getattr(plugin, 'callback_need_track')() + if pl_candidates: + to_add.extend(pl_candidates) + if to_add: + break for track in to_add: self.player.add(track) @@ -113,7 +133,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') @@ -145,21 +165,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 @@ -171,17 +191,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():