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

Adjusted how devices are added to the state obj

Browse source 
* The change allows for devices to be (dis)connected while the script is running
  * Devices are scanned and added during run_hw_diags()
* Fixes bug that prevented any devices from being added as well
This commit is contained in:
2Shirt 2018-12-05 03:49:25 -07:00
parent 2d69d93154
commit d025b8dc9e
Signed by: 2Shirt
GPG key ID: 152FAC923B0E132C
1 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -78,6 +78,7 @@ class DevObj():
self.path = dev_path self.path = dev_path
self.smart_attributes = {} self.smart_attributes = {}
self.smartctl = {} self.smartctl = {}
self.state = state
self.tests = { self.tests = {
'NVMe / SMART': {'Result': None, 'Status': None}, 'NVMe / SMART': {'Result': None, 'Status': None},
'badblocks': {'Result': None, 'Status': None}, 'badblocks': {'Result': None, 'Status': None},
@ -158,7 +159,8 @@ class State():
self.devs = [] self.devs = []
self.finished = False self.finished = False
self.panes = {} self.panes = {}
self.progress_out = '{}/progress.out'.format(global_vars['LogDir']) # TODO Switch to LogDir
self.progress_out = '{}/progress.out'.format(global_vars['TmpDir'])
self.quick_mode = False self.quick_mode = False
self.started = False self.started = False
self.tests = { self.tests = {
@ -168,19 +170,20 @@ class State():
'badblocks': {'Enabled': False, 'Order': 3}, 'badblocks': {'Enabled': False, 'Order': 3},
'I/O Benchmark': {'Enabled': False, 'Order': 4}, 'I/O Benchmark': {'Enabled': False, 'Order': 4},
} }
try_and_print(
message='Scanning devices...',
function=self.add_devs,
cs='Done')
def add_devs(self): def init(self):
"""Add all block devices listed by lsblk.""" """Scan for block devices and reset all tests."""
self.devs = []
for k in ['Result', 'Started', 'Status']:
self.tests['Prime95 & Temps'][k] = False if k == 'Started' else ''
# Add block devices
cmd = ['lsblk', '--json', '--nodeps', '--paths'] cmd = ['lsblk', '--json', '--nodeps', '--paths']
result = run_program(cmd, check=False) result = run_program(cmd, check=False)
json_data = json.loads(result.stdout.decode()) json_data = json.loads(result.stdout.decode())
for dev in json_data['blockdevices']: for dev in json_data['blockdevices']:
skip_dev = False skip_dev = False
dev_obj = DevObj(dev['name']) dev_obj = DevObj(self, dev['name'])
# Skip loopback devices # Skip loopback devices
if dev_obj.lsblk['tran'] == 'NONE': if dev_obj.lsblk['tran'] == 'NONE':
@ -194,7 +197,7 @@ class State():
# Add device # Add device
if not skip_dev: if not skip_dev:
self.devs.append(DevObj(dev['name'])) self.devs.append(dev_obj)
# Functions # Functions
def build_outer_panes(state): def build_outer_panes(state):
@ -464,6 +467,9 @@ def run_badblocks_test(state):
def run_hw_tests(state): def run_hw_tests(state):
"""Run enabled hardware tests.""" """Run enabled hardware tests."""
print_standard('Scanning devices...')
state.init()
# Build Panes # Build Panes
build_outer_panes(state) build_outer_panes(state)