SHICTHRSMACE 1.2.0__tar.gz → 1.3.0__tar.gz

{shicthrsmace-1.2.0 → shicthrsmace-1.3.0}/PKG-INFO

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

{shicthrsmace-1.2.0 → shicthrsmace-1.3.0}/SHICTHRSMACE/SHRMACE_Data.py

@@ -1,7 +1,8 @@
 
 class SHRMACEData():
     def __init__(self):
-        self.SHRMACEResult : dict = {'WindowsUUID' : None ,
+        self.SHRMACEResult : dict = {'WindowsSystemInfo' : None ,
+                                    'WindowsUUID' : None ,
                                     'WindowsProductId' : None ,
                                     'CPUINFO' : None ,
                                     'CPUID' : None ,

{shicthrsmace-1.2.0 → shicthrsmace-1.3.0}/SHICTHRSMACE/__init__.py

@@ -28,5 +28,5 @@ def SHRMACE_get_mace_info() -> tuple:
 
         return (result , errro_list)
 
-    except Exception as e:
+    except SHRMACEException as e:
         raise SHRMACEException(f'SHRMACE [ERROR.2014] error occurred while getting mace info. | {e}')

shicthrsmace-1.3.0/SHICTHRSMACE/api/SHRMACE_get_system_info.py

@@ -0,0 +1,41 @@
+
+import platform
+import copy
+from ..SHRMACE_ErrorBase import SHRMACEException
+
+MEM_INFO_COMMAND : str = 'wmic memorychip get Manufacturer, PartNumber, SerialNumber, Capacity, Speed, DeviceLocator, MemoryType, FormFactor'
+
+def get_system_info(var) -> None:
+    try:
+        os_name : str = platform.system()
+        os_version : str = platform.version()
+        architecture : str = platform.architecture()[0]
+        architecture_type : str = platform.architecture()[1]
+        system_type : str = get_win_platform()
+        result : dict = {'os_name' : os_name , 'os_version' : os_version ,
+                            'architecture' : architecture , 'architecture_type' : architecture_type ,
+                            'platform' : system_type}
+        var.SHRMACEResult['WindowsSystemInfo'] = copy.deepcopy(result)
+    except Exception as e:
+        raise SHRMACEException(f'SHRMACE [ERROR.2014] unable to system info | {str(e)}')
+
+
+def get_win_platform() -> str:
+    version = platform.version().split('.')
+
+    if len(version) < 3:
+        raise SHRMACEException(f'SHRMACE [ERROR.2014.0] windows version is not supported')
+    
+    major = int(version[0])
+    minor = int(version[1])
+    build = int(version[2])
+
+    if major == 10 and minor == 0:
+        if build >= 22000:
+            return "windows 11"
+
+        elif build >= 10240:
+            return "windows 10"
+    else:
+        raise SHRMACEException(f'SHRMACE [ERROR.2014.1] windows version only support 10.0.22000 and above')
+

{shicthrsmace-1.2.0 → shicthrsmace-1.3.0}/SHICTHRSMACE/utils/SHRMACE_dispatcher.py

@@ -2,6 +2,7 @@
 import threading
 from ..SHRMACE_ErrorBase import SHRMACEException
 from ..SHRMACE_Data import SHRMACEData
+from ..api.SHRMACE_get_system_info import get_system_info
 from ..api.SHRMACE_get_uuid import get_uuid
 from ..api.SHRMACE_get_pdc_id import get_pdc_id
 from ..api.SHRMACE_get_cpu_info import get_cpu_info
@@ -15,7 +16,7 @@ from ..api.SHRMACE_get_disk_info import get_disk_info
 from ..api.SHRMACE_get_mem_info import get_mem_info
 from ..api.SHRMACE_get_mac_info import get_mac_info
 
-MACE_PROCESS_LIST : list = [get_uuid , get_pdc_id , get_cpu_info ,
+MACE_PROCESS_LIST : list = [get_system_info , get_uuid , get_pdc_id , get_cpu_info ,
                             get_cpu_id , get_cpu_vendor , get_mb_info ,
                             get_mb_id , get_gpu_info , get_gpu_id ,
                             get_disk_info , get_mem_info , get_mac_info]

{shicthrsmace-1.2.0 → shicthrsmace-1.3.0}/SHICTHRSMACE.egg-info/PKG-INFO

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

{shicthrsmace-1.2.0 → shicthrsmace-1.3.0}/SHICTHRSMACE.egg-info/SOURCES.txt

@@ -20,6 +20,7 @@ SHICTHRSMACE/api/SHRMACE_get_mb_id.py
 SHICTHRSMACE/api/SHRMACE_get_mb_info.py
 SHICTHRSMACE/api/SHRMACE_get_mem_info.py
 SHICTHRSMACE/api/SHRMACE_get_pdc_id.py
+SHICTHRSMACE/api/SHRMACE_get_system_info.py
 SHICTHRSMACE/api/SHRMACE_get_uuid.py
 SHICTHRSMACE/api/__init__.py
 SHICTHRSMACE/utils/SHRMACE_dispatcher.py

{shicthrsmace-1.2.0 → shicthrsmace-1.3.0}/setup.py

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