X-Git-Url: https://git.kaliko.me/?a=blobdiff_plain;f=sima%2Fcore.py;h=ceaa09244ce480338309ca3a0bdfd70368ef4754;hb=cf5fee72c57cf6b6f09b9caa78ab9e547f1d7542;hp=ad21db6f16da571b46d7f8b7ac68253c04421f7c;hpb=e09e76d41b2f041de935e9e884009e3187005ab9;p=mpd-sima.git diff --git a/sima/core.py b/sima/core.py index ad21db6..ceaa092 100644 --- 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')