Fix up print_dotted_output dict handling

This commit is contained in:
zvecr 2022-03-30 00:43:25 +01:00
parent a65ea1a711
commit 22b8299230

View File

@ -38,7 +38,12 @@ def print_dotted_output(kb_info_json, prefix=''):
elif isinstance(kb_info_json[key], dict): elif isinstance(kb_info_json[key], dict):
print_dotted_output(kb_info_json[key], new_prefix) print_dotted_output(kb_info_json[key], new_prefix)
elif isinstance(kb_info_json[key], list): elif isinstance(kb_info_json[key], list):
cli.echo(' {fg_blue}%s{fg_reset}: %s', new_prefix, ', '.join(map(str, sorted(kb_info_json[key])))) data = kb_info_json[key]
if len(data) and isinstance(data[0], dict):
for index, item in enumerate(data, start=0):
cli.echo(' {fg_blue}%s.%s{fg_reset}: %s', new_prefix, index, str(item))
else:
cli.echo(' {fg_blue}%s{fg_reset}: %s', new_prefix, ', '.join(sorted(map(str, data))))
else: else:
cli.echo(' {fg_blue}%s{fg_reset}: %s', new_prefix, kb_info_json[key]) cli.echo(' {fg_blue}%s{fg_reset}: %s', new_prefix, kb_info_json[key])