expand_json utility... yet another convenience function :)

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

diff --git a/mediagoblin/gmg_commands/__init__.py b/mediagoblin/gmg_commands/__init__.py
index 04187ff2aeeb9170c5b767f719d5267cf7708eaf..55e85116c2f934b49a94f3f60062cdbc368452c2 100644 (file)
--- a/mediagoblin/gmg_commands/__init__.py
+++ b/mediagoblin/gmg_commands/__init__.py
@@ -1,5 +1,5 @@
 # GNU MediaGoblin -- federated, autonomous media hosting
-# Copyright (C) 2011 MediaGoblin contributors.  See AUTHORS.
+# Copyright (C) 2011, 2012 MediaGoblin contributors.  See AUTHORS.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
@@ -25,10 +25,6 @@ SUBCOMMAND_MAP = {
         'setup': 'mediagoblin.gmg_commands.shell:shell_parser_setup',
         'func': 'mediagoblin.gmg_commands.shell:shell',
         'help': 'Run a shell with some tools pre-setup'},
-    'migrate': {
-        'setup': 'mediagoblin.gmg_commands.migrate:migrate_parser_setup',
-        'func': 'mediagoblin.gmg_commands.migrate:migrate',
-        'help': 'Apply all unapplied bulk migrations to the database'},
     'adduser': {
         'setup': 'mediagoblin.gmg_commands.users:adduser_parser_setup',
         'func': 'mediagoblin.gmg_commands.users:adduser',
@@ -36,23 +32,50 @@ SUBCOMMAND_MAP = {
     'makeadmin': {
         'setup': 'mediagoblin.gmg_commands.users:makeadmin_parser_setup',
         'func': 'mediagoblin.gmg_commands.users:makeadmin',
-        'help': 'Changes a user\'s password'},
+        'help': 'Makes user an admin'},
     'changepw': {
         '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'},
+        'help': 'Changes a user\'s password'},
+    'dbupdate': {
+        'setup': 'mediagoblin.gmg_commands.dbupdate:dbupdate_parse_setup',
+        'func': 'mediagoblin.gmg_commands.dbupdate:dbupdate',
+        'help': 'Set up or update the SQL database'},
+    'assetlink': {
+        'setup': 'mediagoblin.gmg_commands.assetlink:assetlink_parser_setup',
+        'func': 'mediagoblin.gmg_commands.assetlink:assetlink',
+        'help': 'Link assets for themes and plugins for static serving'},
+    'reprocess': {
+        'setup': 'mediagoblin.gmg_commands.reprocess:reprocess_parser_setup',
+        'func': 'mediagoblin.gmg_commands.reprocess:reprocess',
+        'help': 'Reprocess media entries'},
+    'addmedia': {
+        'setup': 'mediagoblin.gmg_commands.addmedia:parser_setup',
+        'func': 'mediagoblin.gmg_commands.addmedia:addmedia',
+        'help': 'Reprocess media entries'},
+    'batchaddmedia': {
+        'setup': 'mediagoblin.gmg_commands.batchaddmedia:parser_setup',
+        'func': 'mediagoblin.gmg_commands.batchaddmedia:batchaddmedia',
+        'help': 'Add many media entries at once'}
+    # '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'},
     }
 
 
@@ -82,6 +105,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):