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

Adjusted osTicket drive report formatting

Browse source
This commit is contained in:
2Shirt 2018-09-20 00:50:32 -06:00
parent 9698cfbf6d
commit dd13f7bd24
Signed by: 2Shirt
GPG key ID: 152FAC923B0E132C
1 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -448,10 +448,20 @@ def post_drive_results(ticket_number):
s_table = {a.get('id', 'Unknown'): a for a in s_table} s_table = {a.get('id', 'Unknown'): a for a in s_table}
for attrib in sorted(ATTRIBUTES['SMART'].keys()): for attrib in sorted(ATTRIBUTES['SMART'].keys()):
if attrib in s_table: if attrib in s_table:
report.append('{:0>2}/{:24}{} ({})'.format( # Pad attributewith dots for osTicket
str(hex(int(attrib))).upper()[2:], hex_str = '{:>2}'.format(str(hex(int(attrib))).upper()[2:])
attrib, hex_str = hex_str.replace(' ', '..')
if '.' in hex_str:
hex_str = '.' + hex_str
dec_str = '{:>3}'.format(attrib)
dec_str = dec_str.replace(' ', '..')
if '.' in dec_str:
dec_str = '.' + dec_str
report.append('{:>2}/{:>3}: {} {} ({})'.format(
hex_str,
dec_str,
s_table[attrib]['raw']['string'], s_table[attrib]['raw']['string'],
'..'*24+'.',
s_table[attrib]['name'], s_table[attrib]['name'],
)) ))
report[-1] = report[-1].strip().replace(' ', '.') report[-1] = report[-1].strip().replace(' ', '.')
@ -489,6 +499,9 @@ def post_drive_results(ticket_number):
line = line.strip() line = line.strip()
if not line: if not line:
continue continue
# Strip colors from line
for c in COLORS.values():
line = line.replace(c, '')
report.append(line) report.append(line)
report.append('') report.append('')