Reordered functions

This commit is contained in:
2Shirt 2019-11-01 18:52:26 -06:00
parent e634d1691f
commit d933ff9742
Signed by: 2Shirt
GPG key ID: 152FAC923B0E132C

View file

@ -61,6 +61,22 @@ class CpuRam():
self.get_cpu_details()
self.get_ram_details()
def generate_report(self):
"""Generate CPU & RAM report, returns list."""
report = []
report.append(color_string('Device', 'BLUE'))
report.append(f' {self.description}')
# Include RAM details
report.append(color_string('RAM', 'BLUE'))
report.append(f' {self.ram_total} ({", ".join(self.ram_dimms)})')
# Tests
for test in self.tests.values():
report.extend(test.report)
return report
def get_cpu_details(self):
"""Get CPU details using OS specific methods."""
if platform.system() == 'Darwin':
@ -110,22 +126,6 @@ class CpuRam():
f'{count}x {desc}' for desc, count in sorted(details.items())
]
def generate_report(self):
"""Generate CPU & RAM report, returns list."""
report = []
report.append(color_string('Device', 'BLUE'))
report.append(f' {self.description}')
# Include RAM details
report.append(color_string('RAM', 'BLUE'))
report.append(f' {self.ram_total} ({", ".join(self.ram_dimms)})')
# Tests
for test in self.tests.values():
report.extend(test.report)
return report
class Disk():
"""Object for tracking disk specific data."""