2Shirt/WizardKit
2Shirt/WizardKit
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases 26 Packages Wiki Activity Actions

Updated results screen formatting

Browse source
This commit is contained in:
2Shirt 2017-12-27 02:11:28 -07:00
parent 24e72f2f35
commit 0bab107e24
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
.bin/Scripts/functions/hw_diags.py
View file

@ -452,7 +452,9 @@ def show_disk_details(dev):
for attrib, threshold in sorted(ATTRIBUTES['SMART'].items()): for attrib, threshold in sorted(ATTRIBUTES['SMART'].items()):
if attrib in s_table: if attrib in s_table:
print_standard( print_standard(
' {:>3} {:32}'.format(attrib, s_table[attrib]['name']), ' {:>3} {:32}'.format(
attrib,
s_table[attrib]['name']).replace('_', ' ').title(),
end='', flush=True) end='', flush=True)
raw_str = s_table[attrib]['raw']['string'] raw_str = s_table[attrib]['raw']['string']
raw_num = re.sub(r'^(\d+).*$', r'\1', raw_str) raw_num = re.sub(r'^(\d+).*$', r'\1', raw_str)
@ -476,7 +478,7 @@ def show_disk_details(dev):
def show_results(): def show_results():
clear_screen() clear_screen()
print_standard('Results') print_standard('Hardware Diagnostic Results')
update_progress() update_progress()
# Set Window layout and show progress # Set Window layout and show progress
@ -485,12 +487,12 @@ def show_results():
# Prime95 # Prime95
if TESTS['Prime95']['Enabled']: if TESTS['Prime95']['Enabled']:
print_info('\nPrime95:') print_success('\nPrime95:')
for log, regex in [ for log, regex in [
['results.txt', r'(error|fail)'], ['results.txt', r'(error|fail)'],
['prime.log', r'completed.*0 errors, 0 warnings']]: ['prime.log', r'completed.*0 errors, 0 warnings']]:
if log in TESTS['Prime95']: if log in TESTS['Prime95']:
#print_standard(log) print_info('Log: {}'.format(log))
lines = [line.strip() for line lines = [line.strip() for line
in TESTS['Prime95'][log].splitlines() in TESTS['Prime95'][log].splitlines()
if re.search(regex, line, re.IGNORECASE)] if re.search(regex, line, re.IGNORECASE)]
@ -505,6 +507,7 @@ def show_results():
# NVMe/SMART / badblocks # NVMe/SMART / badblocks
if TESTS['NVMe/SMART']['Enabled'] or TESTS['badblocks']['Enabled']: if TESTS['NVMe/SMART']['Enabled'] or TESTS['badblocks']['Enabled']:
print_success('\nDisks:')
for name, dev in sorted(TESTS['NVMe/SMART']['Devices'].items()): for name, dev in sorted(TESTS['NVMe/SMART']['Devices'].items()):
show_disk_details(dev) show_disk_details(dev)
if TESTS['badblocks']['Enabled']: if TESTS['badblocks']['Enabled']: