Merge remote-tracking branch 'elrond/for-schendje'

[mediagoblin.git] / mediagoblin / gmg_commands / __init__.py

diff --git a/mediagoblin/gmg_commands/__init__.py b/mediagoblin/gmg_commands/__init__.py
index 054e2616f79519439763837637490da9db16a45d..e965dd5730a5c7ace3e7d4b62098be16455bb5d9 100644 (file)
--- a/mediagoblin/gmg_commands/__init__.py
+++ b/mediagoblin/gmg_commands/__init__.py
@@ -28,7 +28,8 @@ SUBCOMMAND_MAP = {
     'migrate': {
         'setup': 'mediagoblin.gmg_commands.migrate:migrate_parser_setup',
         'func': 'mediagoblin.gmg_commands.migrate:migrate',
-        'help': 'Apply all unapplied bulk migrations to the database'},
+        'help': ('Migrate your Mongo database. '
+                 '[DEPRECATED!] use convert_mongo_to_sql and dbupdate.')},
     'adduser': {
         'setup': 'mediagoblin.gmg_commands.users:adduser_parser_setup',
         'func': 'mediagoblin.gmg_commands.users:adduser',
@@ -41,18 +42,6 @@ SUBCOMMAND_MAP = {
         'setup': 'mediagoblin.gmg_commands.users:changepw_parser_setup',
         'func': 'mediagoblin.gmg_commands.users:changepw',
         'help': 'Makes admin an user'},
-    'wipealldata': {
-        'setup': 'mediagoblin.gmg_commands.wipealldata:wipe_parser_setup',
-        'func': 'mediagoblin.gmg_commands.wipealldata:wipe',
-        'help': 'Wipes **all** the data for this MediaGoblin instance'},
-    'env_export': {
-        'setup': 'mediagoblin.gmg_commands.import_export:import_export_parse_setup',
-        'func': 'mediagoblin.gmg_commands.import_export:env_export',
-        'help': 'Exports the data for this MediaGoblin instance'},
-    'env_import': {
-        'setup': 'mediagoblin.gmg_commands.import_export:import_export_parse_setup',
-        'func': 'mediagoblin.gmg_commands.import_export:env_import',
-        'help': 'Exports the data for this MediaGoblin instance'},
     'dbupdate': {
         'setup': 'mediagoblin.gmg_commands.dbupdate:dbupdate_parse_setup',
         'func': 'mediagoblin.gmg_commands.dbupdate:dbupdate',
@@ -61,6 +50,25 @@ SUBCOMMAND_MAP = {
         'setup': 'mediagoblin.gmg_commands.mongosql:mongosql_parser_setup',
         'func': 'mediagoblin.gmg_commands.mongosql:mongosql',
         'help': 'Convert Mongo DB data to SQL DB data'},
+    'theme': {
+        'setup': 'mediagoblin.gmg_commands.theme:theme_parser_setup',
+        'func': 'mediagoblin.gmg_commands.theme:theme',
+        'help': 'Theming commands',
+        }
+
+    ## These might be useful, mayyyybe, but don't really work anymore
+    ## due to mongo change and the "versatility" of sql options.
+    ##
+    ## For now, commenting out.  Might re-enable soonish?
+    #
+    # 'env_export': {
+    #     'setup': 'mediagoblin.gmg_commands.import_export:import_export_parse_setup',
+    #     'func': 'mediagoblin.gmg_commands.import_export:env_export',
+    #     'help': 'Exports the data for this MediaGoblin instance'},
+    # 'env_import': {
+    #     'setup': 'mediagoblin.gmg_commands.import_export:import_export_parse_setup',
+    #     'func': 'mediagoblin.gmg_commands.import_export:env_import',
+    #     'help': 'Imports the data for this MediaGoblin instance'},
     }
 
 
@@ -90,6 +98,7 @@ def main_cli():
         subparser.set_defaults(func=exec_func)
 
     args = parser.parse_args()
+    args.orig_conf_file = args.conf_file
     if args.conf_file is None:
         if os.path.exists('mediagoblin_local.ini') \
                 and os.access('mediagoblin_local.ini', os.R_OK):