pyhw 0.3.6__py3-none-any.whl → 0.4.0__py3-none-any.whl

pyhw/backend/gpu/linux.py

@@ -2,6 +2,7 @@ import subprocess
 from .gpuInfo import GPUInfo
 from ..cpu import CPUDetect
 from ...pyhwUtil import getArch
+import pypci
 
 
 class GPUDetectLinux:
@@ -14,19 +15,17 @@ class GPUDetectLinux:
         return self.__gpuInfo
 
     def __getGPUInfo(self):
-        try:
-            pci_info = subprocess.run(["bash", "-c", "lspci"], capture_output=True, text=True).stdout.strip()
-        except subprocess.SubprocessError:
-            return
-        if len(pci_info) == 0:  # no pcie devices found
+        gpu_devices = pypci.PCI().FindAllVGA()
+        if len(gpu_devices) == 0:
             self.__handleNonePciDevices()
-        for line in pci_info.split("\n"):
-            if "VGA" in line or "Display" in line or "3D " in line:
-                gpu = line.split(": ")[1]
-                self.__gpuInfo.gpus.append(self.__gpuNameClean(gpu))
+        else:
+            for device in gpu_devices:
+                if device.subsystem_device_name != "":
+                    device_name = f"{device.vendor_name} {device.device_name} ({device.subsystem_device_name})"
+                else:
+                    device_name = f"{device.vendor_name} {device.device_name}"
+                self.__gpuInfo.gpus.append(self.__gpuNameClean(device_name))
                 self.__gpuInfo.number += 1
-        if self.__gpuInfo.number == 0:
-            self.__handleNonePciDevices()  # fallback to a sbc device detection method
 
     def __handleNonePciDevices(self):
         # if detector can't find any VGA/Display/3D GPUs, assume the host is a sbc device, this function is a placeholder for a more advanced method.

pyhw/backend/nic/linux.py

@@ -2,6 +2,7 @@ import subprocess
 from .nicInfo import NICInfo
 from ...pyhwUtil import getArch
 from ...pyhwException import BackendException
+import pypci
 
 
 class NICDetectLinux:
@@ -14,20 +15,17 @@ class NICDetectLinux:
         return self.__nicInfo
 
     def __getNICInfo(self):
-        try:
-            pci_info = subprocess.run(["bash", "-c", "lspci"], capture_output=True, text=True).stdout.strip()
-        except subprocess.SubprocessError:
-            return
-        if len(pci_info) == 0:  # no pcie devices found
+        nic_devices = pypci.PCI().FindAllNIC()
+        if len(nic_devices) == 0:
             self.__handleNonePciDevices()
-            return
-        for line in pci_info.split("\n"):
-            if "Ethernet controller" in line or "Network controller" in line:
-                nic = line.split(": ")[1]
-                self.__nicInfo.nics.append(self.__nicNameClean(nic))
+        else:
+            for device in nic_devices:
+                if device.subsystem_device_name != "":
+                    device_name = f"{device.vendor_name} {device.device_name} ({device.subsystem_device_name})"
+                else:
+                    device_name = f"{device.vendor_name} {device.device_name}"
+                self.__nicInfo.nics.append(self.__nicNameClean(device_name))
                 self.__nicInfo.number += 1
-        if self.__nicInfo.number == 0:
-            self.__handleNonePciDevices()  # fallback to usb detection method
 
     def __handleNonePciDevices(self):
         # placeholder for a more advanced method.
@@ -40,4 +38,4 @@ class NICDetectLinux:
         return nic_name_clean
 
     def __sortNICList(self):
-        return self.__nicInfo.nics.sort()
+        return self.__nicInfo.nics.sort()

pyhw/backend/nic/macos.py

@@ -0,0 +1,18 @@
+from .nicInfo import NICInfo
+import subprocess
+
+
+class NICDetectMacOS:
+    def __init__(self):
+        self.__nicInfo = NICInfo()
+
+    def getNICInfo(self):
+        self.__nicInfo.nics.append("en0")
+        self.__nicInfo.number = 1
+        return self.__nicInfo
+
+    def __getNICInfo(self):
+        # Placeholder for a more advanced method.
+        interfaces = subprocess.run(["bash", "-c", "route get default | grep interface"], capture_output=True, text=True).stdout.strip()
+
+

pyhw/backend/nic/nicBase.py

@@ -1,4 +1,5 @@
 from .linux import NICDetectLinux
+from .macos import NICDetectMacOS
 
 
 class NICDetect:
