config: Make --show-config use schema name

This commit is contained in:
Thomas Adamcik 2013-04-13 22:51:59 +02:00
parent 10d7c15792
commit d8a0cb880d

View File

@ -143,19 +143,20 @@ def show_config_callback(option, opt, value, parser):
# TODO: create mopidy.config.format? # TODO: create mopidy.config.format?
output = [] output = []
for section_name, schema in config_lib.config_schemas.items(): for schema in config_lib.core_schemas:
options = config.get(section_name, {}) options = config.get(schema.name, {})
if not options: if not options:
continue continue
output.append(schema.format(section_name, options)) output.append(schema.format(options))
for extension in extensions: for extension in extensions:
schema = extension.get_config_schema()
if extension in enabled_extensions: if extension in enabled_extensions:
schema = extension.get_config_schema() options = config.get(schema.name, {})
options = config.get(extension.ext_name, {}) output.append(schema.format(options))
output.append(schema.format(extension.ext_name, options))
else: else:
lines = ['[%s]' % extension.ext_name, 'enabled = false', lines = ['[%s]' % schema.name, 'enabled = false',
'# Config hidden as extension is disabled'] '# Config hidden as extension is disabled']
output.append('\n'.join(lines)) output.append('\n'.join(lines))