Simplified configuration manager (db_file's no longer a special case)

[mpd-sima.git] / launch

diff --git a/launch b/launch
index 192ec399a486bf492263087bee3a25cc10589edb..f03ca5b120fcc753dc6035914bef19f8aa0ccd22 100755 (executable)
--- a/launch
+++ b/launch
@@ -8,7 +8,7 @@ import logging
 import sys
 
 from importlib import __import__
-from os.path import isfile, basename
+from os.path import isfile
 ##
 
 # third parties components
@@ -16,17 +16,22 @@ from os.path import isfile, basename
 
 # local import
 from sima import core
-from sima.plugins.crop import Crop
-from sima.plugins.addhist import History
 from sima.lib.logger import set_logger
 from sima.lib.simadb import SimaDB
 from sima.utils.config import ConfMan
 from sima.utils.startopt import StartOpt
 from sima.utils.utils import exception_log
 ##
+# internal plugins
+from sima.plugins.crop import Crop
+from sima.plugins.addhist import History
+from sima.plugins.lastfm import Lastfm
+from sima.plugins.mpd import MpdOptions
+from sima.plugins.randomfallback import RandomFallBack
 
 # official plugins to start
-PLUGINS = (Crop, History)
+PLUGINS = (Crop, History, MpdOptions,
+           Lastfm, RandomFallBack)
 
 
 def load_contrib_plugins(sima):
@@ -52,6 +57,12 @@ def load_contrib_plugins(sima):
         sima.register_plugin(plugin_obj)
 
 
+def load_internal_plugins(sima):
+    """Handles contrib/external plugins
+    """
+    raise NotImplementedError
+
+
 def main():
     """Entry point, deal w/ CLI and starts application
     """
@@ -65,25 +76,24 @@ def main():
     logger = logging.getLogger('sima')
     logger.setLevel(cli_loglevel)
     # loads configuration
-    conf_manager = ConfMan(logger, sopt.options)
-    config = conf_manager.config
+    config = ConfMan(logger, sopt.options).config
     logger.setLevel(getattr(logging,
                     config.get('log', 'verbosity').upper()))  # pylint: disable=E1103
 
     logger.debug('Command line say: {0}'.format(sopt.options))
-
     # Create Database
+    db_file = config.get('sima', 'db_file')
     if (sopt.options.get('create_db', None)
-       or not isfile(conf_manager.db_file)):
-        logger.info('Creating database in "{}"'.format(conf_manager.db_file))
-        open(conf_manager.db_file, 'a').close()
-        SimaDB(db_path=conf_manager.db_file).create_db()
+       or not isfile(db_file)):
+        logger.info('Creating database in "{}"'.format(db_file))
+        open(db_file, 'a').close()
+        SimaDB(db_path=db_file).create_db()
         if sopt.options.get('create_db', None):
             logger.info('Done, bye...')
             sys.exit(0)
 
     logger.info('Starting...')
-    sima = core.Sima(config, conf_manager.db_file)
+    sima = core.Sima(config)
 
     #  Loading internal plugins
     for plugin in PLUGINS: