pyhw 0.3.7__tar.gz → 0.4.0__tar.gz

{pyhw-0.3.7/src/pyhw.egg-info → pyhw-0.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyhw
-Version: 0.3.7
+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.7 → pyhw-0.4.0}/README.md

@@ -11,7 +11,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](https://i2.imgs.ovh/d/BQACAgUAAx0EUvSR8wACMvpmyFVohzKxLcUdLiJaEa3wlo_OrQACuw4AAoX-QVaSpG0-rTAeRTUE))
+![demo](https://files.catbox.moe/xx58xy.jpg)
+
 
 
 

{pyhw-0.3.7 → pyhw-0.4.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pyhw"
-version = "0.3.7"
+version = "0.4.0"
 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 = [
@@ -13,6 +13,9 @@ authors = [
 readme = "README.md"
 license = {text = "BSD-3-Clause"}
 requires-python = ">=3.9"
+dependencies = [
+    "pypci-ng>=0.0.1"
+]
 classifiers = [
     "Development Status :: 4 - Beta",
     "Programming Language :: Python :: 3",

{pyhw-0.3.7 → pyhw-0.4.0}/src/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-0.3.7 → pyhw-0.4.0}/src/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-0.3.7 → pyhw-0.4.0}/src/pyhw/backend/nic/macos.py

@@ -1,4 +1,5 @@
 from .nicInfo import NICInfo
+import subprocess
 
 
 class NICDetectMacOS:
@@ -9,3 +10,9 @@ class NICDetectMacOS:
         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-0.3.7 → pyhw-0.4.0/src/pyhw.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyhw
-Version: 0.3.7
+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.7 → pyhw-0.4.0}/src/pyhw.egg-info/SOURCES.txt

@@ -9,6 +9,7 @@ src/pyhw.egg-info/PKG-INFO
 src/pyhw.egg-info/SOURCES.txt
 src/pyhw.egg-info/dependency_links.txt
 src/pyhw.egg-info/entry_points.txt
+src/pyhw.egg-info/requires.txt
 src/pyhw.egg-info/top_level.txt
 src/pyhw/backend/__init__.py
 src/pyhw/backend/backendBase.py

pyhw-0.4.0/src/pyhw.egg-info/requires.txt

@@ -0,0 +1 @@
+pypci-ng>=0.0.1