pyhw 0.12.0__py3-none-any.whl → 0.12.2__py3-none-any.whl

pyhw/__init__.py

@@ -1,2 +1,2 @@
-__version__ = '0.12.0'
+__version__ = '0.12.2'
 __author__ = 'xiaoran007'

pyhw/backend/gpu/macos.py

@@ -63,6 +63,10 @@ class GPUDetectMacOS:
             lib.getGPUInfo.restype = ctypes.c_char_p
             gpu_info = lib.getGPUInfo()
             gpus = gpu_info.decode('utf-8').split("; ")
+            # if the first element is "Error", it means that the library failed to get the GPU info
+            # Fall back to the default implementation
+            if gpus[0] == "Error":
+                return False
             self.__gpuInfo.number = len(gpus)
             for gpu in gpus:
                 info_list = gpu.split(", ")

pyhw/backend/host/linux.py

@@ -1,7 +1,4 @@
-"""
-    In dev.
-"""
-from ...pyhwUtil import getArch, getDocker
+from ...pyhwUtil import getArch, getDocker, getWSL
 from .hostInfo import HostInfo
 import os
 
@@ -11,6 +8,7 @@ class HostDetectLinux:
         self._hostInfo = HostInfo()
         self._arch = getArch()
         self._docker = getDocker()
+        self._wsl = getWSL()
 
     def getHostInfo(self):
         self._getModel()
@@ -21,6 +19,10 @@ class HostDetectLinux:
             self._hostInfo.name = f"General {self._arch} Docker Host"
             self._hostInfo.version = ""
             self._hostInfo.model = self._hostInfo.name + " " + self._hostInfo.version
+        if self._wsl:
+            self._hostInfo.name = f"Windows WSL {self._arch} Host"
+            self._hostInfo.version = ""
+            self._hostInfo.model = self._hostInfo.name + " " + self._hostInfo.version
         else:
             if self._arch in ["x86_64", "x86"]:
                 try:

pyhw/backend/host/macos.py

@@ -26,6 +26,10 @@ class HostDetectMacOS:
             lib.getHostInfo.restype = ctypes.c_char_p
             host_info = lib.getHostInfo()
             product_name = host_info.decode('utf-8').split("; ")
+            # If the first element is "Error", it means that the library failed to get the product name.
+            # Fall back to sysctl.
+            if product_name[0] == "Error":
+                return False
             self.__hostInfo.model = product_name[0]
             return True
         except Exception as e:

pyhw/pyhwUtil/__init__.py

@@ -1,5 +1,5 @@
-from .pyhwUtil import getOS, getArch, getDocker, createDataString, selectOSLogo
+from .pyhwUtil import getOS, getArch, getDocker, getWSL, createDataString, selectOSLogo
 from .sysctlUtil import sysctlGetString, sysctlGetInt
 from .cliUtil import ReleaseChecker
 
-__all__ = ["getOS", "getArch", "getDocker", "createDataString", "selectOSLogo", "sysctlGetString", "sysctlGetInt", "ReleaseChecker"]
+__all__ = ["getOS", "getArch", "getDocker", "getWSL", "createDataString", "selectOSLogo", "sysctlGetString", "sysctlGetInt", "ReleaseChecker"]

pyhw/pyhwUtil/pyhwUtil.py

@@ -51,6 +51,22 @@ def getDocker() -> bool:
     return os.path.exists("/.dockerenv")
 
 
+def getWSL() -> bool:
+    """
+    Check if the current environment is running in Windows Subsystem for Linux.
+    :return: bool, True if running in WSL, False otherwise.
+    """
+    try:
+        result = subprocess.run(['uname', '-r'], capture_output=True, text=True)
+        version = result.stdout.strip()
+        if "WSL" in version or "microsoft" in version:
+            return True
+        else:
+            return False
+    except subprocess.SubprocessError:
+        return False
+
+
 class DataStringProcessor:
     def __init__(self, data: Data):
         self.data = data

