pyhw 0.3.5__tar.gz → 0.3.7__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyhw
-Version: 0.3.5
+Version: 0.3.7
 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.5 → pyhw-0.3.7}/pyproject.toml

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

@@ -9,6 +9,7 @@ from .backend.os import OSDetect
 from .backend.cpu import CPUDetect
 from .backend.gpu import GPUDetect
 from .backend.memory import MemoryDetect
+from .backend.nic import NICDetect
 from .pyhwUtil import createDataString
 from .pyhwUtil import getOS, selectOSLogo
 
@@ -30,6 +31,9 @@ def main():
     if gpu_info.number > 0:
         data.GPU = gpu_info.gpus
     data.Memory = MemoryDetect(os=current_os).getMemoryInfo().memory
+    nic_info = NICDetect(os=current_os).getNICInfo()
+    if nic_info.number > 0:
+        data.NIC = nic_info.nics
 
     Printer(logo_os=selectOSLogo(OSDetect(os=current_os).getOSInfo().id), data=createDataString(data)).cPrint()
 

{pyhw-0.3.5 → pyhw-0.3.7}/src/pyhw/backend/backendBase.py

@@ -19,3 +19,4 @@ class Data:
     CPU = "Default Value"
     GPU = ["Default Value"]
     Memory = "Default Value"
+    NIC = ["Default Value"]

pyhw-0.3.7/src/pyhw/backend/nic/__init__.py

@@ -0,0 +1,4 @@
+from .nicBase import NICDetect
+
+
+__all__ = ["NICDetect"]

pyhw-0.3.7/src/pyhw/backend/nic/linux.py

@@ -0,0 +1,43 @@
+import subprocess
+from .nicInfo import NICInfo
+from ...pyhwUtil import getArch
+from ...pyhwException import BackendException
+
+
+class NICDetectLinux:
+    def __init__(self):
+        self.__nicInfo = NICInfo()
+
+    def getNICInfo(self):
+        self.__getNICInfo()
+        self.__sortNICList()
+        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
+            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))
+                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.
+        self.__nicInfo.nics.append("Not found")
+        self.__nicInfo.number = 1
+
+    @staticmethod
+    def __nicNameClean(nic_name: str):
+        nic_name_clean = nic_name.replace("Corporation ", "")
+        return nic_name_clean
+
+    def __sortNICList(self):
+        return self.__nicInfo.nics.sort()

pyhw-0.3.7/src/pyhw/backend/nic/macos.py

@@ -0,0 +1,11 @@
+from .nicInfo import NICInfo
+
+
+class NICDetectMacOS:
+    def __init__(self):
+        self.__nicInfo = NICInfo()
+
+    def getNICInfo(self):
+        self.__nicInfo.nics.append("en0")
+        self.__nicInfo.number = 1
+        return self.__nicInfo

pyhw-0.3.7/src/pyhw/backend/nic/nicBase.py

@@ -0,0 +1,20 @@
+from .linux import NICDetectLinux
+from .macos import NICDetectMacOS
+
+
+class NICDetect:
+    """
+    Class for network interface (NIC) detection.
+    """
+    def __init__(self, os):
+        self.OS = os
+
+    def getNICInfo(self):
+        """
+        Detects the network interfaces (NICs) connected to the system.
+        :return: dataclass NICInfo, direct attr: nics
+        """
+        if self.OS == "linux":
+            return NICDetectLinux().getNICInfo()
+        elif self.OS == "macos":
+            return NICDetectMacOS().getNICInfo()

pyhw-0.3.7/src/pyhw/backend/nic/nicInfo.py

@@ -0,0 +1,8 @@
+from dataclasses import dataclass
+
+
+@dataclass
+class NICInfo:
+    def __init__(self):
+        self.number = 0
+        self.nics = []

{pyhw-0.3.5 → pyhw-0.3.7}/src/pyhw/pyhwUtil/pyhwUtil.py

@@ -51,6 +51,8 @@ def createDataString(data: Data):
     for gpu in data.GPU:
         data_string += f" GPU: {gpu}\n"
     data_string += f" Memory: {data.Memory}\n"
+    for nic in data.NIC:
+        data_string += f" NIC: {nic}\n"
     return data_string
 
 

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

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

@@ -39,6 +39,11 @@ src/pyhw/backend/memory/macos.py
 src/pyhw/backend/memory/memoryBase.py
 src/pyhw/backend/memory/memoryInfo.py
 src/pyhw/backend/metal/t.py
+src/pyhw/backend/nic/__init__.py
+src/pyhw/backend/nic/linux.py
+src/pyhw/backend/nic/macos.py
+src/pyhw/backend/nic/nicBase.py
+src/pyhw/backend/nic/nicInfo.py
 src/pyhw/backend/os/__init__.py
 src/pyhw/backend/os/linux.py
 src/pyhw/backend/os/macos.py