Mainly use literal for list/dict and f-strings when possible

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

diff --git a/sima/launch.py b/sima/launch.py
index 890f96bfd1641db6c1b6a3b1e357ffe7ea4c8571..784d23784d480fd3323a210aa44ca93974b99641 100644 (file)
--- a/sima/launch.py
+++ b/sima/launch.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (c) 2013, 2014, 2015, 2020,2021 kaliko <kaliko@azylum.org>
+# Copyright (c) 2013, 2014, 2015, 2020, 2021 kaliko <kaliko@azylum.org>
 #
 #  This file is part of sima
 #
@@ -39,6 +39,7 @@ from .lib.simadb import SimaDB
 from .utils.config import ConfMan
 from .utils.startopt import StartOpt
 from .utils.utils import exception_log, SigHup, MPDSimaException
+from .utils.blcli import BLCli
 # core plugins
 from .plugins.core.history import History
 from .plugins.core.mpdoptions import MpdOptions
@@ -50,19 +51,19 @@ def load_plugins(sima, source):
     """Handles internal/external plugins
         sima:   sima.core.Sima instance
         source: ['internal', 'contrib']
-    """
+    """# pylint: disable=logging-not-lazy,logging-format-interpolation
     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())
+        module = f'sima.plugins.{source}.{plugin.lower()}'
         try:
             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))
+            logger.error(f'Failed to load "{plugin}" plugin\'s module: ' +
+                         f'{module} ({err})')
             sima.shutdown()
             sys.exit(1)
         try:
@@ -86,7 +87,10 @@ def start(sopt, restart=False):
     logger = logging.getLogger('sima')
     logfile = config.get('log', 'logfile', fallback=None)
     verbosity = config.get('log', 'verbosity')
-    set_logger(verbosity, logfile)
+    if sopt.options.get('command'):  # disable file logging
+        set_logger(verbosity)
+    else:
+        set_logger(verbosity, logfile)
     logger.debug('Command line say: %s', sopt.options)
 
     # Create database if not present
@@ -104,10 +108,13 @@ def start(sopt, restart=False):
 
     if sopt.options.get('command'):
         cmd = sopt.options.get('command')
+        if cmd.startswith('bl-'):
+            BLCli(config, sopt.options)
+            sys.exit(0)
         if cmd == "generate-config":
             config.write(sys.stdout, space_around_delimiters=True)
             sys.exit(0)
-        logger.info('Running "%s" and exit' % cmd)
+        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
@@ -141,7 +148,8 @@ def start(sopt, restart=False):
     for cplgn in core_plugins:
         logger.debug('Register core %(name)s (%(doc)s)', cplgn.info())
         sima.register_core_plugin(cplgn)
-    logger.debug('core loaded, prioriy: %s', ' > '.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')
@@ -181,11 +189,12 @@ def run(sopt, restart=False):
     except Exception:  # Unhandled exception
         exception_log()
 
+
 # Script starts here
 def main():
     """Entry point"""
     nfo = dict({'version': info.__version__,
-                'prog': 'sima'})
+                'prog': 'mpd-sima'})
     # StartOpt gathers options from command line call (in StartOpt().options)
     sopt = StartOpt(nfo)
     run(sopt)