Implement "single_album" filter

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

diff --git a/sima/core.py b/sima/core.py
index e3bde2c6abfec4b43d2034ff8d46f5dd2a75691d..d705a6257841455058e599df2d364a2a764e0cf8 100644 (file)
--- a/sima/core.py
+++ b/sima/core.py
@@ -2,7 +2,7 @@
 """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'
 
@@ -15,12 +15,15 @@ from logging import getLogger
 from .client import PlayerClient
 from .client import PlayerError, PlayerUnHandledError
 from .lib.simadb import SimaDB
+from .lib.daemon import Daemon
 
-class Sima(object):
+class Sima(Daemon):
     """Main class, plugin and player management
     """
 
     def __init__(self, conf):
+        ## 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'))
@@ -73,9 +76,8 @@ class Sima(object):
             if pl_callback:
                 to_add.extend(pl_callback)
         if not to_add:
-            self.log.warning('Queue plugins returned anything!')
+            self.log.warning('Queue plugins returned nothing!')
             for plugin in self.plugins:
-                self.log.info('calling fb for {}'.format(plugin))
                 pl_callback =  getattr(plugin, 'callback_need_track_fb')()
                 if pl_callback:
                     to_add.extend(pl_callback)
@@ -112,7 +114,6 @@ class Sima(object):
         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):
         """