pyhw 0.11.7__py3-none-any.whl → 0.11.9__py3-none-any.whl

pyhw/__init__.py

@@ -1 +1 @@
-__version__ = '0.11.7'
+__version__ = '0.11.9'

pyhw/backend/host/linux.py

@@ -26,13 +26,13 @@ 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
                     with open("/sys/devices/virtual/dmi/id/product_version", "r") as f:
                         version = f.read().strip()
-                        if version.startswith("To be filled by O.E.M."):
+                        if version.startswith("To be filled by O.E.M.") or product_name.startswith("Default string"):
                             self._hostInfo.version = ""
                         else:
                             self._hostInfo.version = version

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/backend/shell/shellInfo.py

@@ -4,6 +4,9 @@ from dataclasses import dataclass
 @dataclass
 class ShellInfo:
     def __init__(self):
+        """
+        ShellInfo class. Attribute info is required.
+        """
         self.shell = ""
         self.version = ""
         self.path = ""

pyhw/backend/shell/windows.py

@@ -5,6 +5,7 @@ from ...pyhwException import BackendException
 from .shellInfo import ShellInfo
 import json
 import subprocess
+import os
 
 
 class ShellDetectWindows:
@@ -12,6 +13,27 @@ class ShellDetectWindows:
         self.__shellInfo = ShellInfo()
 
     def getShellInfo(self):
+        if not self.__getShellBash():
+            self.__getShellPowerShell()
+        self.__shellInfo.info = self.__shellInfo.shell + " " + self.__shellInfo.version
+        return self.__shellInfo
+
+    def __getShellBash(self) -> bool:
+        try:
+            shell_env = os.getenv("SHELL", "")
+            if "bash" in shell_env:
+                self.__shellInfo.shell = "bash"
+                self.__shellInfo.path = shell_env
+                result = subprocess.run(["bash", "-c", "echo $BASH_VERSION"], capture_output=True, text=True)
+                self.__shellInfo.version = result.stdout.strip().split("(")[0]
+                self.__shellInfo.info = self.__shellInfo.shell + " " + self.__shellInfo.version
+                return True
+            else:
+                return False
+        except:
+            return False
+
+    def __getShellPowerShell(self):
         COMMAND = "$PSVersionTable.PSVersion | ConvertTo-JSON"
 
         try:
@@ -25,5 +47,3 @@ class ShellDetectWindows:
 
         self.__shellInfo.shell = "PowerShell"
         self.__shellInfo.version = f"{major}.{minor}"
-        self.__shellInfo.info = f"PowerShell {major}.{minor}"
-        return self.__shellInfo

{pyhw-0.11.7.dist-info → pyhw-0.11.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: pyhw
-Version: 0.11.7
+Version: 0.11.9
 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.7.dist-info → pyhw-0.11.9.dist-info}/RECORD

@@ -1,4 +1,4 @@
-pyhw/__init__.py,sha256=ym3HELiHS5Mp3OBGyRihieTVc505lLMaOerZDCHLXCE,23
+pyhw/__init__.py,sha256=ZB-5GtuYKdZV45Kzpsu1hjO7QDZzBW0Q7jn8K1ls6Gg,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=aU-tWTI2Wjg1HCx2lGFenoaiM94axutXmL7Auu8ilhM,2925
 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
@@ -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
@@ -59,9 +59,9 @@ pyhw/backend/os/osInfo.py,sha256=NEr76aicI9N3SFrwi1skcpUEjzsyCryTjdE9X1nBjBM,536
 pyhw/backend/os/windows.py,sha256=xjU8NaQwcLusuRw6J7RwwwJiGSv5H_LRBvg2LYEyvNg,1514
 pyhw/backend/shell/__init__.py,sha256=SeQ7OLNSl_V1JCCWnJGjLilAWiSe9e5kgsMEt63TMS0,62
 pyhw/backend/shell/shellBase.py,sha256=829rchiqXfyA-oKT81mkGGoKBjZflM5NHIRs0_ZSwaY,531
