pyhw 0.11.7__tar.gz → 0.11.9__tar.gz

{pyhw-0.11.7/src/pyhw.egg-info → pyhw-0.11.9}/PKG-INFO

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

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pyhw"
-version = "0.11.7"
+version = "0.11.9"
 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.11.9/src/pyhw/__init__.py

@@ -0,0 +1 @@
+__version__ = '0.11.9'

{pyhw-0.11.7 → pyhw-0.11.9}/src/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-0.11.7 → pyhw-0.11.9}/src/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.7 → pyhw-0.11.9}/src/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-0.11.9/src/pyhw/backend/shell/windows.py

@@ -0,0 +1,49 @@
+"""
+    In dev.
+"""
+from ...pyhwException import BackendException
+from .shellInfo import ShellInfo
+import json
+import subprocess
+import os
+
+
+class ShellDetectWindows:
+    def __init__(self):
+        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:
+            result = subprocess.run(["powershell", "-NoProfile", "-Command", COMMAND], capture_output=True, text=True)
+        except subprocess.SubprocessError:
+            raise BackendException("Error running PowerShell command.")
+
+        res = json.loads(result.stdout)
+        major = res["Major"]
+        minor = res["Minor"]
+
+        self.__shellInfo.shell = "PowerShell"
+        self.__shellInfo.version = f"{major}.{minor}"

{pyhw-0.11.7 → pyhw-0.11.9/src/pyhw.egg-info}/PKG-INFO

@@ -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 → pyhw-0.11.9}/src/pyhw.egg-info/SOURCES.txt

@@ -114,6 +114,7 @@ src/pyhw/frontend/logo/ascii/windows_11.pyhw
 src/pyhw/frontend/logo/ascii/windows_2025.pyhw
 src/pyhw/frontend/logo/ascii/windows_old.pyhw
 src/pyhw/library/lib/iokitGPULib.dylib
+src/pyhw/library/lib/iokitHostLib.dylib
 src/pyhw/pyhwException/__init__.py
 src/pyhw/pyhwException/pyhwException.py
 src/pyhw/pyhwUtil/__init__.py

pyhw-0.11.7/src/pyhw/__init__.py

@@ -1 +0,0 @@
-__version__ = '0.11.7'

pyhw-0.11.7/src/pyhw/backend/shell/windows.py

@@ -1,29 +0,0 @@
-"""
-    In dev.
-"""
-from ...pyhwException import BackendException
-from .shellInfo import ShellInfo
-import json
-import subprocess
-
-
-class ShellDetectWindows:
-    def __init__(self):
-        self.__shellInfo = ShellInfo()
-
-    def getShellInfo(self):
-        COMMAND = "$PSVersionTable.PSVersion | ConvertTo-JSON"
-
-        try:
-            result = subprocess.run(["powershell", "-NoProfile", "-Command", COMMAND], capture_output=True, text=True)
-        except subprocess.SubprocessError:
-            raise BackendException("Error running PowerShell command.")
-
-        res = json.loads(result.stdout)
-        major = res["Major"]
-        minor = res["Minor"]
-
-        self.__shellInfo.shell = "PowerShell"
-        self.__shellInfo.version = f"{major}.{minor}"
-        self.__shellInfo.info = f"PowerShell {major}.{minor}"
-        return self.__shellInfo