List Bitlocker volumes in HW diags posts
This commit is contained in:
parent
c246fb5fdf
commit
998a1e98f5
1 changed files with 17 additions and 8 deletions
|
|
@ -34,23 +34,32 @@ def add_dev_line(test_obj, details) -> None:
|
||||||
if not filesystem:
|
if not filesystem:
|
||||||
# Skip devices without a filesystem
|
# Skip devices without a filesystem
|
||||||
return
|
return
|
||||||
if not details['mountpoint']:
|
|
||||||
# Under Linux the volume needs to be mounted to get used space
|
|
||||||
return
|
|
||||||
|
|
||||||
# Get sizes
|
# Get sizes
|
||||||
|
used = -1
|
||||||
percent_used = -1
|
percent_used = -1
|
||||||
size = details['size']
|
size = details['size']
|
||||||
if PLATFORM == 'Darwin':
|
if PLATFORM == 'Darwin':
|
||||||
size = details['TotalSize']
|
size = int(details.get('TotalSize', -1))
|
||||||
free = details['FreeSpace']
|
free = int(details.get('FreeSpace', 0))
|
||||||
used = size - free
|
used = size - free
|
||||||
elif PLATFORM == 'Linux':
|
elif PLATFORM == 'Linux':
|
||||||
free = int(details['fsavail']) if details['fsavail'] else -1
|
free = details.get('fsavail', 0)
|
||||||
used = int(details['fsused']) if details['fsused'] else -1
|
used = details.get('fsused', -1)
|
||||||
|
if free is None:
|
||||||
|
free = 0
|
||||||
|
if used is None:
|
||||||
|
used = -1
|
||||||
percent_used = (used / size) * 100
|
percent_used = (used / size) * 100
|
||||||
|
|
||||||
|
# Report Bitlocker
|
||||||
|
if filesystem == 'BitLocker':
|
||||||
|
test_obj.report.append(f'{report_line} {bytes_to_string(size)}')
|
||||||
|
|
||||||
# Bail early
|
# Bail early
|
||||||
|
if not details['mountpoint']:
|
||||||
|
# Under Linux the volume needs to be mounted to get used space
|
||||||
|
return
|
||||||
if used < 0:
|
if used < 0:
|
||||||
# Only include "real" devices
|
# Only include "real" devices
|
||||||
return
|
return
|
||||||
|
|
@ -68,7 +77,7 @@ def add_dev_line(test_obj, details) -> None:
|
||||||
color = 'YELLOW'
|
color = 'YELLOW'
|
||||||
size_line = f'{bytes_to_string(size)}'
|
size_line = f'{bytes_to_string(size)}'
|
||||||
size_line += f' ({bytes_to_string(used)} used, {percent_used:0.0f}% full)'
|
size_line += f' ({bytes_to_string(used)} used, {percent_used:0.0f}% full)'
|
||||||
size_line = color_string(size_line, color)
|
size_line = color_string(size_line, str(color))
|
||||||
|
|
||||||
# Done
|
# Done
|
||||||
test_obj.report.append(f'{report_line} {size_line}')
|
test_obj.report.append(f'{report_line} {size_line}')
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue