pyhw 0.13.3__tar.gz → 0.14.0__tar.gz

{pyhw-0.13.3/src/pyhw.egg-info → pyhw-0.14.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyhw
-Version: 0.13.3
+Version: 0.14.0
 Summary: PyHw, a neofetch-like command line tool for fetching system information but written mostly in python.
 Author: Xiao Ran
 Maintainer-email: Xiao Ran <xiaoran.007@icloud.com>
@@ -13,7 +13,7 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: pypci-ng>=0.2.5
+Requires-Dist: pypci-ng>=0.2.6
 Dynamic: license-file
 
 # PyHw, a neofetch-like system information fetching tool

{pyhw-0.13.3 → pyhw-0.14.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pyhw"
-version = "0.13.3"
+version = "0.14.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 = [
@@ -17,7 +17,7 @@ readme = "README.md"
 license = "BSD-3-Clause"
 requires-python = ">=3.9"
 dependencies = [
-    "pypci-ng>=0.2.5"
+    "pypci-ng>=0.2.6"
 ]
 classifiers = [
     "Development Status :: 4 - Beta",

{pyhw-0.13.3 → pyhw-0.14.0}/src/pyhw/__init__.py

@@ -1,2 +1,2 @@
-__version__ = '0.13.3'
+__version__ = '0.14.0'
 __author__ = 'xiaoran007'

{pyhw-0.13.3 → pyhw-0.14.0}/src/pyhw/__main__.py

@@ -16,6 +16,27 @@ from .pyhwUtil import getOS, selectOSLogo
 from .pyhwUtil import ReleaseChecker
 from .frontend.color import colorPrefix, colorSuffix, ColorSet
 import multiprocessing
+import argparse
+import time
+import functools
+
+
+def timed_function(func):
+    @functools.wraps(func)
+    def wrapper(debug_info, os, result_dict):
+        if not debug_info.get('debug', False):
+            return func(debug_info, os, result_dict)
+
+        start_time = time.time()
+        result = func(debug_info, os, result_dict)
+        elapsed = time.time() - start_time
+        debug_dict = debug_info.get('debug_dict', {})
+        if debug_dict is not None:
+            debug_dict[func.__name__] = elapsed
+        return result
+
+    wrapper.__module__ = func.__module__
+    return wrapper
 
 
 def check_release(release_dict):
@@ -26,57 +47,90 @@ def check_release(release_dict):
     release_dict["is_in_pipx"] = releaseChecker.isInPIPX
 
 
-def detect_title(os, result_dict):
+@timed_function
+def detect_title(debug_info, os, result_dict):
     result_dict["title"] = TitleDetect(os=os).getTitle().title
 
 
-def detect_host(os, result_dict):
+@timed_function
+def detect_host(debug_info, os, result_dict):
     result_dict["Host"] = HostDetect(os=os).getHostInfo().model
 
 
-def detect_kernel(os, result_dict):
+@timed_function
+def detect_kernel(debug_info, os, result_dict):
     result_dict["Kernel"] = KernelDetect(os=os).getKernelInfo().kernel
 
 
-def detect_shell(os, result_dict):
+@timed_function
+def detect_shell(debug_info, os, result_dict):
     result_dict["Shell"] = ShellDetect(os=os).getShellInfo().info
 
 
-def detect_uptime(os, result_dict):
+@timed_function
+def detect_uptime(debug_info, os, result_dict):
     result_dict["Uptime"] = UptimeDetect(os=os).getUptime().uptime
 
 
-def detect_os(os, result_dict):
+@timed_function
+def detect_os(debug_info, os, result_dict):
     result_dict["OS"] = OSDetect(os=os).getOSInfo().prettyName
 
 
-def detect_cpu(os, result_dict):
+@timed_function
+def detect_cpu(debug_info, os, result_dict):
     result_dict["CPU"] = CPUDetect(os=os).getCPUInfo().cpu
 
 
-def detect_gpu(os, result_dict):
+@timed_function
+def detect_gpu(debug_info, os, result_dict):
     gpu_info = GPUDetect(os=os).getGPUInfo()
     if gpu_info.number > 0:
         result_dict["GPU"] = gpu_info.gpus
 
 
-def detect_memory(os, result_dict):
+@timed_function
+def detect_memory(debug_info, os, result_dict):
     result_dict["Memory"] = MemoryDetect(os=os).getMemoryInfo().memory
 
 
-def detect_nic(os, result_dict):
+@timed_function
+def detect_nic(debug_info, os, result_dict):
     nic_info = NICDetect(os=os).getNICInfo()
     if nic_info.number > 0:
         result_dict["NIC"] = nic_info.nics
 
 
-def detect_npu(os, result_dict):
+@timed_function
+def detect_npu(debug_info, os, result_dict):
     npu_info = NPUDetect(os=os).getNPUInfo()
     if npu_info.number > 0:
         result_dict["NPU"] = npu_info.npus
 
 
+@timed_function
+def detect_pci_related(debug_info, os, result_dict):
+    detect_gpu(debug_info, os, result_dict)
+    detect_nic(debug_info, os, result_dict)
+    detect_npu(debug_info, os, result_dict)
+
+
+def print_version():
+    releaseChecker = ReleaseChecker(only_local=True)
+    print(f"pyhw v{releaseChecker.CurrentVersion}")
+
+
 def main():
+    parser = argparse.ArgumentParser(description='PyHw, a neofetch-like command line tool for fetching system information')
+    parser.add_argument('-v', '--version', action='store_true', help='Print version information and exit')
+    parser.add_argument('-d', '--debug', action='store_true', help='Run in debug mode')
+
+    args = parser.parse_args()
+
+    if args.version:
+        print_version()
+        return
+
     current_os = getOS()
     if current_os not in ["linux", "macos", "freebsd", "windows"]:
         print(f"Only Linux, macOS, FreeBSD, and Windows are supported for now. Current OS: {current_os}")
@@ -87,34 +141,48 @@ def main():
     manager = multiprocessing.Manager()
     result_dict = manager.dict()
     release_dict = manager.dict()
+    debug_dict = manager.dict() if args.debug else None
+    debug_info = {'debug': args.debug, 'debug_dict': debug_dict}
 
     processes = [
         multiprocessing.Process(target=check_release, args=(release_dict,)),
-        multiprocessing.Process(target=detect_title, args=(current_os, result_dict)),
-        multiprocessing.Process(target=detect_host, args=(current_os, result_dict)),
-        multiprocessing.Process(target=detect_kernel, args=(current_os, result_dict)),
-        multiprocessing.Process(target=detect_shell, args=(current_os, result_dict)),
-        multiprocessing.Process(target=detect_uptime, args=(current_os, result_dict)),
-        multiprocessing.Process(target=detect_os, args=(current_os, result_dict)),
-        multiprocessing.Process(target=detect_cpu, args=(current_os, result_dict)),
-        multiprocessing.Process(target=detect_gpu, args=(current_os, result_dict)),
-        multiprocessing.Process(target=detect_memory, args=(current_os, result_dict)),
-        multiprocessing.Process(target=detect_nic, args=(current_os, result_dict)),
-        multiprocessing.Process(target=detect_npu, args=(current_os, result_dict)),
+        multiprocessing.Process(target=detect_title, args=(debug_info, current_os, result_dict)),
+        multiprocessing.Process(target=detect_host, args=(debug_info, current_os, result_dict)),
+        multiprocessing.Process(target=detect_kernel, args=(debug_info, current_os, result_dict)),
+        multiprocessing.Process(target=detect_shell, args=(debug_info, current_os, result_dict)),
+        multiprocessing.Process(target=detect_uptime, args=(debug_info, current_os, result_dict)),
+        multiprocessing.Process(target=detect_os, args=(debug_info, current_os, result_dict)),
+        multiprocessing.Process(target=detect_cpu, args=(debug_info, current_os, result_dict)),
+        multiprocessing.Process(target=detect_memory, args=(debug_info, current_os, result_dict)),
+        multiprocessing.Process(target=detect_pci_related, args=(debug_info, current_os, result_dict)),
     ]
 
+    start_time = time.time()
     for process in processes:
         process.start()
 
     for process in processes[1:]:
         process.join()
 
+    total_time = time.time() - start_time
+
     for key, value in result_dict.items():
         setattr(data, key, value)
 
     logo_os = selectOSLogo(OSDetect(os=current_os).getOSInfo().id)
     Printer(logo_os=logo_os, data=createDataString(data)).cPrint()
 
+    if args.debug:
+        print("\n" + "="*50)
+        print(f"🔍 DEBUG MODE: Timing Information")
+        print("="*50)
+        for func_name, elapsed in debug_dict.items():
+            detection_name = func_name.replace("detect_", "")
+            print(f"{detection_name:<10}: {elapsed:.4f} s")
+        print("-"*50)
+        print(f"Total execution time: {total_time:.4f} s")
+        print("="*50)
+
     timeout = 3
     processes[0].join(timeout)
     if processes[0].is_alive():

{pyhw-0.13.3 → pyhw-0.14.0}/src/pyhw/backend/gpu/linux.py

@@ -1,8 +1,8 @@
 from .gpuInfo import GPUInfo
 from ..cpu import CPUDetect
 from ...pyhwUtil import getArch
+from ...pyhwUtil import PCIManager
 from pathlib import Path
-import pypci
 import ctypes
 
 
@@ -17,7 +17,7 @@ class GPUDetectLinux:
         return self.__gpuInfo
 
     def __getGPUInfo(self):
-        gpu_devices = pypci.PCI().FindAllVGA()
+        gpu_devices = PCIManager.get_instance().FindAllVGA()
         if len(gpu_devices) == 0:
             self.__handleNonePciDevices()
         else:

{pyhw-0.13.3 → pyhw-0.14.0}/src/pyhw/backend/gpu/windows.py

@@ -1,5 +1,5 @@
 from .gpuInfo import GPUInfo
-import pypci
+from ...pyhwUtil import PCIManager
 
 
 class GPUDetectWindows:
@@ -12,7 +12,7 @@ class GPUDetectWindows:
         return self.__gpuInfo
 
     def __getGPUInfo(self):
-        gpu_devices = pypci.PCI().FindAllVGA()
+        gpu_devices = PCIManager.get_instance().FindAllVGA()
         if len(gpu_devices) == 0:
             self.__handleNonePciDevices()
         else:

{pyhw-0.13.3 → pyhw-0.14.0}/src/pyhw/backend/nic/linux.py

@@ -1,6 +1,6 @@
 import subprocess
 from .nicInfo import NICInfo
-import pypci
+from ...pyhwUtil import PCIManager
 import os
 
 
@@ -14,7 +14,7 @@ class NICDetectLinux:
         return self._nicInfo
 
     def _getNICInfo(self):
-        nic_devices = pypci.PCI().FindAllNIC()
+        nic_devices = PCIManager.get_instance().FindAllNIC()
         if len(nic_devices) == 0:
             self.__handleNonePciDevices()
         else:

{pyhw-0.13.3 → pyhw-0.14.0}/src/pyhw/backend/nic/windows.py

@@ -1,5 +1,5 @@
 from .nicInfo import NICInfo
-import pypci
+from ...pyhwUtil import PCIManager
 
 
 class NICDetectWindows:
@@ -12,7 +12,7 @@ class NICDetectWindows:
         return self._nicInfo
 
     def _getNICInfo(self):
-        nic_devices = pypci.PCI().FindAllNIC()
+        nic_devices = PCIManager.get_instance().FindAllNIC()
         if len(nic_devices) == 0:
             self.__handleNonePciDevices()
         else:

{pyhw-0.13.3 → pyhw-0.14.0}/src/pyhw/backend/npu/linux.py

@@ -1,5 +1,5 @@
 from .npuInfo import NPUInfo
-import pypci
+from ...pyhwUtil import PCIManager
 import os
 
 
@@ -13,7 +13,7 @@ class NPUDetectLinux:
         return self._npuInfo
 
     def _getNPUInfo(self):
-        npu_devices = pypci.PCI().FindAllNPU()
+        npu_devices = PCIManager.get_instance().FindAllNPU()
         if len(npu_devices) == 0:
             self._handleNonePciDevices()
         else:

{pyhw-0.13.3 → pyhw-0.14.0}/src/pyhw/backend/npu/windows.py

@@ -1,5 +1,5 @@
 from .npuInfo import NPUInfo
-import pypci
+from ...pyhwUtil import PCIManager
 
 
 class NPUDetectWindows:
@@ -12,7 +12,7 @@ class NPUDetectWindows:
         return self._npuInfo
 
     def _getNPUInfo(self):
-        npu_devices = pypci.PCI().FindAllNPU()
+        npu_devices = PCIManager.get_instance().FindAllNPU()
         if len(npu_devices) == 0:
             self._handleNonePciDevices()
         else:

{pyhw-0.13.3 → pyhw-0.14.0}/src/pyhw/backend/os/macos.py

@@ -10,14 +10,15 @@ class OSDetectMacOS:
         self.__ProductVersion = ""
         self.__BuildVersion = ""
         self.__VersionName = ""
+        self.__Arch = self.__handleOSArch()
 
     def getOSInfo(self):
         self.__getOS()
         self.__handelOSName()
         if self.__VersionName != "":
-            self.__osInfo.prettyName = f"{self.__ProductName} {self.__VersionName} {self.__ProductVersion} {self.__BuildVersion} {getArch()}"
+            self.__osInfo.prettyName = f"{self.__ProductName} {self.__VersionName} {self.__ProductVersion} {self.__BuildVersion} {self.__Arch}"
         else:
-            self.__osInfo.prettyName = f"{self.__ProductName} {self.__ProductVersion} {self.__BuildVersion} {getArch()}"
+            self.__osInfo.prettyName = f"{self.__ProductName} {self.__ProductVersion} {self.__BuildVersion} {self.__Arch}"
         self.__osInfo.id = "macOS"
         return self.__osInfo
 
@@ -51,3 +52,11 @@ class OSDetectMacOS:
         version_name = macOSVersionMap.get(major, "")
         if version_name != "":
             self.__VersionName = version_name
+
+    @staticmethod
+    def __handleOSArch():
+        arch = getArch()
+        if arch == "aarch64":
+            return "arm64"
+        else:
+            return arch

pyhw-0.14.0/src/pyhw/pyhwUtil/__init__.py

@@ -0,0 +1,16 @@
+from .pyhwUtil import getOS, getArch, getDocker, getWSL, createDataString, selectOSLogo
+from .sysctlUtil import sysctlGetString, sysctlGetInt
+from .cliUtil import ReleaseChecker
+from .pciUtil import PCIManager
+
+
+__all__ = ["getOS",
+           "getArch",
+           "getDocker",
+           "getWSL",
+           "createDataString",
+           "selectOSLogo",
+           "sysctlGetString",
+           "sysctlGetInt",
+           "ReleaseChecker",
+           "PCIManager"]

{pyhw-0.13.3 → pyhw-0.14.0}/src/pyhw/pyhwUtil/cliUtil.py

@@ -12,13 +12,16 @@ class ReleaseChecker:
     """
     PACKAGE_NAME = "pyhw"
 
-    def __init__(self):
+    def __init__(self, only_local=False):
         """
         Initialize the ReleaseChecker.
         """
         self.isInPIPX = self.__is_running_in_pipx()
         self.CurrentVersion = self.__get_installed_version()
-        self.LatestVersion = self.__get_latest_version()
+        if only_local:
+            self.LatestVersion = self.CurrentVersion
+        else:
+            self.LatestVersion = self.__get_latest_version()
 
     @staticmethod
     def __is_running_in_pipx():

pyhw-0.14.0/src/pyhw/pyhwUtil/pciUtil.py

@@ -0,0 +1,11 @@
+import pypci
+
+
+class PCIManager:
+    _instance = None
+
+    @classmethod
+    def get_instance(cls):
+        if cls._instance is None:
+            cls._instance = pypci.PCI()
+        return cls._instance

{pyhw-0.13.3 → pyhw-0.14.0/src/pyhw.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyhw
-Version: 0.13.3
+Version: 0.14.0
 Summary: PyHw, a neofetch-like command line tool for fetching system information but written mostly in python.
 Author: Xiao Ran
 Maintainer-email: Xiao Ran <xiaoran.007@icloud.com>
@@ -13,7 +13,7 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: pypci-ng>=0.2.5
+Requires-Dist: pypci-ng>=0.2.6
 Dynamic: license-file
 
 # PyHw, a neofetch-like system information fetching tool

{pyhw-0.13.3 → pyhw-0.14.0}/src/pyhw.egg-info/SOURCES.txt

@@ -124,6 +124,7 @@ src/pyhw/pyhwException/__init__.py
 src/pyhw/pyhwException/pyhwException.py
 src/pyhw/pyhwUtil/__init__.py
 src/pyhw/pyhwUtil/cliUtil.py
+src/pyhw/pyhwUtil/pciUtil.py
 src/pyhw/pyhwUtil/pyhwUtil.py
 src/pyhw/pyhwUtil/sysctlUtil.py
 test/test_cliUtil.py

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

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

pyhw-0.13.3/src/pyhw/pyhwUtil/__init__.py

@@ -1,6 +0,0 @@
-from .pyhwUtil import getOS, getArch, getDocker, getWSL, createDataString, selectOSLogo
-from .sysctlUtil import sysctlGetString, sysctlGetInt
-from .cliUtil import ReleaseChecker
-
-
-__all__ = ["getOS", "getArch", "getDocker", "getWSL", "createDataString", "selectOSLogo", "sysctlGetString", "sysctlGetInt", "ReleaseChecker"]

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

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