From 83984cd6ee21f9c232a592a334675aa1209b2d4d Mon Sep 17 00:00:00 2001
From: 2Shirt <2xShirt@gmail.com>
Date: Mon, 1 Oct 2018 19:43:02 -0600
Subject: [PATCH] Adjust used space report for osTicket

* Include volume total, used, and free space
* Space using dots for improved readability
* Adjust total size notation to match other sizes
---
 .bin/Scripts/functions/hw_diags.py | 37 ++++++++++++++++++++++++------
 1 file changed, 30 insertions(+), 7 deletions(-)

diff --git a/.bin/Scripts/functions/hw_diags.py b/.bin/Scripts/functions/hw_diags.py
index 90dcf671..f8ca70a8 100644
--- a/.bin/Scripts/functions/hw_diags.py
+++ b/.bin/Scripts/functions/hw_diags.py
@@ -648,13 +648,36 @@ def post_drive_results(ticket_number):
                 all_devices=False,
                 device_path='/dev/{}'.format(name))
             for vol_path, vol_data in sorted(volume_report.items()):
-                line = vol_path
-                if vol_data.get('label', False):
-                    line += ' "{}"'.format(vol_data['label'])
-                line += ' Used: {}, Free: {}'.format(
-                    vol_data.get('size_used', 'UNKNOWN'),
-                    vol_data.get('size_avail', 'UNKNOWN'),
-                    )
+                vol_report = [
+                    vol_path,
+                    '{q}{label}{q}'.format(
+                        label=vol_data.get('label', ''),
+                        q='"' if vol_data.get('label', '') else ''),
+                    '{}'.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)
 
         # Post reply for drive