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

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/backend/backendBase.py

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

pyhw/backend/gpu/macos.py

@@ -47,7 +47,7 @@ class GPUDetectMacOS:
             if self.__handleVendor(gpu.get("spdisplays_vendor")) == "Intel":    # Integrated GPU
                 self.__gpuInfo.gpus.append(f'{gpu.get("sppci_model")} [CPU Integrated]')
             elif self.__handleVendor(gpu.get("spdisplays_vendor")) == "AMD":    # dGPU
-                self.__gpuInfo.gpus.append(f'{gpu.get("sppci_model")} [Discrete]')
+                self.__gpuInfo.gpus.append(f'{gpu.get("sppci_model")} {gpu.get("spdisplays_vram")} [Discrete]')
             elif self.__handleVendor(gpu.get("spdisplays_vendor")) == "Nvidia":    # Since current macOS does not support NVIDIA GPUs, this condition is not applicable
                 pass
 

pyhw/backend/nic/__init__.py

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

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/backend/nic/nicBase.py

@@ -0,0 +1,17 @@
+from .linux import NICDetectLinux
+
+
+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()

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyhw
-Version: 0.3.4
+Version: 0.3.6
 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.4.dist-info → pyhw-0.3.6.dist-info}/RECORD

@@ -1,8 +1,8 @@
 pyhw/__init__.py,sha256=IMjkMO3twhQzluVTo8Z6rE7Eg-9U79_LGKMcsWLKBkY,22
-pyhw/__main__.py,sha256=EZPquqahE-4VvSJK3kHbxBHNR_1_Yah9T640ZUtXKO8,1467
+pyhw/__main__.py,sha256=mAlp-qNRg3H9jeftQeNBZPDPyhvSHJ8v0VL_85qPyg8,1616
 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/backendBase.py,sha256=wLb03ZsDqWx36KaXnc0tMZfxOSM0_oBnnfv9khyRis4,478
 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
@@ -12,7 +12,7 @@ pyhw/backend/gpu/__init__.py,sha256=EpMjPvUaXt0LTNMvGmB8WgXbUB9keCxuOhu8NT3Re6o,
 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/macos.py,sha256=sgrROfJC59KWjxfW2n90thVEjgDNYYLWo_pETDFPKQA,2308
+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
 pyhw/backend/host/hostInfo.py,sha256=Xvz0LugPiCSWMkcDsp4p2rrojYFZauL6Q-gCZ6NLz5k,184
@@ -30,6 +30,10 @@ pyhw/backend/memory/macos.py,sha256=ur2HxmmmVkXmaxEcw_otphifVp_csfNMJdgt-idCq7M,
 pyhw/backend/memory/memoryBase.py,sha256=RFRWTByH25T3T77maxLyIRRoedIi5M8XLtVbvwBmjfY,433
 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/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
 pyhw/backend/os/macos.py,sha256=DwgpwRD1a2oTANR_XL3kkMzNawqrt23F79dqBw3ULK8,1906
@@ -70,11 +74,11 @@ pyhw/frontend/logo/ascii/ubuntu_small.pyhw,sha256=Xf8LSZdZUu9aEG3efhb1FUlUEuJ-3U
 pyhw/pyhwException/__init__.py,sha256=8JsFvtF13g0Y5t4z9fRndDXtfCzuBM59jDf6PhWSFSk,220
 pyhw/pyhwException/pyhwException.py,sha256=wxuzFQa9g7XB1q9TUKO_55lw7wMEJMpzG8w1GVTFVa0,197
 pyhw/pyhwUtil/__init__.py,sha256=PzeP9fXsIhvr3sUpJ4DxW9_H25DEIasBFfXd_NztfR4,226
-pyhw/pyhwUtil/pyhwUtil.py,sha256=OIJJp5LnCuDDS7Tx2l7gV5i7VGe9W8qY9E5kROx_MR0,2348
+pyhw/pyhwUtil/pyhwUtil.py,sha256=PXibpl4hfc-xFHV1HNWwkzttC0NQITHLEwojYKMmD-U,2413
 pyhw/pyhwUtil/sysctlUtil.py,sha256=S-rUvqi7ZrMyMouIhxlyHEQ4agM7sCT1Y7uzs3Hu5-o,841
-pyhw-0.3.4.dist-info/LICENSE,sha256=hJs6RBqSVCexbTsalkMLNFI5t06kekQEsSVaOt_-yLs,1497
-pyhw-0.3.4.dist-info/METADATA,sha256=Y83I6bgPmISwgTLZHRWLlNjnT7qXxpI0p2wJGGgJn5w,4041
-pyhw-0.3.4.dist-info/WHEEL,sha256=Mdi9PDNwEZptOjTlUcAth7XJDFtKrHYaQMPulZeBCiQ,91
-pyhw-0.3.4.dist-info/entry_points.txt,sha256=q-AB8im_QahpmNrmy4aPTJRGi0LlbNlnI3kF7s6pKss,44
-pyhw-0.3.4.dist-info/top_level.txt,sha256=7Inxvxt1TngEricKZEex9_WJZS3DbKYFUXDz4v5WHYU,5
-pyhw-0.3.4.dist-info/RECORD,,
+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.3.4.dist-info → pyhw-0.3.6.dist-info}/WHEEL

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