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

Reworked status/color sections

Browse source
This commit is contained in:
2Shirt 2018-12-22 17:55:49 -07:00
parent d37923a31c
commit 6d9f50629c
Signed by: 2Shirt
GPG key ID: 152FAC923B0E132C
1 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -65,6 +65,11 @@ KEY_NVME = 'nvme_smart_health_information_log'
KEY_SMART = 'ata_smart_attributes' KEY_SMART = 'ata_smart_attributes'
QUICK_LABEL = '{YELLOW}(Quick){CLEAR}'.format(**COLORS) QUICK_LABEL = '{YELLOW}(Quick){CLEAR}'.format(**COLORS)
SIDE_PANE_WIDTH = 20 SIDE_PANE_WIDTH = 20
STATUSES = {
'RED': ['Denied', 'ERROR', 'NS', 'OVERRIDE', 'TimedOut'],
'YELLOW': ['Aborted', 'N/A', 'Skipped', 'Unknown', 'Working'],
'GREEN': ['CS'],
}
TESTS_CPU = ['Prime95'] TESTS_CPU = ['Prime95']
TESTS_DISK = [ TESTS_DISK = [
'I/O Benchmark', 'I/O Benchmark',
@ -78,7 +83,10 @@ TMUX_LAYOUT = OrderedDict({
'Progress': {'x': SIDE_PANE_WIDTH, 'Check': True}, 'Progress': {'x': SIDE_PANE_WIDTH, 'Check': True},
}) })
# Error Classe # Regex
REGEX_ERROR_STATUS = re.compile('|'.join(STATUSES['RED']))
# Error Classes
class DeviceTooSmallError(Exception): class DeviceTooSmallError(Exception):
pass pass
@ -566,7 +574,8 @@ class TestObj():
def update_status(self, new_status=None): def update_status(self, new_status=None):
"""Update status strings.""" """Update status strings."""
if self.disabled or re.search(r'ERROR|OVERRIDE', self.status): if self.disabled or REGEX_ERROR_STATUS.search(self.status):
# Don't update error statuses if test is enabled
return return
if new_status: if new_status:
self.status = build_status_string( self.status = build_status_string(
@ -603,12 +612,9 @@ def build_outer_panes(state):
def build_status_string(label, status, info_label=False): def build_status_string(label, status, info_label=False):
"""Build status string with appropriate colors.""" """Build status string with appropriate colors."""
status_color = COLORS['CLEAR'] status_color = COLORS['CLEAR']
if status in ['Denied', 'ERROR', 'NS', 'OVERRIDE', 'TimedOut']: for k, v in STATUSES.items():
status_color = COLORS['RED'] if status in v:
elif status in ['Aborted', 'N/A', 'Skipped', 'Unknown', 'Working']: status_color = COLORS[k]
status_color = COLORS['YELLOW']
elif status in ['CS']:
status_color = COLORS['GREEN']
return '{l_c}{l}{CLEAR}{s_c}{s:>{s_w}}{CLEAR}'.format( return '{l_c}{l}{CLEAR}{s_c}{s:>{s_w}}{CLEAR}'.format(
l_c=COLORS['BLUE'] if info_label else '', l_c=COLORS['BLUE'] if info_label else '',