pyhw 0.3.0__py3-none-any.whl → 0.3.1__py3-none-any.whl

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/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/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.dist-info → pyhw-0.3.1.dist-info}/METADATA

@@ -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.dist-info → pyhw-0.3.1.dist-info}/RECORD

@@ -1,12 +1,12 @@
 pyhw/__init__.py,sha256=IMjkMO3twhQzluVTo8Z6rE7Eg-9U79_LGKMcsWLKBkY,22
-pyhw/__main__.py,sha256=Ez3TaVt5NaTwEgDUnHzhUhyVMfrSDC2cSwv8AEmg8c4,1557
+pyhw/__main__.py,sha256=EZPquqahE-4VvSJK3kHbxBHNR_1_Yah9T640ZUtXKO8,1467
 pyhw/macos.py,sha256=kF973QvtEFky4m8RnYTJ-HWPuJi3625tvnWqJAT_DHM,4598
 pyhw/backend/__init__.py,sha256=knn_3Yroow1h0dqdrozk3zyy3vz-kQyNBRjR6OLmVoY,50
 pyhw/backend/backendBase.py,sha256=t9FKQPdK7yFZF0vrsXpjIUJNKrB-cXYeL5MDohlgguA,450
 pyhw/backend/cpu/__init__.py,sha256=5YfANJVRwNwTRodG0ENOgusrdN592aaSnfq5ok4dKTo,56
 pyhw/backend/cpu/cpuBase.py,sha256=AGWqVjdvb82NiH4kxk3GERdBLwBNhkR23j2ei_l3S18,464
 pyhw/backend/cpu/cpuInfo.py,sha256=A_nNGElq9W7oZ5DFJowLdFBE0ZvXKr5h29E6TGAvbRc,251
-pyhw/backend/cpu/linux.py,sha256=xJNvGzKPZJ0KFtSHtf_cH8gU2TtxjfeUAIOyA4hu4T4,3444
+pyhw/backend/cpu/linux.py,sha256=HZHJ4gYl0jHS8cNNbamwj-lpzt7vOZjqYlGNr7JY0rU,3054
 pyhw/backend/cpu/macos.py,sha256=mnnH9ABiBgAiyA8-H9_tq2PC5OeneVLj67nMGoLDXh4,2873
 pyhw/backend/gpu/__init__.py,sha256=EpMjPvUaXt0LTNMvGmB8WgXbUB9keCxuOhu8NT3Re6o,56
 pyhw/backend/gpu/gpuBase.py,sha256=Ge0DX2P8_EB7ovM7glmPUnVsPJL3OUHV2t_1T5mimR0,409
@@ -32,7 +32,7 @@ pyhw/backend/memory/memoryInfo.py,sha256=OQF165uEyuapAsi7cKacQYDRnKdrQHeldfyFwzS
 pyhw/backend/metal/t.py,sha256=52yv-JoXNfaIOfcxEEidIg0MoyFtzWvTRm550kQKPZA,391
 pyhw/backend/os/__init__.py,sha256=rPHQYdQK3qU6ZwwodqVoEWeqBnKffXlJyi4k3-8ViPY,53
 pyhw/backend/os/linux.py,sha256=fGVmJoKw65JdgWsJjbjAxOVqw0dqkmw-BQSb-TnSQQc,1782
-pyhw/backend/os/macos.py,sha256=bJU8-Uan8yRdAYWroN6wJ1XQA3US-2ikBLWwbDJhBeg,1261
+pyhw/backend/os/macos.py,sha256=DwgpwRD1a2oTANR_XL3kkMzNawqrt23F79dqBw3ULK8,1906
 pyhw/backend/os/osBase.py,sha256=AA17HIwmWy7E6nCtqbojTNsHKtcNuehf51FxGcfXu7A,462
 pyhw/backend/os/osInfo.py,sha256=iLPc7INFHH3izascwooj4JBVgvBsSgVPXWBlFXG47mQ,378
 pyhw/backend/shell/__init__.py,sha256=SeQ7OLNSl_V1JCCWnJGjLilAWiSe9e5kgsMEt63TMS0,62
@@ -69,9 +69,9 @@ pyhw/pyhwException/pyhwException.py,sha256=wxuzFQa9g7XB1q9TUKO_55lw7wMEJMpzG8w1G
 pyhw/pyhwUtil/__init__.py,sha256=PzeP9fXsIhvr3sUpJ4DxW9_H25DEIasBFfXd_NztfR4,226
 pyhw/pyhwUtil/pyhwUtil.py,sha256=qJREsuPU_lq7T0Ictc-_BkGEp0Zh24Ptq8aklkEe6GY,2292
 pyhw/pyhwUtil/sysctlUtil.py,sha256=S-rUvqi7ZrMyMouIhxlyHEQ4agM7sCT1Y7uzs3Hu5-o,841
-pyhw-0.3.0.dist-info/LICENSE,sha256=hJs6RBqSVCexbTsalkMLNFI5t06kekQEsSVaOt_-yLs,1497
-pyhw-0.3.0.dist-info/METADATA,sha256=IJxN41TogfxBGB62qnBjbNFgxvplQ887tB2EkCQ5NLg,3912
-pyhw-0.3.0.dist-info/WHEEL,sha256=Mdi9PDNwEZptOjTlUcAth7XJDFtKrHYaQMPulZeBCiQ,91
-pyhw-0.3.0.dist-info/entry_points.txt,sha256=q-AB8im_QahpmNrmy4aPTJRGi0LlbNlnI3kF7s6pKss,44
-pyhw-0.3.0.dist-info/top_level.txt,sha256=7Inxvxt1TngEricKZEex9_WJZS3DbKYFUXDz4v5WHYU,5
-pyhw-0.3.0.dist-info/RECORD,,
+pyhw-0.3.1.dist-info/LICENSE,sha256=hJs6RBqSVCexbTsalkMLNFI5t06kekQEsSVaOt_-yLs,1497
+pyhw-0.3.1.dist-info/METADATA,sha256=aZwdNsKzvDGlqqVCG4lK8udYm8lUDhiLd5aNgdNH8wQ,3912
+pyhw-0.3.1.dist-info/WHEEL,sha256=Mdi9PDNwEZptOjTlUcAth7XJDFtKrHYaQMPulZeBCiQ,91
+pyhw-0.3.1.dist-info/entry_points.txt,sha256=q-AB8im_QahpmNrmy4aPTJRGi0LlbNlnI3kF7s6pKss,44
+pyhw-0.3.1.dist-info/top_level.txt,sha256=7Inxvxt1TngEricKZEex9_WJZS3DbKYFUXDz4v5WHYU,5
+pyhw-0.3.1.dist-info/RECORD,,