Add sensitive randomfallback mode

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

diff --git a/sima/core.py b/sima/core.py
index ad21db6f16da571b46d7f8b7ac68253c04421f7c..08135c0da6e26ae0ecf85895db8b24914548f497 100644 (file)
--- a/sima/core.py
+++ b/sima/core.py
@@ -15,18 +15,21 @@ 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, dbfile):
+    def __init__(self, conf):
+        ## Set daemon
+        Daemon.__init__(self, conf.get('daemon', 'pidfile'))
         self.enabled = True
         self.config = conf
-        self.sdb = SimaDB(db_path=dbfile)
+        self.sdb = SimaDB(db_path=conf.get('sima', 'db_file'))
         self.log = getLogger('sima')
         self.plugins = list()
-        self.player = self._get_player()  # Player client
+        self.player = self.__get_player()  # Player client
         try:
             self.player.connect()
         except (PlayerError, PlayerUnHandledError) as err:
@@ -34,7 +37,7 @@ class Sima(object):
             self.shutdown()
         self.short_history = deque(maxlen=60)
 
-    def _get_player(self):
+    def __get_player(self):
         """Instanciate the player"""
         host = self.config.get('MPD', 'host')
         port = self.config.get('MPD', 'port')
@@ -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)