X-Git-Url: http://git.kaliko.me/?a=blobdiff_plain;f=sima%2Fcore.py;h=694928fa77815ddd017aab71c4b2c9aadd2a4b78;hb=5c2b74bd18e344432a92ff20fefe68968843d61e;hp=87501e83b7d8bc60a616c252229f401d3bfc571e;hpb=f0550def23bc07bba4cfaa55d9e724f9fe7776a9;p=mpd-sima.git diff --git a/sima/core.py b/sima/core.py index 87501e8..694928f 100644 --- a/sima/core.py +++ b/sima/core.py @@ -2,11 +2,10 @@ """Core Object dealing with plugins and player client """ -__version__ = '0.12.0.b' +__version__ = '0.12.0pr1' __author__ = 'kaliko jack' __url__ = 'git://git.kaliko.me/sima.git' -import random import sys import time @@ -28,6 +27,7 @@ class Sima(Daemon): 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.player = self.__get_player() # Player client @@ -82,7 +82,6 @@ class Sima(Daemon): pl_callback = getattr(plugin, 'callback_need_track_fb')() if pl_callback: to_add.extend(pl_callback) - random.shuffle(to_add) for track in to_add: self.player.add(track) @@ -116,7 +115,6 @@ class Sima(Daemon): self.log.info('The way is shut, it was made by those who are dead. ' 'And the dead keep it…') self.log.info('bye...') - sys.exit(0) def run(self): """ @@ -133,6 +131,7 @@ class Sima(Daemon): except PlayerError as err: self.log.warning('Player error: %s' % err) self.reconnect_player() + del(self.changed) def loop(self): """Dispatching callbacks to plugins