Fixed previous commit, cannot apply shuffle on MetaContainer

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

diff --git a/sima/launch.py b/sima/launch.py
index e29fe289c1bd9df13f433496e2deaaae6f94af94..68ba4e006b6c6f299b469371e033546feaf3bf8b 100644 (file)
--- a/sima/launch.py
+++ b/sima/launch.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (c) 2013, 2014, 2015 Jack Kaliko <kaliko@azylum.org>
+# Copyright (c) 2013, 2014, 2015, 2020 kaliko <kaliko@azylum.org>
 #
 #  This file is part of sima
 #
@@ -34,12 +34,11 @@ 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
- # core plugins
+from .utils.utils import exception_log, SigHup, MPDSimaException
+# core plugins
 from .plugins.core.history import History
 from .plugins.core.mpdoptions import MpdOptions
 from .plugins.core.uniq import Uniq
@@ -68,7 +67,7 @@ def load_plugins(sima, source):
         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(
@@ -107,21 +106,20 @@ def start(sopt, restart=False):
 
     # required core plugins
     core_plugins = [History, MpdOptions, Uniq]
+    if config.getboolean('sima', 'mopidy_compat'):
+        logger.warning('Running with mopidy compat. mode!')
+        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'):
@@ -144,10 +142,14 @@ def run(sopt, restart=False):
     Catches Unhandled exception
     """
     # pylint: disable=broad-except
+    logger = logging.getLogger('sima')
     try:
         start(sopt, restart)
     except SigHup:  # SigHup inherit from Exception
         run(sopt, True)
+    except MPDSimaException as err:
+        logger.error(err)
+        sys.exit(2)
     except Exception:  # Unhandled exception
         exception_log()