pyhw 0.3.0__tar.gz → 0.3.1__tar.gz

{pyhw-0.3.0/src/pyhw.egg-info → pyhw-0.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyhw
-Version: 0.3.0
+Version: 0.3.1
 Summary: PyHw, a neofetch-like command line tool for fetching system information but written mostly in python.
 Author-email: Xiao Ran <xiaoran.007@icloud.com>
 License: BSD-3-Clause

{pyhw-0.3.0 → pyhw-0.3.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pyhw"
-version = "0.3.0"
+version = "0.3.1"
 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.3.0 → pyhw-0.3.1}/src/pyhw/__main__.py

@@ -15,7 +15,6 @@ from .pyhwUtil import getOS, selectOSLogo
 
 def main():
     current_os = getOS()
-    print("This is a test version of PyHw. Currently, it only supports Linux and macOS.")
     if current_os != "linux" and current_os != "macos":
         print(f"Only Linux and macOS is supported for now. Current os: {current_os}")
         return

{pyhw-0.3.0 → pyhw-0.3.1}/src/pyhw/backend/cpu/linux.py

@@ -58,26 +58,17 @@ class CPUDetectLinux:
     def __handleSBC(self):
         # some values should be double-checked
         # Info source: https://github.com/raspberrypi/firmware/tree/master/boot
-        raspberry_pi_soc_map = {
-            "Raspberry Pi 2 Model B Rev 1.1": "BCM2836",
-            "Raspberry Pi 2 Model B Rev 1.2": "BCM2837",
-            "Raspberry Pi 3 Model B": "BCM2837",
-            "Raspberry Pi 3 Model B+": "BCM2837",
-            "Raspberry Pi 4 Model B": "BCM2711",
-            "Raspberry Pi 5": "BCM2712",
-        }
-        if os.path.exists("/sys/firmware/devicetree/base/model"):
+        if os.path.exists("/sys/firmware/devicetree/base/compatible"):
             try:
-                with open("/sys/firmware/devicetree/base/model", "r") as f:
-                    model = f.read().strip().replace("\x00", "")
+                with open("/sys/firmware/devicetree/base/compatible", "r") as f:
+                    compatible = f.read().strip()
             except FileNotFoundError:
-                model = ""
-            if "Raspberry Pi" in model:
-                map_cpu = raspberry_pi_soc_map.get(model, "Unknown")
-                if map_cpu != "Unknown":
-                    self.__cpuInfo.model = map_cpu
-            else:
-                pass
+                compatible = ""
+            if "raspberrypi" in compatible:
+                model = compatible.split(",")[-1]
+                if model.startswith("bcm"):
+                    self.__cpuInfo.model = model.upper()
         else:
             pass
 
+

{pyhw-0.3.0 → pyhw-0.3.1}/src/pyhw/backend/os/macos.py

@@ -13,7 +13,11 @@ class OSDetectMacOS:
 
     def getOSInfo(self):
         self.__getOS()
-        self.__osInfo.prettyName = f"{self.__ProductName} {self.__ProductVersion} {self.__BuildVersion} {getArch()}"
+        self.__handelOSName()
+        if self.__VersionName != "":
+            self.__osInfo.prettyName = f"{self.__ProductName} {self.__VersionName} {self.__ProductVersion} {self.__BuildVersion} {getArch()}"
+        else:
+            self.__osInfo.prettyName = f"{self.__ProductName} {self.__ProductVersion} {self.__BuildVersion} {getArch()}"
         self.__osInfo.id = "macOS"
         return self.__osInfo
 
@@ -32,5 +36,19 @@ class OSDetectMacOS:
                 self.__BuildVersion = sw_ver.split(":")[1].strip()
 
     def __handelOSName(self):
-        # Add os name -- product version conversion logic in the future.
-        pass
+        # Only supports modern macOS
+        macOSVersionMap = {
+            "11": "Big Sur",
+            "12": "Monterey",
+            "13": "Ventura",
+            "14": "Sonoma",
+            "15": "Sequoia"
+        }
+        if "." in self.__ProductVersion:
+            major = self.__ProductVersion.split(".")[0]
+        else:
+            major = self.__ProductVersion
+        version_name = macOSVersionMap.get(major, "")
+        if version_name != "":
+            self.__VersionName = version_name
+

{pyhw-0.3.0 → pyhw-0.3.1/src/pyhw.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyhw
-Version: 0.3.0
+Version: 0.3.1
 Summary: PyHw, a neofetch-like command line tool for fetching system information but written mostly in python.
 Author-email: Xiao Ran <xiaoran.007@icloud.com>
 License: BSD-3-Clause