pyhw 0.11.6__py3-none-any.whl → 0.11.8__py3-none-any.whl

pyhw/__init__.py

@@ -1 +1 @@
-__version__ = '0.11.6'
+__version__ = '0.11.8'

pyhw/backend/host/linux.py

@@ -26,7 +26,7 @@ class HostDetectLinux:
                 try:
                     with open("/sys/devices/virtual/dmi/id/product_name", "r") as f:
                         product_name = f.read().strip()
-                        if product_name.startswith("To be filled by O.E.M."):
+                        if product_name.startswith("To be filled by O.E.M.") or product_name.startswith("Default string"):
                             self._hostInfo.name = f"General {self._arch} Host"
                         else:
                             self._hostInfo.name = product_name

pyhw/backend/memory/bsd.py

@@ -1,11 +1,25 @@
 from .linux import MemoryDetectLinux
+from ...pyhwUtil import sysctlGetInt
 
 
 class MemoryDetectBSD(MemoryDetectLinux):
     def __init__(self):
         MemoryDetectLinux.__init__(self)
+        self.__page_size = 0
+        self.__physical_memory = 0
+        self.__free_pages = 0
+        self.__free_memory = 0
 
     def getMemoryInfo(self):
-        self._memoryInfo.memory = f"Pass"
+        self.__getMemorySysctl()
+        self._memoryInfo.total = self.__physical_memory / 1024 / 1024  # Convert bytes to MiB
+        self._memoryInfo.used = (self.__physical_memory - self.__free_memory) / 1024 / 1024  # Convert bytes to MiB
+        self._memoryInfo.memory = f"{round(self._memoryInfo.used, 2)} MiB / {round(self._memoryInfo.total, 2)} MiB"
         return self._memoryInfo
 
+    def __getMemorySysctl(self):
+        self.__page_size = sysctlGetInt("hw.pagesize")
+        self.__physical_memory = sysctlGetInt("hw.physmem")
+        self.__free_pages = sysctlGetInt("vm.stats.vm.v_free_count")
+        self.__free_memory = self.__free_pages * self.__page_size
+

pyhw/backend/npu/macos.py

@@ -46,20 +46,20 @@ class NPUDetectMacOS:
         # see https://apple.fandom.com/wiki/Neural_Engine for more details.
         model_name = CPUDetect(os=getOS()).getCPUInfo().model
         npu = {
-            "Apple M1": "Apple Neural Engine 16 Cores (5 nm) [SOC Integrated]",
-            "Apple M1 Pro": "Apple Neural Engine 16 Cores (5 nm) [SOC Integrated]",
-            "Apple M1 Max": "Apple Neural Engine 16 Cores (5 nm) [SOC Integrated]",
-            "Apple M1 Ultra": "Apple Neural Engine 32 Cores (5 nm) [SOC Integrated]",
-            "Apple M2": "Apple Neural Engine 16 Cores (5 nm) [SOC Integrated]",
-            "Apple M2 Pro": "Apple Neural Engine 16 Cores (5 nm) [SOC Integrated]",
-            "Apple M2 Max": "Apple Neural Engine 16 Cores (5 nm) [SOC Integrated]",
-            "Apple M2 Ultra": "Apple Neural Engine 32 Cores (5 nm) [SOC Integrated]",
-            "Apple M3": "Apple Neural Engine 16 Cores (3 nm) [SOC Integrated]",
-            "Apple M3 Pro": "Apple Neural Engine 16 Cores (3 nm) [SOC Integrated]",
-            "Apple M3 Max": "Apple Neural Engine 16 Cores (3 nm) [SOC Integrated]",
-            "Apple M4": "Apple Neural Engine 16 Cores (3 nm) [SOC Integrated]",
-            "Apple M4 Pro": "Apple Neural Engine 16 Cores (3 nm) [SOC Integrated]",
-            "Apple M4 Max": "Apple Neural Engine 16 Cores (3 nm) [SOC Integrated]"
+            "Apple M1": "Apple Neural Engine 16 Cores (5nm) [SOC Integrated]",
+            "Apple M1 Pro": "Apple Neural Engine 16 Cores (5nm) [SOC Integrated]",
+            "Apple M1 Max": "Apple Neural Engine 16 Cores (5nm) [SOC Integrated]",
+            "Apple M1 Ultra": "Apple Neural Engine 32 Cores (5nm) [SOC Integrated]",
+            "Apple M2": "Apple Neural Engine 16 Cores (5nm) [SOC Integrated]",
+            "Apple M2 Pro": "Apple Neural Engine 16 Cores (5nm) [SOC Integrated]",
+            "Apple M2 Max": "Apple Neural Engine 16 Cores (5nm) [SOC Integrated]",
+            "Apple M2 Ultra": "Apple Neural Engine 32 Cores (5nm) [SOC Integrated]",
+            "Apple M3": "Apple Neural Engine 16 Cores (3nm) [SOC Integrated]",
+            "Apple M3 Pro": "Apple Neural Engine 16 Cores (3nm) [SOC Integrated]",
+            "Apple M3 Max": "Apple Neural Engine 16 Cores (3nm) [SOC Integrated]",
+            "Apple M4": "Apple Neural Engine 16 Cores (3nm) [SOC Integrated]",
+            "Apple M4 Pro": "Apple Neural Engine 16 Cores (3nm) [SOC Integrated]",
+            "Apple M4 Max": "Apple Neural Engine 16 Cores (3nm) [SOC Integrated]"
         }
         return npu.get(model_name, "Not Found")
 

