pyhw 0.9.0__py3-none-any.whl → 0.10.0__py3-none-any.whl

pyhw/__init__.py

@@ -1 +1 @@
-__version__ = '0.9.0'
+__version__ = '0.10.0'

pyhw/__main__.py

@@ -13,33 +13,122 @@ from .backend.nic import NICDetect
 from .backend.npu import NPUDetect
 from .pyhwUtil import createDataString
 from .pyhwUtil import getOS, selectOSLogo
+import multiprocessing
+
+
+def detect_title(os, result_dict):
+    result_dict["title"] = TitleDetect(os=os).getTitle().title
+
+
+def detect_host(os, result_dict):
+    result_dict["Host"] = HostDetect(os=os).getHostInfo().model
+
+
+def detect_kernel(os, result_dict):
+    result_dict["Kernel"] = KernelDetect(os=os).getKernelInfo().kernel
+
+
+def detect_shell(os, result_dict):
+    result_dict["Shell"] = ShellDetect(os=os).getShellInfo().info
+
+
+def detect_uptime(os, result_dict):
+    result_dict["Uptime"] = UptimeDetect(os=os).getUptime().uptime
+
+
+def detect_os(os, result_dict):
+    result_dict["OS"] = OSDetect(os=os).getOSInfo().prettyName
+
+
+def detect_cpu(os, result_dict):
+    result_dict["CPU"] = CPUDetect(os=os).getCPUInfo().cpu
+
+
+def detect_gpu(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):
+    result_dict["Memory"] = MemoryDetect(os=os).getMemoryInfo().memory
+
+
+def detect_nic(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):
+    npu_info = NPUDetect(os=os).getNPUInfo()
+    if npu_info.number > 0:
+        result_dict["NPU"] = npu_info.npus
 
 
 def main():
     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}")
+        print(f"Only Linux, macOS, FreeBSD, and Windows are supported for now. Current OS: {current_os}")
         return
+
     data = Data()
-    data.title = TitleDetect(os=current_os).getTitle().title
-    data.Host = HostDetect(os=current_os).getHostInfo().model
-    data.Kernel = KernelDetect(os=current_os).getKernelInfo().kernel
-    data.Shell = ShellDetect(os=current_os).getShellInfo().info
-    data.Uptime = UptimeDetect(os=current_os).getUptime().uptime
-    data.OS = OSDetect(os=current_os).getOSInfo().prettyName
-    data.CPU = CPUDetect(os=current_os).getCPUInfo().cpu
-    gpu_info = GPUDetect(os=current_os).getGPUInfo()
-    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
-    npu_info = NPUDetect(os=current_os).getNPUInfo()
-    if npu_info.number > 0:
-        data.NPU = npu_info.npus
 
-    Printer(logo_os=selectOSLogo(OSDetect(os=current_os).getOSInfo().id), data=createDataString(data)).cPrint()
+    manager = multiprocessing.Manager()
+    result_dict = manager.dict()
+
+    processes = [
+        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)),
+    ]
+
+    for process in processes:
+        process.start()
+
+    for process in processes:
+        process.join()
+
+    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()
+
+
+# def main():
+#     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}")
+#         return
+#     data = Data()
+#     data.title = TitleDetect(os=current_os).getTitle().title
+#     data.Host = HostDetect(os=current_os).getHostInfo().model
+#     data.Kernel = KernelDetect(os=current_os).getKernelInfo().kernel
+#     data.Shell = ShellDetect(os=current_os).getShellInfo().info
+#     data.Uptime = UptimeDetect(os=current_os).getUptime().uptime
+#     data.OS = OSDetect(os=current_os).getOSInfo().prettyName
+#     data.CPU = CPUDetect(os=current_os).getCPUInfo().cpu
+#     gpu_info = GPUDetect(os=current_os).getGPUInfo()
+#     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
+#     npu_info = NPUDetect(os=current_os).getNPUInfo()
+#     if npu_info.number > 0:
+#         data.NPU = npu_info.npus
+#
+#     Printer(logo_os=selectOSLogo(OSDetect(os=current_os).getOSInfo().id), data=createDataString(data)).cPrint()
 
 
 if __name__ == "__main__":