{pyhw-0.12.0.dist-info → pyhw-0.12.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: pyhw
-Version: 0.12.0
+Version: 0.12.2
 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>
@@ -15,6 +15,7 @@ Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: pypci-ng>=0.2.2
+Dynamic: license-file
 
 # PyHw
 [![Downloads](https://static.pepy.tech/badge/pyhw)](https://pepy.tech/project/pyhw)

{pyhw-0.12.0.dist-info → pyhw-0.12.2.dist-info}/RECORD

@@ -1,4 +1,4 @@
-pyhw/__init__.py,sha256=1Nlmoo_j_4-q3SPtcXRtyStFAWAOmvM8GbKrDECw-7c,49
+pyhw/__init__.py,sha256=1QLfcahq49a_qUvq04gBcKIq8vXdWeRvqxzFXc6ou4g,49
 pyhw/__main__.py,sha256=oZpFtvSyYTM8cMsulvi51zJV0gtmw3OCQVdgoaHbtxc,4977
 pyhw/backend/__init__.py,sha256=knn_3Yroow1h0dqdrozk3zyy3vz-kQyNBRjR6OLmVoY,50
 pyhw/backend/backendBase.py,sha256=mloo8mPEbgbIdmyQ3I4vdEXMSSjxWi_wnwACmzvHbEo,506
@@ -14,14 +14,14 @@ pyhw/backend/gpu/bsd.py,sha256=hNFiCek770CXOh3DK3I3-g272-a1S5D7LolGJBsLXaU,124
 pyhw/backend/gpu/gpuBase.py,sha256=ZPT9o7PhYpzlwign0GsCT519F9DGx-1UEMVVOM8MV_k,748
 pyhw/backend/gpu/gpuInfo.py,sha256=d_z_z5DiZAg85wP0VOBQEU0QHdaK3qFqA2Tp9Eq8-Zs,133
 pyhw/backend/gpu/linux.py,sha256=M6pRlu3GREMw1Gm7MA-dY_yYI94MliHW3tyS8JjMw5Q,1617
-pyhw/backend/gpu/macos.py,sha256=6p5Sxs2eN4ffWVx3nnpmfWmXVsuMRbp11TGcZOk-Zhg,3850
+pyhw/backend/gpu/macos.py,sha256=s-GZk_Q7K58nSOYuOIAYLRvLafwHyQtsWrPVe3CuXac,4068
 pyhw/backend/gpu/windows.py,sha256=Hv-vtWQGKv6_Nxc8raEBq7NNm5TR6xg6x6BK3Aa2uP4,1249
 pyhw/backend/host/__init__.py,sha256=Efaj7-Oya7H8HdpZHQCLrwn-mcfPb-d6yfh4dzsE_7I,58
 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=aU-tWTI2Wjg1HCx2lGFenoaiM94axutXmL7Auu8ilhM,2925
-pyhw/backend/host/macos.py,sha256=Ax3LVz1iYgm1G2XMWYEvhI4s6hLDYyaOn34NyhGZaxE,16083
+pyhw/backend/host/linux.py,sha256=xvbZrwlKN--tKMf4_YyN20cGTSIcV5yLG3Gez7M15Pk,3157
+pyhw/backend/host/macos.py,sha256=RgDjvi8RsAs9i-bHkcSdK--TaeyaxYzLXFZFMl8T6Eo,16295
 pyhw/backend/host/windows.py,sha256=qn2QiTK2wIijyyw_QKdiSizY3teyS-9RNBu5RxEPRSw,1185
 pyhw/backend/kernel/__init__.py,sha256=fGjwjpOhwA_PnsWbwoq102hwhTay2ufYKaTqxjSV2-I,65
 pyhw/backend/kernel/kernelBase.py,sha256=3ZmkRkvwoWk3R-by2cgBlZnMSQzVjTC8Owmv53Pm4II,539
@@ -109,13 +109,13 @@ pyhw/library/lib/iokitHostLib.dylib,sha256=0sdPRA-dtogsgPEgb-VN32on6oIJMT9PmRZ0w
 pyhw/library/test/iokitHostLibTest.py,sha256=oz5x1g4WMdoikU3Eo6zoxcHZ4e-UMRhXg0C0Lflo-ac,272
 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/__init__.py,sha256=KA7Bo0Equm5kKAE22mfTiRIJzCphZhT-K9YeWiR4e0k,322
 pyhw/pyhwUtil/cliUtil.py,sha256=42Gdi9wTg5XOYuEvGHEgOaZJ6dJk1qSuHIprR8pCA-g,2344
-pyhw/pyhwUtil/pyhwUtil.py,sha256=RokrE7X99pkS0LtN4wyJS_ZQmjtMwiNxA7MwXMoO96c,7664
+pyhw/pyhwUtil/pyhwUtil.py,sha256=9xiZ5_32-mR5HwiL8RUjkgGhzCWyASPsYl7D_8P0N6c,8152
 pyhw/pyhwUtil/sysctlUtil.py,sha256=S-rUvqi7ZrMyMouIhxlyHEQ4agM7sCT1Y7uzs3Hu5-o,841
-pyhw-0.12.0.dist-info/LICENSE,sha256=hJs6RBqSVCexbTsalkMLNFI5t06kekQEsSVaOt_-yLs,1497
-pyhw-0.12.0.dist-info/METADATA,sha256=mfp6kau--LwlCWXgX50udCY88uqeQMtq73bLM04QNMU,6753
-pyhw-0.12.0.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
-pyhw-0.12.0.dist-info/entry_points.txt,sha256=q-AB8im_QahpmNrmy4aPTJRGi0LlbNlnI3kF7s6pKss,44
-pyhw-0.12.0.dist-info/top_level.txt,sha256=7Inxvxt1TngEricKZEex9_WJZS3DbKYFUXDz4v5WHYU,5
-pyhw-0.12.0.dist-info/RECORD,,
+pyhw-0.12.2.dist-info/licenses/LICENSE,sha256=hJs6RBqSVCexbTsalkMLNFI5t06kekQEsSVaOt_-yLs,1497
+pyhw-0.12.2.dist-info/METADATA,sha256=WN4x-ulpxcKhcyd1PyqfkEtfyXP8dfez1N7Cbz1_qZU,6775
+pyhw-0.12.2.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+pyhw-0.12.2.dist-info/entry_points.txt,sha256=q-AB8im_QahpmNrmy4aPTJRGi0LlbNlnI3kF7s6pKss,44
+pyhw-0.12.2.dist-info/top_level.txt,sha256=7Inxvxt1TngEricKZEex9_WJZS3DbKYFUXDz4v5WHYU,5
+pyhw-0.12.2.dist-info/RECORD,,

{pyhw-0.12.0.dist-info → pyhw-0.12.2.dist-info}/WHEEL

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