X-Git-Url: https://git.kaliko.me/?a=blobdiff_plain;f=sima%2Flaunch.py;h=c472567b08ead7b91477a8185bf844515449a426;hb=54849baefbe39c4c0a09bd8ad27bde7743dac5ef;hp=2f3149187f0b93f68cc15da198fe78acbe79494a;hpb=113157e3ae7b1fd57654542030c3de9c03c4261a;p=mpd-sima.git

diff --git a/sima/launch.py b/sima/launch.py
index 2f31491..c472567 100644
--- 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 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
 ##
 
@@ -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
+# core plugins
 from .plugins.core.history import History
 from .plugins.core.mpdoptions import MpdOptions
 from .plugins.core.uniq import Uniq
@@ -59,7 +58,7 @@ def load_plugins(sima, source):
         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: '.format(plugin) +
                          '{0} ({1})'.format(module, err))
@@ -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(
@@ -86,12 +85,12 @@ def start(sopt, restart=False):
     logfile = config.get('log', 'logfile', fallback=None)
     verbosity = config.get('log', 'verbosity')
     set_logger(verbosity, logfile)
-    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):
@@ -102,11 +101,15 @@ def start(sopt, restart=False):
         config.write(sys.stdout, space_around_delimiters=True)
         sys.exit(0)
 
-    logger.info('Starting...')
+    logger.info('Starting (%s)...', info.__version__)
     sima = core.Sima(config)
 
     # 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()))
         sima.register_core_plugin(cplgn)
@@ -117,11 +120,7 @@ def start(sopt, restart=False):
 
     #  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'):
@@ -155,7 +154,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)