andpp/mopidy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

main: Load extensions earlier

Browse Source
This commit is contained in:
Stein Magnus Jodal 2013-04-02 00:54:32 +02:00
parent 09b6859752
commit 32277d158a
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
mopidy/__main__.py
View File

@ -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()