mirror of
https://github.com/86Box/bios-tools.git
synced 2026-02-26 05:53:16 -07:00
Fix multiline metadata handling
This commit is contained in:
@@ -463,7 +463,7 @@ def analyze_files(formatter, scan_base, file_analyzers, scan_dir_path, scan_file
|
||||
scan_file_path = scan_file_path[2:]
|
||||
|
||||
# De-duplicate and sort metadata and option ROMs.
|
||||
metadata = list(set('[{0}] {1}'.format(key, value).strip() for key, value in (analyzer.metadata + bonus_analyzer_metadata)))
|
||||
metadata = list(set('[{0}] {1}'.format(key, value.replace('\n', '\n' + (' ' * (len(key) + 3)))).strip() for key, value in (analyzer.metadata + bonus_analyzer_metadata)))
|
||||
metadata.sort()
|
||||
oroms = list(set(combined_oroms + analyzer.oroms + bonus_analyzer_oroms))
|
||||
oroms.sort()
|
||||
|
||||
@@ -1132,7 +1132,7 @@ class BonusAnalyzer(Analyzer):
|
||||
# Add generic VGA marker if no PCI/PnP data was found.
|
||||
if vga_marker:
|
||||
# Strip lines that are too short or have a single repeated character.
|
||||
stripped = (x.strip() for x in vga_marker.replace('\r', '').split('\n'))
|
||||
stripped = (x.strip() for x in vga_marker.replace('\r', '\n').split('\n'))
|
||||
vga_marker = '\n'.join(x for x in stripped if len(x) > 3 and x[:10] != (x[0] * min(len(x), 10))).strip('\n')
|
||||
self.oroms.append(('VGA', vga_marker))
|
||||
|
||||
|
||||
Reference in New Issue
Block a user