X-Git-Url: https://git.kaliko.me/?a=blobdiff_plain;f=sima%2Flaunch.py;h=9cd36232abecaf1779d29e6b9236a4fa54be5293;hb=67d87e47012b5d3ceba56bdff06a0fa406f4840b;hp=21d2e552f8c3959c6c1daadc449793321b901011;hpb=1c01e4a7aa37eeef825c6918fc90b154a7f4ccc7;p=mpd-sima.git

diff --git a/sima/launch.py b/sima/launch.py
index 21d2e55..9cd3623 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, 2020,2021 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(
@@ -80,13 +79,47 @@ def start(sopt, restart=False):
     """starts application
     """
     # loads configuration
-    config = ConfMan(sopt.options).config
+    cfg_mgmt = ConfMan(sopt.options)
+    config = cfg_mgmt.config
     # set logger
     logger = logging.getLogger('sima')
     logfile = config.get('log', 'logfile', fallback=None)
     verbosity = config.get('log', 'verbosity')
     set_logger(verbosity, logfile)
     logger.debug('Command line say: %s', sopt.options)
+
+    if sopt.options.get('command'):
+        cmd = sopt.options.get('command')
+        if cmd == "generate-config":
+            config.write(sys.stdout, space_around_delimiters=True)
+            sys.exit(0)
+        logger.info('Running "%s" and exit' % cmd)
+        if cmd == "config-test":
+            logger.info('Config location: "%s"', cfg_mgmt.conf_file)
+            from .utils.configtest import config_test
+            config_test(config)
+            sys.exit(0)
+        if cmd == "create-db":
+            db_file = config.get('sima', 'db_file')
+            if 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...')
+            else:
+                logger.info('Database already there, not overwriting %s', db_file)
+            sys.exit(0)
+        if cmd == "purge-history":
+            db_file = config.get('sima', 'db_file')
+            if not isfile(db_file):
+                logger.warning('No db found: %s', db_file)
+                sys.exit(1)
+            SimaDB(db_path=db_file).purge_history(duration=0)
+            sys.exit(0)
+
+
+    # TODO: To remove eventually in next major realese v0.18
     # Create Database
     db_file = config.get('sima', 'db_file')
     if (sopt.options.get('create_db', None)
@@ -96,32 +129,32 @@ def start(sopt, restart=False):
         SimaDB(db_path=db_file).create_db()
         if sopt.options.get('create_db', None):
             logger.info('Done, bye...')
-            sys.exit(0)
+        sys.exit(0)
 
+    # TODO: To remove eventually in next major realese v0.18
     if sopt.options.get('generate_config'):
         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()))
+        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 +177,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()