@@ -14,4 +15,6 @@ class NICDetect:
         :return: dataclass NICInfo, direct attr: nics
         """
         if self.OS == "linux":
-            return NICDetectLinux().getNICInfo()
+            return NICDetectLinux().getNICInfo()
+        elif self.OS == "macos":
+            return NICDetectMacOS().getNICInfo()

{pyhw-0.3.6.dist-info → pyhw-0.4.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyhw
-Version: 0.3.6
+Version: 0.4.0
 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
@@ -13,6 +13,7 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: pypci-ng>=0.0.1
 
 # PyHw
 [![Downloads](https://static.pepy.tech/badge/pyhw)](https://pepy.tech/project/pyhw)
@@ -27,7 +28,9 @@ 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)
+[//]: # (![demo]&#40;https://i2.imgs.ovh/d/BQACAgUAAx0EUvSR8wACMvpmyFVohzKxLcUdLiJaEa3wlo_OrQACuw4AAoX-QVaSpG0-rTAeRTUE&#41;)
+![demo](https://files.catbox.moe/xx58xy.jpg)
+
 
 
 

{pyhw-0.3.6.dist-info → pyhw-0.4.0.dist-info}/RECORD

@@ -11,7 +11,7 @@ pyhw/backend/cpu/macos.py,sha256=mnnH9ABiBgAiyA8-H9_tq2PC5OeneVLj67nMGoLDXh4,287
 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=Pc9Sajf0tgRyT9zP1lYysQciLmgtNZjsuJNH3xNvwAY,1715
+pyhw/backend/gpu/linux.py,sha256=E-evoL-spQbHB8JvbZXSq5ypc2SeePVUPnhEQrSPQpg,1619
 pyhw/backend/gpu/macos.py,sha256=kkTq9_ZJwTQ0Jwep4oYq41STDTplFz83jKRYbvlbMhg,2337
 pyhw/backend/host/__init__.py,sha256=Efaj7-Oya7H8HdpZHQCLrwn-mcfPb-d6yfh4dzsE_7I,58
 pyhw/backend/host/hostBase.py,sha256=POyDW3f5JSWtEKyCfrVSBEddSwoywe_OBgUExCEuje8,563
@@ -31,8 +31,9 @@ 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/nic/__init__.py,sha256=eP4eOYIvMF3LcTf954hJa6TnB8R4Qahss2g-UcgypKY,57
-pyhw/backend/nic/linux.py,sha256=xWZQlPfeQK9vbn3vQvm-liEJ1Zu1LGwkVhGrzJO1jjc,1436
-pyhw/backend/nic/nicBase.py,sha256=g68oFWN1cjObAZQZXKtSyz9XVPpuWaTqLsQ8Q0wTO7c,422
+pyhw/backend/nic/linux.py,sha256=2IDhesM77qLt7QK8HzYiMeLyuKWOVVrrDtkLHs7R6lU,1321
+pyhw/backend/nic/macos.py,sha256=Gi-XAf2ZvJcWbwJvTlkpdyKaRDSXXiI2WhISeASxbvc,481
+pyhw/backend/nic/nicBase.py,sha256=hmVbiPOrDFClQrOBgAUgE8GVkC5nVH280jnlb65CDV4,539
 pyhw/backend/nic/nicInfo.py,sha256=wuBuL-aIzD441IUDPGz5e0xctcZ-opdpgqkVxgbvZLg,133
 pyhw/backend/os/__init__.py,sha256=rPHQYdQK3qU6ZwwodqVoEWeqBnKffXlJyi4k3-8ViPY,53
 pyhw/backend/os/linux.py,sha256=UDUSbCMQQJZqfRFHS270u-ZrW4KfqZxcS_vQZl6VbPo,1977
@@ -76,9 +77,9 @@ pyhw/pyhwException/pyhwException.py,sha256=wxuzFQa9g7XB1q9TUKO_55lw7wMEJMpzG8w1G
 pyhw/pyhwUtil/__init__.py,sha256=PzeP9fXsIhvr3sUpJ4DxW9_H25DEIasBFfXd_NztfR4,226
 pyhw/pyhwUtil/pyhwUtil.py,sha256=PXibpl4hfc-xFHV1HNWwkzttC0NQITHLEwojYKMmD-U,2413
 pyhw/pyhwUtil/sysctlUtil.py,sha256=S-rUvqi7ZrMyMouIhxlyHEQ4agM7sCT1Y7uzs3Hu5-o,841
-pyhw-0.3.6.dist-info/LICENSE,sha256=hJs6RBqSVCexbTsalkMLNFI5t06kekQEsSVaOt_-yLs,1497
-pyhw-0.3.6.dist-info/METADATA,sha256=Sf-ylDNdsZWPPoOvwyvlh97L4VmYx1ZADIdEi6__G9w,4041
-pyhw-0.3.6.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
-pyhw-0.3.6.dist-info/entry_points.txt,sha256=q-AB8im_QahpmNrmy4aPTJRGi0LlbNlnI3kF7s6pKss,44
-pyhw-0.3.6.dist-info/top_level.txt,sha256=7Inxvxt1TngEricKZEex9_WJZS3DbKYFUXDz4v5WHYU,5
-pyhw-0.3.6.dist-info/RECORD,,
+pyhw-0.4.0.dist-info/LICENSE,sha256=hJs6RBqSVCexbTsalkMLNFI5t06kekQEsSVaOt_-yLs,1497
+pyhw-0.4.0.dist-info/METADATA,sha256=s9V56kt4Wf7VbhDWvGAfI0RPE0rLSzLAXpTp4H4lpqI,4136
+pyhw-0.4.0.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+pyhw-0.4.0.dist-info/entry_points.txt,sha256=q-AB8im_QahpmNrmy4aPTJRGi0LlbNlnI3kF7s6pKss,44
+pyhw-0.4.0.dist-info/top_level.txt,sha256=7Inxvxt1TngEricKZEex9_WJZS3DbKYFUXDz4v5WHYU,5
+pyhw-0.4.0.dist-info/RECORD,,

{pyhw-0.3.6.dist-info → pyhw-0.4.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (74.1.2)
+Generator: setuptools (75.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any