Removed obsolete CLI options

diff --git a/doc/Changelog b/doc/Changelog
index d2e9877c1206878306f50e182e3560df10282ec4..d4b9f281cdc4eff989547d1fedf5dc9ea93ba4db 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,6 +1,6 @@
 MPD_sima v0.18.0.dev0
 
 MPD_sima v0.18.0.dev0
 

- * …
+ * Removed obsolete --create-db and --generate-config options

 
  -- kaliko <kaliko@azylum.org>  Wed, 28 Apr 2021 17:21:39 +0200
 
 
  -- kaliko <kaliko@azylum.org>  Wed, 28 Apr 2021 17:21:39 +0200
 

diff --git a/sima/launch.py b/sima/launch.py
index 9cd36232abecaf1779d29e6b9236a4fa54be5293..9689afdbb166032daac9201d3344815f271cea72 100644 (file)
--- a/sima/launch.py
+++ b/sima/launch.py
@@ -118,24 +118,6 @@ def start(sopt, restart=False):
             SimaDB(db_path=db_file).purge_history(duration=0)
             sys.exit(0)
 
             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)
-            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):
-            logger.info('Done, bye...')
-        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 (%s)...', info.__version__)
     sima = core.Sima(config)
 
     logger.info('Starting (%s)...', info.__version__)
     sima = core.Sima(config)
 

diff --git a/sima/utils/startopt.py b/sima/utils/startopt.py
index 6208d6820d6581960a71be0a6c15afbc2ee78730..80ccb9742e737a9e9a12bcab167b03e71e4a28ca 100644 (file)
--- a/sima/utils/startopt.py
+++ b/sima/utils/startopt.py
@@ -94,21 +94,11 @@ OPTS = [
         'action': Rfile,
         'metavar': 'CONFIG',
         'help': 'configuration file to load'},
         'action': Rfile,
         'metavar': 'CONFIG',
         'help': 'configuration file to load'},

-    {  # TODO: To remove eventually in next major realese v0.18
-        'sw': ['--generate-config'],
-        'dest': 'generate_config',
-        'action': 'store_true',
-        'help': SUPPRESS},

     {
         'sw': ['--var-dir', '--var_dir'],
         'dest': 'var_dir',
         'action': Wdir,
         'help': 'directory to store var content (ie. database, cache)'},
     {
         'sw': ['--var-dir', '--var_dir'],
         'dest': 'var_dir',
         'action': Wdir,
         'help': 'directory to store var content (ie. database, cache)'},

-    {  # TODO: To remove eventually in next major realese v0.18
-        'sw': ['--create-db'],
-        'action': 'store_true',
-        'dest': 'create_db',
-        'help': SUPPRESS},

     {
         'sw': ['command'],
         'nargs': '?',
     {
         'sw': ['command'],
         'nargs': '?',