{pyhw-0.11.6.dist-info → pyhw-0.11.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: pyhw
-Version: 0.11.6
+Version: 0.11.8
 Summary: PyHw, a neofetch-like command line tool for fetching system information but written mostly in python.
 Author: Xiao Ran
 Maintainer-email: Xiao Ran <xiaoran.007@icloud.com>

{pyhw-0.11.6.dist-info → pyhw-0.11.8.dist-info}/RECORD

@@ -1,4 +1,4 @@
-pyhw/__init__.py,sha256=tGnbKnxafgSWC1j3ohCpMaMVSG8meN6pcRsWJ6sINKE,23
+pyhw/__init__.py,sha256=jcnaRLOloebxPmJzoiCEcFULMJYe9S5i13qB67zUiC8,23
 pyhw/__main__.py,sha256=oZpFtvSyYTM8cMsulvi51zJV0gtmw3OCQVdgoaHbtxc,4977
 pyhw/backend/__init__.py,sha256=knn_3Yroow1h0dqdrozk3zyy3vz-kQyNBRjR6OLmVoY,50
 pyhw/backend/backendBase.py,sha256=mloo8mPEbgbIdmyQ3I4vdEXMSSjxWi_wnwACmzvHbEo,506
@@ -20,7 +20,7 @@ pyhw/backend/host/__init__.py,sha256=Efaj7-Oya7H8HdpZHQCLrwn-mcfPb-d6yfh4dzsE_7I
 pyhw/backend/host/bsd.py,sha256=9gKnM6yysHBKwS3EQvb0pCeylh3dzHvoEuPe14zo9wQ,382
 pyhw/backend/host/hostBase.py,sha256=gM49SY6rEaxec_0bUOMk7QlEfR7vjfWp3BXEUqgdncc,762
 pyhw/backend/host/hostInfo.py,sha256=grz15M2t3f_enqQvc7Qn6HlEfYwa66bu2NYvm8VpJ-g,452
-pyhw/backend/host/linux.py,sha256=alqNkp-yn7xoVXcQXxvJFXVOv7azvu3_4QQi-3P7s8g,2835
+pyhw/backend/host/linux.py,sha256=B7H8p37_BYvfhyq8g-zqKQbsIcO2kjeKBGwrJWY3tsY,2880
 pyhw/backend/host/macos.py,sha256=KW-EJK9g1xHNrFsVxJv5GPLpc_ZevX0Zv1WjZUzRkzo,15369
 pyhw/backend/host/windows.py,sha256=qn2QiTK2wIijyyw_QKdiSizY3teyS-9RNBu5RxEPRSw,1185
 pyhw/backend/kernel/__init__.py,sha256=fGjwjpOhwA_PnsWbwoq102hwhTay2ufYKaTqxjSV2-I,65
@@ -29,7 +29,7 @@ pyhw/backend/kernel/kernelInfo.py,sha256=Nkumd0McbimCjc7yJrvz6bcwpWu1Tdo_LKomjZr
 pyhw/backend/kernel/unix.py,sha256=XDV2GIjamERcmlrQFaKFZY-OJO1xj76Im_7lmg2uFzo,1192
 pyhw/backend/kernel/windows.py,sha256=MpY6S54VYQ_5l4f93GLOaXd4l-uIjg_k6AEYftkgvcc,1246
 pyhw/backend/memory/__init__.py,sha256=zGBWxfPAAk8ivCBWPLJIpuD-lB7wUJT3x8u2jHiAoCY,65
-pyhw/backend/memory/bsd.py,sha256=GKTCs6RocdoWj-5ZZRMB4xAWGWljor6leuwX-L-7bW0,251
+pyhw/backend/memory/bsd.py,sha256=_Yv2W6T-h5ULqOQHp0dGYJvxPDzlPEkFiusYMKPxTHY,1014
 pyhw/backend/memory/linux.py,sha256=kxP0LxXdTWYRtu9nDyKqZeIzZrQI84kVOPMeN1GwSOo,917
 pyhw/backend/memory/macos.py,sha256=ur2HxmmmVkXmaxEcw_otphifVp_csfNMJdgt-idCq7M,2770
 pyhw/backend/memory/memoryBase.py,sha256=trubcJ_7JD_FnrKefUycPFd4OZMFj3Rk75ih5YVsSXg,790
@@ -46,7 +46,7 @@ pyhw/backend/nic/windows.py,sha256=c67JwHARtPxNsZ-0_MVKUfc7DwpsRVn7kiHdx_NyDn8,1
 pyhw/backend/npu/__init__.py,sha256=PgLKbwpgT5vw9xpa294Zxb94McyxNXW46_vMbT2Iqyc,58
 pyhw/backend/npu/bsd.py,sha256=eKkOWZ4MBybR_KOGGcsWUpzCGgghhvuBy5VNsnEE8cI,134
 pyhw/backend/npu/linux.py,sha256=fPsaXClSC-Py2kHRi17y4eGWrjwRDmjsIX4lgMxRVPc,1806
-pyhw/backend/npu/macos.py,sha256=qOIXfWILnA-sAKH6nq_cep7BlH0rKk4bglc1VgyKp6U,2625
+pyhw/backend/npu/macos.py,sha256=QQxm9K6bmIdKLiaW7buNUZ_YOdfcEKz9mWPS5xVN2kY,2611
 pyhw/backend/npu/npuBase.py,sha256=1cVWRmr8g-mDXrJAx2cUO4qWZft2TtT7L2-HzRot2nI,748
 pyhw/backend/npu/npuInfo.py,sha256=82dK6XvW_XKw4O5-RfR4-qQRR7Plh8qqJLj0YDzISmU,135
 pyhw/backend/npu/windows.py,sha256=Z2v5CORSa1ap66k48G7uVLbon3zaoT4ug5sX2_rt6vM,1196
@@ -111,9 +111,9 @@ pyhw/pyhwUtil/__init__.py,sha256=34ygvVBBqfJ_9OMzHToCcV_BVahixNsa_Z5yh6VsaPQ,304
 pyhw/pyhwUtil/cliUtil.py,sha256=42Gdi9wTg5XOYuEvGHEgOaZJ6dJk1qSuHIprR8pCA-g,2344
 pyhw/pyhwUtil/pyhwUtil.py,sha256=RokrE7X99pkS0LtN4wyJS_ZQmjtMwiNxA7MwXMoO96c,7664
 pyhw/pyhwUtil/sysctlUtil.py,sha256=S-rUvqi7ZrMyMouIhxlyHEQ4agM7sCT1Y7uzs3Hu5-o,841
-pyhw-0.11.6.dist-info/LICENSE,sha256=hJs6RBqSVCexbTsalkMLNFI5t06kekQEsSVaOt_-yLs,1497
-pyhw-0.11.6.dist-info/METADATA,sha256=tyAe-kfwUGwwUM23D7NG8s2OqcNzOjKCr0Z7mNp-NGg,6753
-pyhw-0.11.6.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-pyhw-0.11.6.dist-info/entry_points.txt,sha256=q-AB8im_QahpmNrmy4aPTJRGi0LlbNlnI3kF7s6pKss,44
-pyhw-0.11.6.dist-info/top_level.txt,sha256=7Inxvxt1TngEricKZEex9_WJZS3DbKYFUXDz4v5WHYU,5
-pyhw-0.11.6.dist-info/RECORD,,
+pyhw-0.11.8.dist-info/LICENSE,sha256=hJs6RBqSVCexbTsalkMLNFI5t06kekQEsSVaOt_-yLs,1497
+pyhw-0.11.8.dist-info/METADATA,sha256=EEeAejM_nQmGqONkUoDhJXCY1rD9OE4L3tbqOVv3cIE,6753
+pyhw-0.11.8.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+pyhw-0.11.8.dist-info/entry_points.txt,sha256=q-AB8im_QahpmNrmy4aPTJRGi0LlbNlnI3kF7s6pKss,44
+pyhw-0.11.8.dist-info/top_level.txt,sha256=7Inxvxt1TngEricKZEex9_WJZS3DbKYFUXDz4v5WHYU,5
+pyhw-0.11.8.dist-info/RECORD,,