From 6fe273cf8be88cfdfea9fe82e91fb0f5cc2bb016 Mon Sep 17 00:00:00 2001
From: 2Shirt <2xShirt@gmail.com>
Date: Mon, 13 May 2019 18:07:52 -0600
Subject: [PATCH] Include RAM details in report

* Addresses issue #88
---
 .bin/Scripts/functions/hw_diags.py | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/.bin/Scripts/functions/hw_diags.py b/.bin/Scripts/functions/hw_diags.py
index ec266de8..bcfdcd2e 100644
--- a/.bin/Scripts/functions/hw_diags.py
+++ b/.bin/Scripts/functions/hw_diags.py
@@ -59,6 +59,14 @@ class CpuObj():
     report.append('{BLUE}Device{CLEAR}'.format(**COLORS))
     report.append('  {}'.format(self.name))
 
+    # Include RAM details
+    ram_details = get_ram_details()
+    ram_total = human_readable_size(ram_details.pop('Total', 0)).strip()
+    ram_dimms = ['{}x {}'.format(v, k) for k, v in sorted(ram_details.items())]
+    report.append(' ')
+    report.append('{BLUE}RAM{CLEAR}'.format(**COLORS))
+    report.append('  {} ({})'.format(ram_total, ', '.join(ram_dimms)))
+
     # Tests
     for test in self.tests.values():
       report.extend(test.report)
@@ -760,10 +768,6 @@ def get_ram_details():
   result = run_program(cmd, encoding='utf-8', errors='ignore')
   dmi_data = result.stdout.splitlines()
 
-  # Testing
-  with open('dmi_mem.log', 'r') as f:
-    dmi_data = f.readlines()
-
   # Parse data
   for line in dmi_data:
     line = line.strip()