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

config: Improve list settings output with disabled settings.

Browse Source
This commit is contained in:
Thomas Adamcik 2013-04-02 22:36:22 +02:00
parent 3f59e16f7c
commit f73c081ddf
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
mopidy/__main__.py
View File

@ -150,18 +150,24 @@ def list_settings_callback(option, opt, value, parser):
extensions = load_extensions() extensions = load_extensions()
raw_config = load_config(overrides, extensions) raw_config = load_config(overrides, extensions)
extensions = filter_enabled_extensions(raw_config, extensions) enabled_extensions = filter_enabled_extensions(raw_config, extensions)
config = validate_config(raw_config, extensions) config = validate_config(raw_config, enabled_extensions)
# TODO: this code is duplicated, figure out a way to reuse it?
sections_and_schemas = config_schemas.items()
for extension in extensions:
sections_and_schemas.append(
(extension.ext_name, extension.get_config_schema()))
output = ['# Settings for disabled extensions are not shown.'] output = ['# Settings for disabled extensions are not shown.']
for section_name, schema in sections_and_schemas: for section_name, schema in config_schemas.items():
output.append(schema.format(section_name, config.get(section_name, {}))) options = config.get(section_name, {})
if not options:
continue
output.append(schema.format(section_name, options))
for extension in extensions:
if extension in enabled_extensions:
schema = extension.get_config_schema()
options = config.get(extension.ext_name, {})
output.append(schema.format(extension.ext_name, options))
else:
output.append('[%s]\nenabled = false' % extension.ext_name)
print '\n\n'.join(output) print '\n\n'.join(output)
sys.exit(0) sys.exit(0)