pyhw 0.12.0__tar.gz → 0.12.2__tar.gz

{pyhw-0.12.0/src/pyhw.egg-info → pyhw-0.12.2}/PKG-INFO

@@ -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 → pyhw-0.12.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pyhw"
-version = "0.12.0"
+version = "0.12.2"
 description = "PyHw, a neofetch-like command line tool for fetching system information but written mostly in python."
 keywords = ["neofetch", "system information", "command line tool", "python", "hardware information", "fastfetch", "fetching"]
 authors = [

{pyhw-0.12.0 → pyhw-0.12.2}/src/pyhw/__init__.py

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

{pyhw-0.12.0 → pyhw-0.12.2}/src/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-0.12.0 → pyhw-0.12.2}/src/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-0.12.0 → pyhw-0.12.2}/src/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-0.12.2/src/pyhw/pyhwUtil/__init__.py

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

{pyhw-0.12.0 → pyhw-0.12.2}/src/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 → pyhw-0.12.2/src/pyhw.egg-info}/PKG-INFO

@@ -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/src/pyhw/pyhwUtil/__init__.py

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