Refactor gmg's cf option into a function
Many (all?) gmg subcommands take a -cf option to change the used config file. This options used to be created in each subcommand's parse_setup. Add a helper function and use it around.
This commit is contained in:
parent
eb5bb3fc99
commit
9043e7a012
@ -19,6 +19,7 @@ from mediagoblin.db.open import setup_connection_and_db_from_config
|
||||
from mediagoblin.init.config import read_mediagoblin_config
|
||||
from mediagoblin.storage.filestorage import BasicFileStorage
|
||||
from mediagoblin.init import setup_storage, setup_global_and_app_config
|
||||
from mediagoblin.gmg_commands.util import option_add_conffile
|
||||
|
||||
import shutil
|
||||
import tarfile
|
||||
@ -39,9 +40,7 @@ def import_export_parse_setup(subparser):
|
||||
# TODO: Add default
|
||||
subparser.add_argument(
|
||||
'tar_file')
|
||||
subparser.add_argument(
|
||||
'-cf', '--conf_file', default='mediagoblin.ini',
|
||||
help='Config file used to set up environment')
|
||||
option_add_conffile(subparser)
|
||||
subparser.add_argument(
|
||||
'--mongodump_path', default='mongodump',
|
||||
help='mongodump binary')
|
||||
|
@ -16,6 +16,7 @@
|
||||
|
||||
import sys
|
||||
|
||||
from mediagoblin.gmg_commands.util import option_add_conffile
|
||||
from mediagoblin.db import util as db_util
|
||||
from mediagoblin.db.open import setup_connection_and_db_from_config
|
||||
from mediagoblin.init.config import read_mediagoblin_config
|
||||
@ -25,9 +26,7 @@ from mediagoblin.db import migrations
|
||||
|
||||
|
||||
def migrate_parser_setup(subparser):
|
||||
subparser.add_argument(
|
||||
'-cf', '--conf_file', default='mediagoblin.ini',
|
||||
help="Config file used to set up environment")
|
||||
option_add_conffile(subparser)
|
||||
|
||||
|
||||
def _print_started_migration(migration_number, migration_func):
|
||||
|
@ -19,12 +19,11 @@ import code
|
||||
|
||||
from mediagoblin import mg_globals
|
||||
from mediagoblin.gmg_commands import util as commands_util
|
||||
from mediagoblin.gmg_commands.util import option_add_conffile
|
||||
|
||||
|
||||
def shell_parser_setup(subparser):
|
||||
subparser.add_argument(
|
||||
'-cf', '--conf_file', default='mediagoblin.ini',
|
||||
help="Config file used to set up environment")
|
||||
option_add_conffile(subparser)
|
||||
|
||||
|
||||
SHELL_BANNER = """\
|
||||
|
@ -15,6 +15,7 @@
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
from mediagoblin.gmg_commands import util as commands_util
|
||||
from mediagoblin.gmg_commands.util import option_add_conffile
|
||||
from mediagoblin.auth import lib as auth_lib
|
||||
from mediagoblin import mg_globals
|
||||
|
||||
@ -29,9 +30,7 @@ def adduser_parser_setup(subparser):
|
||||
subparser.add_argument(
|
||||
'email',
|
||||
help="Email to recieve notifications")
|
||||
subparser.add_argument(
|
||||
'-cf', '--conf_file', default='mediagoblin.ini',
|
||||
help="Config file used to set up environment")
|
||||
option_add_conffile(subparser)
|
||||
|
||||
|
||||
def adduser(args):
|
||||
@ -64,9 +63,7 @@ def makeadmin_parser_setup(subparser):
|
||||
subparser.add_argument(
|
||||
'username',
|
||||
help="Username to give admin level")
|
||||
subparser.add_argument(
|
||||
'-cf', '--conf_file', default='mediagoblin.ini',
|
||||
help="Config file used to set up environment")
|
||||
option_add_conffile(subparser)
|
||||
|
||||
|
||||
def makeadmin(args):
|
||||
@ -90,9 +87,7 @@ def changepw_parser_setup(subparser):
|
||||
subparser.add_argument(
|
||||
'password',
|
||||
help="Your NEW supersecret word to login")
|
||||
subparser.add_argument(
|
||||
'-cf', '--conf_file', default='mediagoblin.ini',
|
||||
help="Config file used to set up environment")
|
||||
option_add_conffile(subparser)
|
||||
|
||||
|
||||
def changepw(args):
|
||||
|
@ -25,3 +25,12 @@ def setup_app(args):
|
||||
mgoblin_app = app.MediaGoblinApp(args.conf_file)
|
||||
|
||||
return mgoblin_app
|
||||
|
||||
|
||||
def option_add_conffile(subparser):
|
||||
"""
|
||||
Add the -cf option to a subparser
|
||||
"""
|
||||
subparser.add_argument(
|
||||
'-cf', '--conf_file', default='mediagoblin.ini',
|
||||
help="Config file used to set up environment")
|
||||
|
Loading…
x
Reference in New Issue
Block a user