diff --git a/.bin/Scripts/functions/osticket.py b/.bin/Scripts/functions/osticket.py index 78acdd64..6064ef33 100644 --- a/.bin/Scripts/functions/osticket.py +++ b/.bin/Scripts/functions/osticket.py @@ -91,21 +91,24 @@ class osTicket(): index = 1 if name == 'NVMe / SMART': out_report.append('{} ({})'.format(name, status)) - source_report = dev.generate_attribute_report() + attr_report = dev.generate_attribute_report() + source_report = [attr_report.pop(0)] + source_report.extend( + ['... {}'.format(line.strip()) for line in attr_report]) # Notes if dev.nvme_smart_notes: notes = sorted(dev.nvme_smart_notes.keys()) source_report.append('{} Notes'.format(dev.attr_type)) source_report.extend( - ['..... {}'.format(line.strip()) for line in notes]) + ['... {}'.format(line.strip()) for line in notes]) # Test Report _report = test.report.copy() if _report: source_report.append(_report.pop(0)) source_report.extend( - ['..... {}'.format(line.strip()) for line in _report]) + ['... {}'.format(line.strip()) for line in _report]) elif not source_report: index = 0 out_report.append('{} ({})'.format(name, status)) @@ -132,6 +135,8 @@ class osTicket(): line = '{}{} {}'.format(_sensor, _spacer, _temps) if line == 'Temps': out_report.append(' ') + out_report.append('Temps') + continue elif name == 'NVMe / SMART': r = REGEX_NVME_SMART_ATTRIBUTES.match(line) if r: @@ -154,6 +159,9 @@ class osTicket(): line = line.strip() line = re.sub(r'(\s+)', ' ', line) + # Indent line + line = '... {}'.format(line) + # Add line to report out_report.append(line) @@ -286,7 +294,7 @@ class osTicket(): v_data[-1] = re.sub(r'\.*$', '', v_data[-1]) v_data = [v.replace('_', ' ') for v in v_data] report.append( - '{}..{}..Total..{}..({}..Used..{}..Free..{})'.format(*v_data)) + '... {}..{}..Total..{}..({}..Used..{}..Free..{})'.format(*v_data)) # Done return report