{pyhw-0.9.0.dist-info → pyhw-0.10.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: pyhw
-Version: 0.9.0
+Version: 0.10.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
@@ -10,10 +10,10 @@ Classifier: Development Status :: 4 - Beta
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: BSD License
 Classifier: Operating System :: OS Independent
-Requires-Python: >=3.9
+Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: pypci-ng>=0.1.2
+Requires-Dist: pypci-ng>=0.1.3
 
 # PyHw
 [![Downloads](https://static.pepy.tech/badge/pyhw)](https://pepy.tech/project/pyhw)
@@ -42,8 +42,23 @@ This project is a Python reimplementation of [neofetch](https://github.com/dylan
 
 
 
-## Install
-There are already a lot of similar tools so you can choose any of them; they're all essentially no different. If you want to try this tool, just install it directly by pip.
+## 1. Install
+There are already a lot of similar tools so you can choose any of them; they're all essentially no different. If you want to try this tool, There are two convenient ways to install it.
+
+### 1.1 Install by pipx
+**pipx** is an amazing tool to help you install and run applications written in Python. It is more like **brew** or **apt**. You can find more information about it here [pipx](https://github.com/pypa/pipx). **pipx** is available on almost all major platforms and is usually provided by the corresponding package manager. If you haven't used pipx before, you can refer to this [document](https://pipx.pypa.io/stable/installation/) to install it.
+
+You can install pyhw by the following command:
+```shell
+pipx install pyhw
+```
+You can then use this tool directly from the command line with the following command, just like neofetch.
+```shell
+pyhw
+```
+
+### 1.2 Install by pip
+In any case, pip is always available, so if you can't install this program using **pipx**, you can install pyhw by the following command:
 ```shell
 pip install pyhw
 ```
@@ -61,19 +76,8 @@ python -m pyhw
 ```
 Please note that the command line entry for __pyhw__ is created by pip, and depending on the user, this entry may not in the __system PATH__. If you encounter this problem, pip will give you a prompt, follow the prompts to add entry to the __system PATH__.
 
-### Install by pipx
-**pipx** is an amazing tool to help you install and run applications written in Python. It is more like **brew** or **apt**. You can find more information about it here [pipx](https://github.com/pypa/pipx).
-
-You can install pyhw by the following command:
-```shell
-pipx install pyhw
-```
-You can then use this tool directly from the command line with the following command, just like neofetch.
-```shell
-pyhw
-```
 
-### Important note about debian 12:
+### 1.3 Important note about debian 12:
 If you use system pip to install pyhw, you will encounter this problem on debian12 and some related distributions (like Ubuntu 24.04):
 ```text
 error: externally-managed-environment
@@ -93,32 +97,34 @@ error: externally-managed-environment
 note: If you believe this is a mistake, please contact your Python installation or OS distribution provider. You can override this, at the risk of breaking your Python installation or OS, by passing --break-system-packages.
 hint: See PEP 668 for the detailed specification.
 ```
-This is due to the fact that system python is not supposed to be managed by pip. You can simply use **pipx** to install **pyhw**. Or you can use a virtual environment (venv) or force remove this restriction (not recommended).
+This is due to the fact that system python is not supposed to be managed by pip. You can simply use **pipx** to install **pyhw**. Or you can use a virtual environment (venv), conda environment or force remove this restriction (not recommended).
 
-## Tested OS
+## 2. Tested OS
 * macOS arm64, x86_64
 * Linux arm64, x86_64, riscv64
 * FreeBSD arm64
-* Windows 10 X86_64
+* Windows 10 x86_64
+* Windows 11 arm64, x86_64
+
+For more detailed information, please refer to [Tested Platform](docs/tested_platform.md).
 
-## Add Logo
+## 3. Add Logo
 1. Create a file named **\<os>.pyhw** in **logo/ascii** folder
 2. Modify **colorConfig.py** file to add a new logo style
 3. Update **pyhwUtil.py** to enable new logo style.
 
-## Build from source
-Currently, build process relay on swiftc and macOS IOKit framework. To build package from source, you need a Mac machine with macOS 11 and newer.
+## 4. Build from source
 
-### Dependencies
+### 4.1 Dependencies
 This package was originally implemented in pure python and only depends on the python standard library. However, in subsequent development, the code for the pci part was separated into a separate package **pypci-ng**, which can be obtained using pip (or check out [this](https://github.com/xiaoran007/pypci) GitHub repository).
 
-### Build tools
+### 4.2 Build tools
 Make sure the following Python build tools are already installed.
 * setuptools
 * build
 * twine
 
-### Build package
+### 4.3 Build package
 clone the project, and run:
 ```shell
 python -m build
@@ -127,11 +133,17 @@ After the build process, the source package and the binary whl package can be fo
 ```shell
 pip install dist/*.whl --force-reinstall
 ```
-Or simply type:
+
+### 4.4 Build Full Feature package
+Currently, build process relay on swiftc and macOS IOKit framework. To build Full Feature Package from source, you need a Mac machine with macOS 11 and newer.
+
+Simply type:
 ```shell
 make build
 make install
 ```
+
+## 5. Test Package
 If you have docker installed, you can test this package through docker by type:
 ```shell
 make test # local build

{pyhw-0.9.0.dist-info → pyhw-0.10.0.dist-info}/RECORD

@@ -1,5 +1,5 @@
-pyhw/__init__.py,sha256=_DlwPNmTZTKflLiAF8YIqSr2ao66CTjj4bQtA6hz0jM,22
-pyhw/__main__.py,sha256=AYSSricHPScjYNF-LgFHfQUqKcxq8FruDW2a89FAXfA,1795
+pyhw/__init__.py,sha256=RYs3cR49NZ5Zwt0avo2mYyRcdWjLbrKBCHRHpqCJx24,23
+pyhw/__main__.py,sha256=Gp50LaRF9vl_czdLNJRoa0OIzctLKhcZU0XH3EjNVjM,4741
 pyhw/backend/__init__.py,sha256=knn_3Yroow1h0dqdrozk3zyy3vz-kQyNBRjR6OLmVoY,50
 pyhw/backend/backendBase.py,sha256=mloo8mPEbgbIdmyQ3I4vdEXMSSjxWi_wnwACmzvHbEo,506
 pyhw/backend/cpu/__init__.py,sha256=5YfANJVRwNwTRodG0ENOgusrdN592aaSnfq5ok4dKTo,56
@@ -105,9 +105,9 @@ pyhw/pyhwException/pyhwException.py,sha256=wxuzFQa9g7XB1q9TUKO_55lw7wMEJMpzG8w1G
 pyhw/pyhwUtil/__init__.py,sha256=diIqlNUBfuHu-2VAOJk5nipGLafnWxR3chAAOmX8QRo,250
 pyhw/pyhwUtil/pyhwUtil.py,sha256=h4Xz0heMrBoj2ViHyWmWUNcWmIZlxAmMhqZXskEHpTU,6765
 pyhw/pyhwUtil/sysctlUtil.py,sha256=S-rUvqi7ZrMyMouIhxlyHEQ4agM7sCT1Y7uzs3Hu5-o,841
-pyhw-0.9.0.dist-info/LICENSE,sha256=hJs6RBqSVCexbTsalkMLNFI5t06kekQEsSVaOt_-yLs,1497
-pyhw-0.9.0.dist-info/METADATA,sha256=oC2iJ9uHoQJAB03GK4V6JelRcshwC5zjZPIGC2K7wdU,6018
-pyhw-0.9.0.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-pyhw-0.9.0.dist-info/entry_points.txt,sha256=q-AB8im_QahpmNrmy4aPTJRGi0LlbNlnI3kF7s6pKss,44
-pyhw-0.9.0.dist-info/top_level.txt,sha256=7Inxvxt1TngEricKZEex9_WJZS3DbKYFUXDz4v5WHYU,5
-pyhw-0.9.0.dist-info/RECORD,,
+pyhw-0.10.0.dist-info/LICENSE,sha256=hJs6RBqSVCexbTsalkMLNFI5t06kekQEsSVaOt_-yLs,1497
+pyhw-0.10.0.dist-info/METADATA,sha256=CCpHUPKmL57ySsW9fPxag_Ef-Mkv8ClP7k_Z2gT8HKc,6669
+pyhw-0.10.0.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+pyhw-0.10.0.dist-info/entry_points.txt,sha256=q-AB8im_QahpmNrmy4aPTJRGi0LlbNlnI3kF7s6pKss,44
+pyhw-0.10.0.dist-info/top_level.txt,sha256=7Inxvxt1TngEricKZEex9_WJZS3DbKYFUXDz4v5WHYU,5
+pyhw-0.10.0.dist-info/RECORD,,