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

pyhw/backend/cpu/linux.py

@@ -68,6 +68,11 @@ class CPUDetectLinux:
                 model = compatible.split(",")[-1]
                 if model.startswith("bcm"):
                     self.__cpuInfo.model = model.upper()
+            elif "orangepi" in compatible:
+                if "allwinner" in compatible:
+                    model = compatible.split(",")[-1]
+                    if model.startswith("sun"):
+                        self.__cpuInfo.model = f"Allwinner {model.split('-')[-1].upper()} ({model})"
         else:
             pass
 

pyhw/backend/gpu/linux.py

@@ -10,6 +10,7 @@ class GPUDetectLinux:
 
     def getGPUInfo(self):
         self.__getGPUInfo()
+        self.__sortGPUList()
         return self.__gpuInfo
 
     def __getGPUInfo(self):
@@ -20,9 +21,9 @@ class GPUDetectLinux:
         if len(pci_info) == 0:  # no pcie devices found
             self.__handleNonePciDevices()
         for line in pci_info.split("\n"):
-            if "VGA" in line or "Display" in line or "3D" in line:
+            if "VGA" in line or "Display" in line or "3D " in line:
                 gpu = line.split(": ")[1]
-                self.__gpuInfo.gpus.append(gpu)
+                self.__gpuInfo.gpus.append(self.__gpuNameClean(gpu))
                 self.__gpuInfo.number += 1
         if self.__gpuInfo.number == 0:
             self.__handleNonePciDevices()  # fallback to a sbc device detection method
@@ -35,3 +36,12 @@ class GPUDetectLinux:
         else:
             self.__gpuInfo.number = 1
             self.__gpuInfo.gpus.append("Not found")
+
+    @staticmethod
+    def __gpuNameClean(gpu_name: str):
+        gpu_name_clean = gpu_name.replace("Corporation", "")
+        return gpu_name_clean
+
+    def __sortGPUList(self):
+        self.__gpuInfo.gpus.sort()
+

pyhw/backend/os/linux.py

@@ -14,6 +14,7 @@ class OSDetectLinux:
         :return: dataclass OSInfoLinux, direct attrs: prettyName
         """
         self.__getOSInfo()
+        self.__handleArmbian()
         return self.__osInfo
 
     def __getOSInfo(self):
@@ -45,3 +46,7 @@ class OSDetectLinux:
                         self.__osInfo.buildID = value.strip('"')
         except Exception:
             pass
+
+    def __handleArmbian(self):
+        if "Armbian" in self.__osInfo.prettyName or "armbian" in self.__osInfo.prettyName:
+            self.__osInfo.id = "armbian"

{pyhw-0.3.1.dist-info → pyhw-0.3.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyhw
-Version: 0.3.1
+Version: 0.3.3
 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
@@ -15,7 +15,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 
 # PyHw
-![PyPI - Downloads](https://img.shields.io/pypi/dw/pyhw?label=PyPI)
+[![Downloads](https://static.pepy.tech/badge/pyhw)](https://pepy.tech/project/pyhw)
 ![PyPI - Version](https://img.shields.io/pypi/v/pyhw?label=version)
 
 ![Static Badge](https://img.shields.io/badge/macOS-brightgreen)
@@ -26,6 +26,12 @@ PyHw, a neofetch-like command line tool for fetching system information but writ
 
 This project is a Python reimplementation of [neofetch](https://github.com/dylanaraps/neofetch) and references the [fastfetch](https://github.com/fastfetch-cli/fastfetch) project for logo style settings. Since this project is implemented in Python, it will be easier to maintain and extend than bash and c implementation. Also, this project only relies on the Python standard library, so you can run it on any device that has a Python environment (I hope so 🤔).
 
+
+![demo](https://i2.imgs.ovh/d/BQACAgUAAx0EUvSR8wACMvpmyFVohzKxLcUdLiJaEa3wlo_OrQACuw4AAoX-QVaSpG0-rTAeRTUE)
+
+
+
+
 ## Install
 There are already a lot of similar tools so you can choose any of them; they're all essentially no different. If you want to try this tool, just install it directly by pip.
 ```shell

{pyhw-0.3.1.dist-info → pyhw-0.3.3.dist-info}/RECORD

@@ -6,12 +6,12 @@ pyhw/backend/backendBase.py,sha256=t9FKQPdK7yFZF0vrsXpjIUJNKrB-cXYeL5MDohlgguA,4
 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=HZHJ4gYl0jHS8cNNbamwj-lpzt7vOZjqYlGNr7JY0rU,3054
+pyhw/backend/cpu/linux.py,sha256=zJ2cOwQHtolJrMMY1WXVbLLIRNPxeClUgzLAAkd7As4,3346
 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
 pyhw/backend/gpu/gpuInfo.py,sha256=d_z_z5DiZAg85wP0VOBQEU0QHdaK3qFqA2Tp9Eq8-Zs,133
-pyhw/backend/gpu/linux.py,sha256=Tj7ngrSvVpBGtx3HxuSNcWEXbTeIea8ef5qL341JQYQ,1448
+pyhw/backend/gpu/linux.py,sha256=xWgjKCuO9DwLR2NC6JlGFkEyDey5_zt7AnSVKPUk1_s,1714
 pyhw/backend/gpu/macos.py,sha256=sgrROfJC59KWjxfW2n90thVEjgDNYYLWo_pETDFPKQA,2308
 pyhw/backend/host/__init__.py,sha256=Efaj7-Oya7H8HdpZHQCLrwn-mcfPb-d6yfh4dzsE_7I,58
 pyhw/backend/host/hostBase.py,sha256=POyDW3f5JSWtEKyCfrVSBEddSwoywe_OBgUExCEuje8,563
@@ -31,7 +31,7 @@ pyhw/backend/memory/memoryBase.py,sha256=RFRWTByH25T3T77maxLyIRRoedIi5M8XLtVbvwB
 pyhw/backend/memory/memoryInfo.py,sha256=OQF165uEyuapAsi7cKacQYDRnKdrQHeldfyFwzS9N2g,186
 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/linux.py,sha256=UDUSbCMQQJZqfRFHS270u-ZrW4KfqZxcS_vQZl6VbPo,1977
 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
@@ -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.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,,
+pyhw-0.3.3.dist-info/LICENSE,sha256=hJs6RBqSVCexbTsalkMLNFI5t06kekQEsSVaOt_-yLs,1497
+pyhw-0.3.3.dist-info/METADATA,sha256=3o7JFBZkOOb0-YiPvH6N8byalKwspXxR88d4cvK7_eU,4041
+pyhw-0.3.3.dist-info/WHEEL,sha256=Mdi9PDNwEZptOjTlUcAth7XJDFtKrHYaQMPulZeBCiQ,91
+pyhw-0.3.3.dist-info/entry_points.txt,sha256=q-AB8im_QahpmNrmy4aPTJRGi0LlbNlnI3kF7s6pKss,44
+pyhw-0.3.3.dist-info/top_level.txt,sha256=7Inxvxt1TngEricKZEex9_WJZS3DbKYFUXDz4v5WHYU,5
+pyhw-0.3.3.dist-info/RECORD,,