SHICTHRSMACE 1.6.0__tar.gz → 1.7.0__tar.gz

{shicthrsmace-1.6.0 → shicthrsmace-1.7.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: SHICTHRSMACE
-Version: 1.6.0
+Version: 1.7.0
 Summary: SHICTHRS MACE machine identity system
 Home-page: https://github.com/JNTMTMTM/SHICTHRS_MACE
 Author: SHICTHRS

shicthrsmace-1.7.0/SHICTHRSMACE/api/SHRMACE_get_mem_info.py

@@ -0,0 +1,47 @@
+
+import subprocess
+import copy
+from ..SHRMACE_ErrorBase import SHRMACEException
+
+MEM_INFO_COMMAND : str = 'wmic memorychip get Manufacturer, PartNumber, SerialNumber, Capacity, Speed, DeviceLocator, MemoryType, FormFactor'
+
+def get_mem_info(var) -> None:
+    try:
+        output = subprocess.check_output(
+            MEM_INFO_COMMAND,
+            shell=True,
+            text=True,
+            stderr=subprocess.STDOUT,
+            encoding='utf-8'
+        )
+        lines = [line.strip() for line in output.split('\n') if line.strip()]
+        if len(lines) < 2:
+            return []
+
+        headers = [h.strip() for h in lines[0].split('  ') if h.strip()]
+        modules = []
+
+        for line in lines[1:]:
+            values = []
+            remaining = line
+            for i in range(len(headers)):
+                if i == len(headers) - 1:
+                    values.append(remaining.strip())
+                else:
+                    parts = remaining.strip().split('  ', 1)
+                    if len(parts) > 0:
+                        values.append(parts[0].strip())
+                        remaining = parts[1] if len(parts) > 1 else ''
+                    else:
+                        values.append('')
+
+            if len(values) == len(headers):
+                module_info = {}
+                for h, v in zip(headers, values):
+                    module_info[h] = v
+                modules.append(module_info)
+
+        var.SHRMACEResult['MemeroyINFO'] = copy.deepcopy(modules)
+
+    except Exception as e:
+        raise SHRMACEException(f'SHRMACE [ERROR.2011] unable to get memory info. | {"".join(e.args)}')

{shicthrsmace-1.6.0 → shicthrsmace-1.7.0}/SHICTHRSMACE.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: SHICTHRSMACE
-Version: 1.6.0
+Version: 1.7.0
 Summary: SHICTHRS MACE machine identity system
 Home-page: https://github.com/JNTMTMTM/SHICTHRS_MACE
 Author: SHICTHRS

{shicthrsmace-1.6.0 → shicthrsmace-1.7.0}/setup.py

@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 
 setup(name='SHICTHRSMACE',
-      version='1.6.0',
+      version='1.7.0',
       description='SHICTHRS MACE machine identity system',
       url='https://github.com/JNTMTMTM/SHICTHRS_MACE',
       author='SHICTHRS',

shicthrsmace-1.6.0/SHICTHRSMACE/api/SHRMACE_get_mem_info.py

@@ -1,35 +0,0 @@
-
-import subprocess
-import copy
-from ..SHRMACE_ErrorBase import SHRMACEException
-
-MEM_INFO_COMMAND : str = 'wmic memorychip get Manufacturer, PartNumber, SerialNumber, Capacity, Speed, DeviceLocator, MemoryType, FormFactor'
-
-def get_mem_info(var) -> None:
-    try:
-        output = subprocess.check_output(
-            MEM_INFO_COMMAND, 
-            shell=True, 
-            text=True, 
-            stderr=subprocess.STDOUT,
-            encoding='utf-8'
-        )
-        lines = [line.strip() for line in output.split('\n') if line.strip()]
-        if len(lines) < 2:
-            return []
-        
-        headers = [h.strip() for h in lines[0].split() if h.strip()]
-        modules = []
-        
-        for line in lines[1:]:
-            values = [v.strip() for v in line.split(None, len(headers) - 1)]
-            if len(values) != len(headers):
-                continue
-                
-            module_info = dict(zip(headers, values))
-            modules.append(module_info)
-        
-        var.SHRMACEResult['MemeroyINFO'] = copy.deepcopy(modules)
-
-    except Exception as e:
-        raise SHRMACEException(f'SHRMACE [ERROR.2011] unable to get memory info. | {''.join(e.args)}')