Add a PluginConfException

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

diff --git a/sima/launch.py b/sima/launch.py
index 1ae3c190bdd4d804aa13764c70710af1e8d2c596..538238bee3fdc525998e2cbdf5051f6295e269bd 100644 (file)
--- a/sima/launch.py
+++ b/sima/launch.py
@@ -34,11 +34,10 @@ 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
-from .utils.utils import exception_log, SigHup
+from .utils.utils import exception_log, SigHup, PluginConfException
 # core plugins
 from .plugins.core.history import History
 from .plugins.core.mpdoptions import MpdOptions
@@ -73,7 +72,11 @@ def load_plugins(sima, source):
             sys.exit(1)
         logger.info('Loading {0} plugin: {name} ({doc})'.format(
             source, **plugin_obj.info()))
-        sima.register_plugin(plugin_obj)
+        try:
+            sima.register_plugin(plugin_obj)
+        except PluginConfException as err:
+            logger.error(err)
+            sys.exit(2)
 
 
 def start(sopt, restart=False):
@@ -112,20 +115,15 @@ def start(sopt, restart=False):
         core_plugins = [History, MpdOptions]
         config['sima']['musicbrainzid'] = 'False'
     for cplgn in core_plugins:
-        logger.debug('Register core {name} ({doc})'.format(**cplgn.info()))
+        logger.debug('Register core %(name)s (%(doc)s)', cplgn.info())
         sima.register_core_plugin(cplgn)
-    logger.debug('core loaded, prioriy: {}'.format(' > '.join(map(str, sima.core_plugins))))
+    logger.debug('core loaded, prioriy: %s', ' > '.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
+    logger.info('plugins loaded, prioriy: %s', ' > '.join(map(str, sima.plugins)))
 
     # Run as a daemon
     if config.getboolean('daemon', 'daemon'):