X-Git-Url: https://git.kaliko.me/?a=blobdiff_plain;f=sima%2Flaunch.py;h=4b77f89a29c5320212b1fe72e16f02701735eda7;hb=f1ed2e8232b4ecabbfe65aa6ab2d28567989e104;hp=0ff7da3aa38e220ad0fb54777559cb0681f434e5;hpb=fb2e50c81fb9588a1f7b8ac2b9e1d598c6f03d44;p=mpd-sima.git diff --git a/sima/launch.py b/sima/launch.py index 0ff7da3..4b77f89 100644 --- a/sima/launch.py +++ b/sima/launch.py @@ -26,6 +26,7 @@ import sys from importlib import __import__ as sima_import from os.path import isfile +from os import rename ## # third parties components @@ -38,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 @@ -85,18 +87,30 @@ 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 db_file = config.get('sima', 'db_file') if not isfile(db_file): logger.debug('Creating database in "%s"', db_file) - open(db_file, 'a').close() # TODO: to remove with new simadb in v0.18 + SimaDB(db_path=db_file).create_db() + # Migration from v0.17.0 + dbinfo = SimaDB(db_path=db_file).get_info() + if not dbinfo: # v0.17.0 → v0.18+ migration + logger.warning('Backing up database!') + rename(db_file, db_file + '-old-version-backup') + logger.info('Creating an new database in "%s"', db_file) SimaDB(db_path=db_file).create_db() 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) @@ -109,7 +123,6 @@ def start(sopt, restart=False): if cmd == "create-db": if not isfile(db_file): logger.info('Creating database in "%s"', db_file) - open(db_file, 'a').close() # TODO: to remove with new simadb in v0.18 SimaDB(db_path=db_file).create_db() else: logger.info('Database already there, not overwriting %s', db_file) @@ -135,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') @@ -175,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)