X-Git-Url: https://git.kaliko.me/?a=blobdiff_plain;f=sima%2Flaunch.py;h=9fb0b2d51f17d802d0fe26d0982bdc6c0ecab9d0;hb=fe1ed51724531b8c1e78e7d7eb590c9be20e275c;hp=733d237e2f12b3f0714c9c2ae2214aac6b977963;hpb=325e87e6aaf33974ea8bc8e4b3d2fdbbef56e9a9;p=mpd-sima.git

diff --git a/sima/launch.py b/sima/launch.py
index 733d237..9fb0b2d 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
 #
@@ -34,6 +34,7 @@ from os.path import isfile
 # local import
 from . import core, info
 from .lib.logger import set_logger
+from .lib.meta import Meta
 from .lib.simadb import SimaDB
 from .utils.config import ConfMan
 from .utils.startopt import StartOpt
@@ -41,6 +42,7 @@ from .utils.utils import exception_log, SigHup
  # core plugins
 from .plugins.core.history import History
 from .plugins.core.mpdoptions import MpdOptions
+from .plugins.core.uniq import Uniq
 ##
 
 
@@ -52,6 +54,7 @@ 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())
@@ -69,7 +72,7 @@ def load_plugins(sima, source):
             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)
 
 
@@ -78,11 +81,9 @@ def start(sopt, restart=False):
     """
     # 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')
+    logfile = config.get('log', 'logfile', fallback=None)
     verbosity = config.get('log', 'verbosity')
     set_logger(verbosity, logfile)
     logger = logging.getLogger('sima')
@@ -98,18 +99,31 @@ def start(sopt, restart=False):
             logger.info('Done, bye...')
             sys.exit(0)
 
+    if sopt.options.get('generate_config'):
+        config.write(sys.stdout, space_around_delimiters=True)
+        sys.exit(0)
+
     logger.info('Starting...')
     sima = core.Sima(config)
 
     # required core plugins
-    sima.register_plugin(History)
-    sima.register_plugin(MpdOptions)
+    core_plugins = [History, MpdOptions, Uniq]
+    for cplgn in core_plugins:
+        logger.debug('Register core {name} ({doc})'.format(**cplgn.info()))
+        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')
+        Meta.use_mbid = False
+
     # Run as a daemon
     if config.getboolean('daemon', 'daemon'):
         if restart: