diff --git a/.bin/Scripts/functions/osticket.py b/.bin/Scripts/functions/osticket.py index 6064ef33..aed84f92 100644 --- a/.bin/Scripts/functions/osticket.py +++ b/.bin/Scripts/functions/osticket.py @@ -91,24 +91,15 @@ class osTicket(): index = 1 if name == 'NVMe / SMART': out_report.append('{} ({})'.format(name, status)) - attr_report = dev.generate_attribute_report() - source_report = [attr_report.pop(0)] - source_report.extend( - ['... {}'.format(line.strip()) for line in attr_report]) + source_report = dev.generate_attribute_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]) + source_report.extend(sorted(dev.nvme_smart_notes.keys())) # Test Report - _report = test.report.copy() - if _report: - source_report.append(_report.pop(0)) - source_report.extend( - ['... {}'.format(line.strip()) for line in _report]) + source_report.extend(test.report.copy()) elif not source_report: index = 0 out_report.append('{} ({})'.format(name, status)) @@ -160,7 +151,8 @@ class osTicket(): line = re.sub(r'(\s+)', ' ', line) # Indent line - line = '... {}'.format(line) + if not re.match(r'^(NVMe|SMART)', line): + line = '... {}'.format(line) # Add line to report out_report.append(line)