From 4f036776757ad7dd8522fae066964624bf80a04a Mon Sep 17 00:00:00 2001 From: Thomas Adamcik Date: Fri, 8 Nov 2013 01:48:14 +0100 Subject: [PATCH] main: Improve main bootstrapping sequence - Parses args in two pases to allow for setup of logging well before doing extension sub-commands. --- mopidy/__main__.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/mopidy/__main__.py b/mopidy/__main__.py index bc5ca86c..32102b29 100644 --- a/mopidy/__main__.py +++ b/mopidy/__main__.py @@ -40,18 +40,20 @@ def main(): deps_parser = subparser.add_parser('deps', help='show dependencies') deps_parser.set_defaults(command='deps') - args = parser.parse_args(args=mopidy_args) + bootstrap_args = parser.parse_known_args(args=mopidy_args)[0] - if args.command in ('config', 'deps'): - args.verbosity_level -= 1 - - bootstrap_logging(args) + if bootstrap_args.command in ('config', 'deps'): + bootstrap_args.verbosity_level -= 1 + bootstrap_logging(bootstrap_args) try: create_file_structures() check_old_locations() installed_extensions = ext.load_extensions() + # TODO: install extension subcommands. + + args = parser.parse_args(args=mopidy_args) config, config_errors = config_lib.load( args.config_files, installed_extensions, args.config_overrides)