SHICTHRSMACE 1.1.0__tar.gz → 1.3.0__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (29) hide show
  1. {shicthrsmace-1.1.0 → shicthrsmace-1.3.0}/PKG-INFO +1 -1
  2. {shicthrsmace-1.1.0 → shicthrsmace-1.3.0}/SHICTHRSMACE/SHRMACE_Data.py +2 -1
  3. {shicthrsmace-1.1.0 → shicthrsmace-1.3.0}/SHICTHRSMACE/__init__.py +2 -2
  4. {shicthrsmace-1.1.0 → shicthrsmace-1.3.0}/SHICTHRSMACE/api/SHRMACE_get_cpu_id.py +1 -1
  5. {shicthrsmace-1.1.0 → shicthrsmace-1.3.0}/SHICTHRSMACE/api/SHRMACE_get_cpu_info.py +1 -1
  6. {shicthrsmace-1.1.0 → shicthrsmace-1.3.0}/SHICTHRSMACE/api/SHRMACE_get_cpu_vendor.py +1 -1
  7. {shicthrsmace-1.1.0 → shicthrsmace-1.3.0}/SHICTHRSMACE/api/SHRMACE_get_disk_id.py +1 -1
  8. {shicthrsmace-1.1.0 → shicthrsmace-1.3.0}/SHICTHRSMACE/api/SHRMACE_get_disk_info.py +3 -3
  9. {shicthrsmace-1.1.0 → shicthrsmace-1.3.0}/SHICTHRSMACE/api/SHRMACE_get_gpu_id.py +1 -1
  10. {shicthrsmace-1.1.0 → shicthrsmace-1.3.0}/SHICTHRSMACE/api/SHRMACE_get_gpu_info.py +1 -1
  11. {shicthrsmace-1.1.0 → shicthrsmace-1.3.0}/SHICTHRSMACE/api/SHRMACE_get_mac_info.py +1 -1
  12. {shicthrsmace-1.1.0 → shicthrsmace-1.3.0}/SHICTHRSMACE/api/SHRMACE_get_mb_id.py +1 -1
  13. {shicthrsmace-1.1.0 → shicthrsmace-1.3.0}/SHICTHRSMACE/api/SHRMACE_get_mb_info.py +1 -1
  14. {shicthrsmace-1.1.0 → shicthrsmace-1.3.0}/SHICTHRSMACE/api/SHRMACE_get_mem_info.py +1 -1
  15. {shicthrsmace-1.1.0 → shicthrsmace-1.3.0}/SHICTHRSMACE/api/SHRMACE_get_pdc_id.py +1 -1
  16. shicthrsmace-1.3.0/SHICTHRSMACE/api/SHRMACE_get_system_info.py +41 -0
  17. {shicthrsmace-1.1.0 → shicthrsmace-1.3.0}/SHICTHRSMACE/api/SHRMACE_get_uuid.py +1 -1
  18. {shicthrsmace-1.1.0 → shicthrsmace-1.3.0}/SHICTHRSMACE/utils/SHRMACE_dispatcher.py +3 -2
  19. {shicthrsmace-1.1.0 → shicthrsmace-1.3.0}/SHICTHRSMACE.egg-info/PKG-INFO +1 -1
  20. {shicthrsmace-1.1.0 → shicthrsmace-1.3.0}/SHICTHRSMACE.egg-info/SOURCES.txt +1 -0
  21. {shicthrsmace-1.1.0 → shicthrsmace-1.3.0}/setup.py +1 -1
  22. {shicthrsmace-1.1.0 → shicthrsmace-1.3.0}/SHICTHRSMACE/SHRMACE_ErrorBase.py +0 -0
  23. {shicthrsmace-1.1.0 → shicthrsmace-1.3.0}/SHICTHRSMACE/api/__init__.py +0 -0
  24. {shicthrsmace-1.1.0 → shicthrsmace-1.3.0}/SHICTHRSMACE/utils/__init__.py +0 -0
  25. {shicthrsmace-1.1.0 → shicthrsmace-1.3.0}/SHICTHRSMACE.egg-info/dependency_links.txt +0 -0
  26. {shicthrsmace-1.1.0 → shicthrsmace-1.3.0}/SHICTHRSMACE.egg-info/not-zip-safe +0 -0
  27. {shicthrsmace-1.1.0 → shicthrsmace-1.3.0}/SHICTHRSMACE.egg-info/requires.txt +0 -0
  28. {shicthrsmace-1.1.0 → shicthrsmace-1.3.0}/SHICTHRSMACE.egg-info/top_level.txt +0 -0
  29. {shicthrsmace-1.1.0 → shicthrsmace-1.3.0}/setup.cfg +0 -0
{shicthrsmace-1.1.0 → shicthrsmace-1.3.0}/PKG-INFO RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: SHICTHRSMACE
3
- Version: 1.1.0
3
+ Version: 1.3.0
4
4
  Summary: SHICTHRS MACE machine identity system
