change --archive_details output

This commit is contained in:
simon.chupin
2021-10-27 16:14:08 +02:00
parent f82309b1df
commit 8cff2a27e6
2 changed files with 276 additions and 25 deletions
+15 -5
View File
@@ -1103,19 +1103,29 @@ def get_archive_symbols(sections: Dict, archive: str, as_json: bool=False, secti
def _get_item_pairs(name: str, section: collections.OrderedDict) -> collections.OrderedDict:
return collections.OrderedDict([(key.replace(name + '.', ''), val) for key, val in iteritems(section)])
def _get_max_len(symbols_dict: Dict) -> Tuple[int, int]:
# the lists have 0 in them because max() doesn't work with empty lists
names_max_len = 0
numbers_max_len = 0
for t, s in iteritems(symbols_dict):
numbers_max_len = max([numbers_max_len, *[len(str(x)) for _, x in iteritems(s)]])
names_max_len = max([names_max_len, *[len(x) for x in _get_item_pairs(t, s)]])
return names_max_len, numbers_max_len
def _get_output(section_symbols: Dict) -> str:
output = ''
names_max_len, numbers_max_len = _get_max_len(section_symbols)
for t, s in iteritems(section_symbols):
output += '{}Symbols from section: {}{}'.format(os.linesep, t, os.linesep)
item_pairs = _get_item_pairs(t, s)
output += ' '.join(['{}({})'.format(key, val) for key, val in iteritems(item_pairs)])
for key, val in iteritems(item_pairs):
output += ' '.join([('\t{:<%d} : {:>%d}\n' % (names_max_len,numbers_max_len)).format(key, val)])
section_total = sum([val for _, val in iteritems(item_pairs)])
output += '{}Section total: {}{}'.format(os.linesep if section_total > 0 else '',
section_total,
os.linesep)
output += 'Section total: {}{}'.format(section_total, os.linesep)
return output
output = 'Symbols within the archive: {} (Not all symbols may be reported){}'.format(archive, os.linesep)
output = '{}Symbols within the archive: {} (Not all symbols may be reported){}'.format(os.linesep, archive, os.linesep)
if diff_en:
def _generate_line_tuple(curr: collections.OrderedDict, ref: collections.OrderedDict, name: str) -> Tuple[str, int, int, str]: