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

Adjust used space report for osTicket

Browse source 
* Include volume total, used, and free space
* Space using dots for improved readability
* Adjust total size notation to match other sizes
This commit is contained in:
2Shirt 2018-10-01 19:43:02 -06:00
parent 6854d5bad7
commit 83984cd6ee
Signed by: 2Shirt
GPG key ID: 152FAC923B0E132C
1 changed files with 30 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -648,13 +648,36 @@ def post_drive_results(ticket_number):
all_devices=False, all_devices=False,
device_path='/dev/{}'.format(name)) device_path='/dev/{}'.format(name))
for vol_path, vol_data in sorted(volume_report.items()): for vol_path, vol_data in sorted(volume_report.items()):
line = vol_path vol_report = [
if vol_data.get('label', False): vol_path,
line += ' "{}"'.format(vol_data['label']) '{q}{label}{q}'.format(
line += ' Used: {}, Free: {}'.format( label=vol_data.get('label', ''),
vol_data.get('size_used', 'UNKNOWN'), q='"' if vol_data.get('label', '') else ''),
vol_data.get('size_avail', 'UNKNOWN'), '{}'.format(
) vol_data.get('size', 'UNKNOWN').upper()),
'{}'.format(
vol_data.get('size_used', 'UNKNOWN').upper()),
'{}'.format(
vol_data.get('size_avail', 'UNKNOWN').upper()),
]
if vol_report[2][-1:] != 'N':
vol_report[2] = '{} {}B'.format(
vol_report[2][:-1],
vol_report[2][-1:])
vol_report = [v.strip().replace(' ', '_') for v in vol_report]
for i in range(5):
pad = 8
if i < 2:
pad += 4 * (2 - i)
vol_report[i] = pad_with_dots(
left_pad=False,
s='{s:<{p}}'.format(
s=vol_report[i],
p=pad))
vol_report[-1] = re.sub(r'\.*$', '', vol_report[-1])
vol_report = [v.replace('_', ' ') for v in vol_report]
line = '{}..{}..Total..{}..(Used..{}..Free..{})'.format(
*vol_report)
report.append(line) report.append(line)
# Post reply for drive # Post reply for drive