5
5
  Home-page: https://github.com/JNTMTMTM/SHICTHRS_MACE
6
6
  Author: SHICTHRS
{shicthrsmace-1.1.0 → shicthrsmace-1.3.0}/SHICTHRSMACE/SHRMACE_Data.py RENAMED
@@ -1,7 +1,8 @@
1
1
 
2
2
  class SHRMACEData():
3
3
  def __init__(self):
4
- self.SHRMACEResult : dict = {'WindowsUUID' : None ,
4
+ self.SHRMACEResult : dict = {'WindowsSystemInfo' : None ,
5
+ 'WindowsUUID' : None ,
5
6
  'WindowsProductId' : None ,
6
7
  'CPUINFO' : None ,
7
8
  'CPUID' : None ,
{shicthrsmace-1.1.0 → shicthrsmace-1.3.0}/SHICTHRSMACE/__init__.py RENAMED
@@ -28,5 +28,5 @@ def SHRMACE_get_mace_info() -> tuple:
28
28
 
29
29
  return (result , errro_list)
30
30
 
31
- except Exception as e:
32
- raise SHRMACEException(f'SHRMACEException [ERROR.2014] error occurred while getting mace info. | {e}')
31
+ except SHRMACEException as e:
32
+ raise SHRMACEException(f'SHRMACE [ERROR.2014] error occurred while getting mace info. | {e}')
{shicthrsmace-1.1.0 → shicthrsmace-1.3.0}/SHICTHRSMACE/api/SHRMACE_get_cpu_id.py RENAMED
@@ -13,6 +13,6 @@ def get_cpu_id(var) -> None:
13
13
  cpuid += cpu.ProcessorId.strip() + ' '
14
14
  var.SHRMACEResult['CPUID'] = copy.deepcopy(cpuid.strip().upper())
15
15
  except Exception as e:
16
- raise SHRMACEException(f'SHRMACEException [ERROR.2003] unable to get CPU id. | {str(e)}')
16
+ raise SHRMACEException(f'SHRMACE [ERROR.2003] unable to get CPU id. | {str(e)}')
17
17
  finally:
18
18
  pythoncom.CoUninitialize()
{shicthrsmace-1.1.0 → shicthrsmace-1.3.0}/SHICTHRSMACE/api/SHRMACE_get_cpu_info.py RENAMED
@@ -8,4 +8,4 @@ def get_cpu_info(var) -> None:
8
8
  output = subprocess.check_output('wmic cpu get name' , shell=True).decode().split('\n')[1].strip()
9
9
  var.SHRMACEResult['CPUINFO'] = copy.deepcopy(output if output else None)
10
10
  except Exception as e:
11
- raise SHRMACEException(f'SHRMACEException [ERROR.2002] unable to get CPU info. | {str(e)}')
11
+ raise SHRMACEException(f'SHRMACE [ERROR.2002] unable to get CPU info. | {str(e)}')
{shicthrsmace-1.1.0 → shicthrsmace-1.3.0}/SHICTHRSMACE/api/SHRMACE_get_cpu_vendor.py RENAMED
@@ -15,6 +15,6 @@ def get_cpu_vendor(var) -> None:
15
15
  elif 'amd' in manufacturer or 'amd' in name:
16
16
  var.SHRMACEResult['CPUVendor'] = 'amd'
17
17
  except Exception as e:
18
- raise SHRMACEException(f'SHRMACEException [ERROR.2004] unable to get CPU vendor. | {str(e)}')
18
+ raise SHRMACEException(f'SHRMACE [ERROR.2004] unable to get CPU vendor. | {str(e)}')
19
19
  finally:
20
20
  pythoncom.CoUninitialize()
{shicthrsmace-1.1.0 → shicthrsmace-1.3.0}/SHICTHRSMACE/api/SHRMACE_get_disk_id.py RENAMED
@@ -13,6 +13,6 @@ def get_disk_id(var) -> None:
13
13
  Disk_ID += physical_disk.SerialNumber + ' '
14
14
  var.SHRMACEResult['DiskID'] = copy.deepcopy(Disk_ID.strip().upper())
15
15
  except Exception as e:
16
- raise SHRMACEException(f'SHRMACEException [ERROR.2010] unable to get disk id. | {str(e)}')
16
+ raise SHRMACEException(f'SHRMACE [ERROR.2010] unable to get disk id. | {str(e)}')
17
17
  finally:
18
18
  pythoncom.CoUninitialize()
{shicthrsmace-1.1.0 → shicthrsmace-1.3.0}/SHICTHRSMACE/api/SHRMACE_get_disk_info.py RENAMED
@@ -25,7 +25,7 @@ def get_disk_info(var) -> None:
25
25
  "DISK_PARTITION" : []
26
26
  }
27
27
  except Exception as e:
28
- raise SHRMACEException(f'SHRMACEException [ERROR.2009.0] error occurred while getting disk info. | {str(e)}')
28
+ raise SHRMACEException(f'SHRMACE [ERROR.2009.0] error occurred while getting disk info. | {str(e)}')
29
29
 
30
30
  try:
31
31
  for partition in physical_disk.associators("Win32_DiskDriveToDiskPartition"):
@@ -42,10 +42,10 @@ def get_disk_info(var) -> None:
42
42
  result.append(disk_info)
43
43
  var.SHRMACEResult['DiskINFO'] = copy.deepcopy(result)
44
44
  except Exception as e:
45
- raise SHRMACEException(f'SHRMACEException [ERROR.2009.1] error occurred while getting disk DISK_PARTITION info. | {str(e)}')
45
+ raise SHRMACEException(f'SHRMACE [ERROR.2009.1] error occurred while getting disk DISK_PARTITION info. | {str(e)}')
46
46
 
47
47
  except Exception as e:
48
- raise SHRMACEException(f'SHRMACEException [ERROR.2009] unable to get disk info. | {str(e)}')
48
+ raise SHRMACEException(f'SHRMACE [ERROR.2009] unable to get disk info. | {str(e)}')
49
49
 
50
50
  finally:
51
51
  pythoncom.CoUninitialize()
{shicthrsmace-1.1.0 → shicthrsmace-1.3.0}/SHICTHRSMACE/api/SHRMACE_get_gpu_id.py RENAMED
@@ -11,4 +11,4 @@ def get_gpu_id(var) -> None:
11
11
  device_id = lines[-1]
12
12
  var.SHRMACEResult['GPUID'] = copy.deepcopy(device_id)
13
13
  except Exception as e:
14
- raise SHRMACEException(f'SHRMACEException [ERROR.2008] unable to get GPU id. | {str(e)}')
14
+ raise SHRMACEException(f'SHRMACE [ERROR.2008] unable to get GPU id. | {str(e)}')
{shicthrsmace-1.1.0 → shicthrsmace-1.3.0}/SHICTHRSMACE/api/SHRMACE_get_gpu_info.py RENAMED
@@ -9,4 +9,4 @@ def get_gpu_info(var) -> None:
9
9
  gpus = [line.strip() for line in output.splitlines() if line.strip() and 'Name' not in line]
10
10
  var.SHRMACEResult['GPUINFO'] = copy.deepcopy(gpus[-1] if gpus else "Unknown GPU")
11
11
  except Exception as e:
12
- raise SHRMACEException(f'SHRMACEException [ERROR.2007] unable to get GPU info. | {str(e)}')
12
+ raise SHRMACEException(f'SHRMACE [ERROR.2007] unable to get GPU info. | {str(e)}')
{shicthrsmace-1.1.0 → shicthrsmace-1.3.0}/SHICTHRSMACE/api/SHRMACE_get_mac_info.py RENAMED
@@ -9,4 +9,4 @@ def get_mac_info(var) -> None:
9
9
  mac_address = '-'.join([mac_address[i:i+2] for i in range(0, 11, 2)])
10
10
  var.SHRMACEResult['MACAddress'] = copy.deepcopy(mac_address)
11
11
  except Exception as e:
12
- raise SHRMACEException(f'SHRMACEException [ERROR.2012] unable to get MAC info. | {str(e)}')
12
+ raise SHRMACEException(f'SHRMACE [ERROR.2012] unable to get MAC info. | {str(e)}')
{shicthrsmace-1.1.0 → shicthrsmace-1.3.0}/SHICTHRSMACE/api/SHRMACE_get_mb_id.py RENAMED
@@ -13,6 +13,6 @@ def get_mb_id(var) -> None:
13
13
  MB_ID += board_id.SerialNumber + ' '
14
14
  var.SHRMACEResult['MotherBoardID'] = copy.deepcopy(MB_ID.strip().upper())
15
15
  except Exception as e:
16
- raise SHRMACEException(f'SHRMACEException [ERROR.2006] unable to get MotherBoard id. | {str(e)}')
16
+ raise SHRMACEException(f'SHRMACE [ERROR.2006] unable to get MotherBoard id. | {str(e)}')
17
17
  finally:
18
18
  pythoncom.CoUninitialize()
{shicthrsmace-1.1.0 → shicthrsmace-1.3.0}/SHICTHRSMACE/api/SHRMACE_get_mb_info.py RENAMED
@@ -13,6 +13,6 @@ def get_mb_info(var) -> None:
13
13
  MB_INFO = board.Manufacturer + board.Product
14
14
  var.SHRMACEResult['MotherBoardINFO'] = copy.deepcopy(MB_INFO)
15
15
  except Exception as e:
16
- raise SHRMACEException(f'SHRMACEException [ERROR.2005] unable to get MotherBoard info. | {str(e)}')
16
+ raise SHRMACEException(f'SHRMACE [ERROR.2005] unable to get MotherBoard info. | {str(e)}')
17
17
  finally:
18
18
  pythoncom.CoUninitialize()
{shicthrsmace-1.1.0 → shicthrsmace-1.3.0}/SHICTHRSMACE/api/SHRMACE_get_mem_info.py RENAMED
@@ -32,4 +32,4 @@ def get_mem_info(var) -> None:
32
32
  var.SHRMACEResult['MemeroyINFO'] = copy.deepcopy(modules)
33
33
 
34
34
  except Exception as e:
35
- raise SHRMACEException(f'SHRMACEException [ERROR.2011] unable to get memory info. | {str(e)}')
35
+ raise SHRMACEException(f'SHRMACE [ERROR.2011] unable to get memory info. | {str(e)}')
{shicthrsmace-1.1.0 → shicthrsmace-1.3.0}/SHICTHRSMACE/api/SHRMACE_get_pdc_id.py RENAMED
@@ -12,4 +12,4 @@ def get_pdc_id(var) -> None:
12
12
  winreg.CloseKey(key)
13
13
  var.SHRMACEResult['WindowsProductId'] = copy.deepcopy(value)
14
14
  except Exception as e:
15
- raise SHRMACEException(f'SHRMACEException [ERROR.2001] unable to get WindowsProductID. | {str(e)}')
15
+ raise SHRMACEException(f'SHRMACE [ERROR.2001] unable to get WindowsProductID. | {str(e)}')
shicthrsmace-1.3.0/SHICTHRSMACE/api/SHRMACE_get_system_info.py ADDED
@@ -0,0 +1,41 @@
1
+
2
+ import platform
3
+ import copy
4
+ from ..SHRMACE_ErrorBase import SHRMACEException
5
+
6
+ MEM_INFO_COMMAND : str = 'wmic memorychip get Manufacturer, PartNumber, SerialNumber, Capacity, Speed, DeviceLocator, MemoryType, FormFactor'
7
+
8
+ def get_system_info(var) -> None:
9
+ try:
10
+ os_name : str = platform.system()
11
+ os_version : str = platform.version()
12
+ architecture : str = platform.architecture()[0]
13
+ architecture_type : str = platform.architecture()[1]
14
+ system_type : str = get_win_platform()
15
+ result : dict = {'os_name' : os_name , 'os_version' : os_version ,
16
+ 'architecture' : architecture , 'architecture_type' : architecture_type ,
17
+ 'platform' : system_type}
18
+ var.SHRMACEResult['WindowsSystemInfo'] = copy.deepcopy(result)
19
+ except Exception as e:
20
+ raise SHRMACEException(f'SHRMACE [ERROR.2014] unable to system info | {str(e)}')
21
+
22
+
23
+ def get_win_platform() -> str:
24
+ version = platform.version().split('.')
25
+
26
+ if len(version) < 3:
27
+ raise SHRMACEException(f'SHRMACE [ERROR.2014.0] windows version is not supported')
28
+
29
+ major = int(version[0])
30
+ minor = int(version[1])
31
+ build = int(version[2])
32
+
33
+ if major == 10 and minor == 0:
34
+ if build >= 22000:
35
+ return "windows 11"
36
+
37
+ elif build >= 10240:
38
+ return "windows 10"
39
+ else:
40
+ raise SHRMACEException(f'SHRMACE [ERROR.2014.1] windows version only support 10.0.22000 and above')
41
+
{shicthrsmace-1.1.0 → shicthrsmace-1.3.0}/SHICTHRSMACE/api/SHRMACE_get_uuid.py RENAMED
@@ -11,6 +11,6 @@ def get_uuid(var) -> None:
11
11
  for system in c.Win32_ComputerSystemProduct():
12
12
  var.SHRMACEResult['WindowsUUID'] = copy.deepcopy(system.UUID)
13
13
  except Exception as e:
14
- raise SHRMACEException(f'SHRMACEException [ERROR.2000] unable to get uuid. | {str(e)}')
14
+ raise SHRMACEException(f'SHRMACE [ERROR.2000] unable to get uuid. | {str(e)}')
15
15
  finally:
16
16
  pythoncom.CoUninitialize()
{shicthrsmace-1.1.0 → shicthrsmace-1.3.0}/SHICTHRSMACE/utils/SHRMACE_dispatcher.py RENAMED
@@ -2,6 +2,7 @@
2
2
  import threading
3
3
  from ..SHRMACE_ErrorBase import SHRMACEException
4
4
  from ..SHRMACE_Data import SHRMACEData
5
+ from ..api.SHRMACE_get_system_info import get_system_info
5
6
  from ..api.SHRMACE_get_uuid import get_uuid
6
7
  from ..api.SHRMACE_get_pdc_id import get_pdc_id
7
8
  from ..api.SHRMACE_get_cpu_info import get_cpu_info
@@ -15,7 +16,7 @@ from ..api.SHRMACE_get_disk_info import get_disk_info
15
16
  from ..api.SHRMACE_get_mem_info import get_mem_info
16
17
  from ..api.SHRMACE_get_mac_info import get_mac_info
17
18
 
18
- MACE_PROCESS_LIST : list = [get_uuid , get_pdc_id , get_cpu_info ,
19
+ MACE_PROCESS_LIST : list = [get_system_info , get_uuid , get_pdc_id , get_cpu_info ,
19
20
  get_cpu_id , get_cpu_vendor , get_mb_info ,
20
21
  get_mb_id , get_gpu_info , get_gpu_id ,
21
22
  get_disk_info , get_mem_info , get_mac_info]
@@ -46,5 +47,5 @@ def SHRMACE_mace_info_dispatcher() -> dict:
46
47
  return var.SHRMACEResult
47
48
 
48
49
  except Exception as e:
49
- raise SHRMACEException(f'SHRMACEException [ERROR.2013] error occurred while getting creating threads pool. | {e}')
50
+ raise SHRMACEException(f'SHRMACE [ERROR.2013] error occurred while getting creating threads pool. | {e}')
50
51
 
{shicthrsmace-1.1.0 → shicthrsmace-1.3.0}/SHICTHRSMACE.egg-info/PKG-INFO RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: SHICTHRSMACE
3
- Version: 1.1.0
3
+ Version: 1.3.0
4
4
  Summary: SHICTHRS MACE machine identity system
5
5
  Home-page: https://github.com/JNTMTMTM/SHICTHRS_MACE
6
6
  Author: SHICTHRS
{shicthrsmace-1.1.0 → shicthrsmace-1.3.0}/SHICTHRSMACE.egg-info/SOURCES.txt RENAMED
@@ -20,6 +20,7 @@ SHICTHRSMACE/api/SHRMACE_get_mb_id.py
20
20
  SHICTHRSMACE/api/SHRMACE_get_mb_info.py
21
21
  SHICTHRSMACE/api/SHRMACE_get_mem_info.py
22
22
  SHICTHRSMACE/api/SHRMACE_get_pdc_id.py
23
+ SHICTHRSMACE/api/SHRMACE_get_system_info.py
23
24
  SHICTHRSMACE/api/SHRMACE_get_uuid.py
24
25
  SHICTHRSMACE/api/__init__.py
25
26
  SHICTHRSMACE/utils/SHRMACE_dispatcher.py
{shicthrsmace-1.1.0 → shicthrsmace-1.3.0}/setup.py RENAMED
@@ -1,7 +1,7 @@
1
1
  from setuptools import setup, find_packages
2
2
 
3
3
  setup(name='SHICTHRSMACE',
4
- version='1.1.0',
4
+ version='1.3.0',
5
5
  description='SHICTHRS MACE machine identity system',
6
6
  url='https://github.com/JNTMTMTM/SHICTHRS_MACE',
7
7
  author='SHICTHRS',
{shicthrsmace-1.1.0 → shicthrsmace-1.3.0}/setup.cfg RENAMED
File without changes