X-Git-Url: https://git.kaliko.me/?a=blobdiff_plain;f=sima%2Flaunch.py;h=15fca4338e44ad615fe1364727bc7588713822b8;hb=75611a590e62f82a6f2651ac176ff619052eaa89;hp=1ff6c94c4b94a2d91a102fd06256d74075f39105;hpb=70bf86ca3f65a550436cdc70326cb8601f24e5a6;p=mpd-sima.git

diff --git a/sima/launch.py b/sima/launch.py
index 1ff6c94..15fca43 100644
--- a/sima/launch.py
+++ b/sima/launch.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (c) 2013, 2014 Jack Kaliko <kaliko@azylum.org>
+# Copyright (c) 2013, 2014, 2015 Jack Kaliko <kaliko@azylum.org>
 #
 #  This file is part of sima
 #
@@ -24,7 +24,7 @@
 import logging
 import sys
 
-from importlib import __import__
+from importlib import __import__ as sima_import
 from os.path import isfile
 ##
 
@@ -54,67 +54,70 @@ def load_plugins(sima, source):
     if not sima.config.get('sima', source):
         return
     logger = logging.getLogger('sima')
+    # TODO: Sanity check for "sima.config.get('sima', source)" ?
     for plugin in sima.config.get('sima', source).split(','):
         plugin = plugin.strip(' \n')
         module = 'sima.plugins.{0}.{1}'.format(source, plugin.lower())
         try:
-            mod_obj = __import__(module, fromlist=[plugin])
+            mod_obj = sima_import(module, fromlist=[plugin])
         except ImportError as err:
-            logger.error('Failed to load plugin\'s module: ' +
+            logger.error('Failed to load "{}" plugin\'s module: '.format(plugin) +
                          '{0} ({1})'.format(module, err))
             sima.shutdown()
             sys.exit(1)
         try:
             plugin_obj = getattr(mod_obj, plugin)
         except AttributeError as err:
-            logger.error('Failed to load plugin {0} ({1})'.format(plugin, err))
+            logger.error('Failed to load plugin %s (%s)', plugin, err)
             sima.shutdown()
             sys.exit(1)
         logger.info('Loading {0} plugin: {name} ({doc})'.format(
-                             source, **plugin_obj.info()))
+            source, **plugin_obj.info()))
         sima.register_plugin(plugin_obj)
 
 
 def start(sopt, restart=False):
     """starts application
     """
-    # set logger
-    verbosity = sopt.options.get('verbosity', 'warning')
-    logfile = sopt.options.get('logfile', None)
-    set_logger(verbosity, logfile)
     # loads configuration
     config = ConfMan(sopt.options).config
-    logfile = config.get('log', 'logfile')
+    # set logger
+    logger = logging.getLogger('sima')
+    logfile = config.get('log', 'logfile', fallback=None)
     verbosity = config.get('log', 'verbosity')
     set_logger(verbosity, logfile)
-    logger = logging.getLogger('sima')
-    logger.debug('Command line say: {0}'.format(sopt.options))
+    logger.debug('Command line say: %s', sopt.options)
     # Create Database
     db_file = config.get('sima', 'db_file')
     if (sopt.options.get('create_db', None)
-       or not isfile(db_file)):
-        logger.info('Creating database in "{}"'.format(db_file))
+            or not isfile(db_file)):
+        logger.info('Creating database in "%s"', 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...')
+    if sopt.options.get('generate_config'):
+        config.write(sys.stdout, space_around_delimiters=True)
+        sys.exit(0)
+
+    logger.info('Starting (%s)...', info.__version__)
     sima = core.Sima(config)
 
     # required core plugins
     core_plugins = [History, MpdOptions, Uniq]
     for cplgn in core_plugins:
         logger.debug('Register core {name} ({doc})'.format(**cplgn.info()))
-        sima.register_plugin(cplgn)
+        sima.register_core_plugin(cplgn)
+    logger.debug('core loaded, prioriy: {}'.format(' > '.join(map(str, sima.core_plugins))))
 
     #  Loading internal plugins
     load_plugins(sima, 'internal')
 
     #  Loading contrib plugins
     load_plugins(sima, 'contrib')
-
+    logger.info('plugins loaded, prioriy: {}'.format(' > '.join(map(str, sima.plugins))))
     #  Set use of MusicBrainzIdentifier
     if not config.getboolean('sima', 'musicbrainzid'):
         logger.info('Disabling MusicBrainzIdentifier')
@@ -152,7 +155,7 @@ def run(sopt, restart=False):
 def main():
     """Entry point"""
     nfo = dict({'version': info.__version__,
-                 'prog': 'sima'})
+                'prog': 'sima'})
     # StartOpt gathers options from command line call (in StartOpt().options)
     sopt = StartOpt(nfo)
     run(sopt)