From 32277d158a5f87236b9f067033b946725e0c8aa6 Mon Sep 17 00:00:00 2001 From: Stein Magnus Jodal Date: Tue, 2 Apr 2013 00:54:32 +0200 Subject: [PATCH] main: Load extensions earlier --- mopidy/__main__.py | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/mopidy/__main__.py b/mopidy/__main__.py index 3831bd7e..8d8d7d62 100644 --- a/mopidy/__main__.py +++ b/mopidy/__main__.py @@ -53,8 +53,8 @@ def main(): try: log.setup_logging(options.verbosity_level, options.save_debug_log) check_old_folders() - setup_settings(options.interactive) extensions = load_extensions() + setup_settings(options.interactive) audio = setup_audio() backends = setup_backends(extensions, audio) core = setup_core(audio, backends) @@ -128,17 +128,6 @@ def check_old_folders(): 'further instructions.', old_settings_folder, path.SETTINGS_PATH) -def setup_settings(interactive): - path.get_or_create_folder(path.SETTINGS_PATH) - path.get_or_create_folder(path.DATA_PATH) - path.get_or_create_file(path.SETTINGS_FILE) - try: - settings.validate(interactive) - except exceptions.SettingsError as ex: - logger.error(ex.message) - sys.exit(1) - - def load_extensions(): extensions = [] for entry_point in pkg_resources.iter_entry_points('mopidy.extension'): @@ -172,6 +161,17 @@ def load_extensions(): return extensions +def setup_settings(interactive): + path.get_or_create_folder(path.SETTINGS_PATH) + path.get_or_create_folder(path.DATA_PATH) + path.get_or_create_file(path.SETTINGS_FILE) + try: + settings.validate(interactive) + except exceptions.SettingsError as ex: + logger.error(ex.message) + sys.exit(1) + + def setup_audio(): logger.info('Starting Mopidy audio') return Audio.start().proxy()