-pyhw/backend/shell/shellInfo.py,sha256=pU32_Akg0TDVFprTfPYaOKWcFkijJkm0FOowfILNRKk,184
+pyhw/backend/shell/shellInfo.py,sha256=8Z2geV-2agtpKQl1OJ58cdiEiyVsCbC59AL3MgYnY_E,261
 pyhw/backend/shell/unix.py,sha256=qTP3Mk8prI2lnQmUJ41G1Fgu1l8nGn9PB3pyBoewtJg,2010
-pyhw/backend/shell/windows.py,sha256=_Ou4QFkS-_K8xMjxw9X3N0t5duZCa3LnMhft_aiPuE0,854
+pyhw/backend/shell/windows.py,sha256=FT8m7pijSw0vtAEtES25ulFCmEyziNor4B7o9q1E-Q8,1639
 pyhw/backend/title/__init__.py,sha256=l6_WqreSBeK7krapCrbrr4ndnydrXB1aZ50Ve-beV_w,62
 pyhw/backend/title/titleBase.py,sha256=RVWwtTea8G1MutrN3Ttkjky9wwVtRxnHIsOJKpBbvF8,519
 pyhw/backend/title/titleInfo.py,sha256=lUsbQNx80MLHuSCgMzWhc72mj0ykcRuWngn9wydYSos,166
@@ -105,15 +105,16 @@ pyhw/frontend/logo/ascii/windows_11.pyhw,sha256=VuQTzbBabaEQhm2JBVhy6Ja6lClUGacQ
 pyhw/frontend/logo/ascii/windows_2025.pyhw,sha256=o8eWsiyhNpDoEjiWFiBMfkd-8MdIslGc1Jpm85LU4P8,643
 pyhw/frontend/logo/ascii/windows_old.pyhw,sha256=AMsvWAZ50HM8lweWEmzDWbRNDGkKFJo9qLY_VRKrciY,580
 pyhw/library/lib/iokitGPULib.dylib,sha256=KAz0VyeRspD3U7WeedUnPvJVUZEKn_Pw0AKk5zm42ZM,154808
+pyhw/library/lib/iokitHostLib.dylib,sha256=PKNLMhHwB6-sKDaeo3izbPR88OgzjuRGaLV0NvNWVRk,149256
 pyhw/pyhwException/__init__.py,sha256=8JsFvtF13g0Y5t4z9fRndDXtfCzuBM59jDf6PhWSFSk,220
 pyhw/pyhwException/pyhwException.py,sha256=wxuzFQa9g7XB1q9TUKO_55lw7wMEJMpzG8w1GVTFVa0,197
 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.7.dist-info/LICENSE,sha256=hJs6RBqSVCexbTsalkMLNFI5t06kekQEsSVaOt_-yLs,1497
-pyhw-0.11.7.dist-info/METADATA,sha256=wJX9m2nSsRbMMLc8JyAAOF8dhESIYe1Um-Ib_FDK0a8,6753
-pyhw-0.11.7.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-pyhw-0.11.7.dist-info/entry_points.txt,sha256=q-AB8im_QahpmNrmy4aPTJRGi0LlbNlnI3kF7s6pKss,44
-pyhw-0.11.7.dist-info/top_level.txt,sha256=7Inxvxt1TngEricKZEex9_WJZS3DbKYFUXDz4v5WHYU,5
-pyhw-0.11.7.dist-info/RECORD,,
+pyhw-0.11.9.dist-info/LICENSE,sha256=hJs6RBqSVCexbTsalkMLNFI5t06kekQEsSVaOt_-yLs,1497
+pyhw-0.11.9.dist-info/METADATA,sha256=MAmJ5-P9M0YXtyoszz49Lau58TDcfuZNHZpXfxit3oY,6753
+pyhw-0.11.9.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
+pyhw-0.11.9.dist-info/entry_points.txt,sha256=q-AB8im_QahpmNrmy4aPTJRGi0LlbNlnI3kF7s6pKss,44
+pyhw-0.11.9.dist-info/top_level.txt,sha256=7Inxvxt1TngEricKZEex9_WJZS3DbKYFUXDz4v5WHYU,5
+pyhw-0.11.9.dist-info/RECORD,,

{pyhw-0.11.7.dist-info → pyhw-0.11.9.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.8.0)
+Generator: setuptools (75.8.2)
 Root-Is-Purelib: true
 Tag: py3-none-any