pyhw 0.6.4__py3-none-any.whl → 0.6.6__py3-none-any.whl

pyhw/backend/cpu/macos.py

@@ -64,6 +64,8 @@ class CPUDetectMacOS:
             "Apple M3": "4.05 GHz",
             "Apple M3 Pro": "4.05 GHz",
             "Apple M3 Max": "4.05 GHz",
-            "Apple M4": "4.40 GHz"
+            "Apple M4": "4.40 GHz",
+            "Apple M4 Pro": "4.40 GHz",
+            "Apple M4 Max": "4.40 GHz"
         }
         self.__cpuInfo.frequency = freq.get(self.__cpuInfo.model, "Unknown")

pyhw/backend/host/linux.py

@@ -19,9 +19,17 @@ class HostDetectLinux:
         if self.__arch in ["x86_64", "x86"]:
             try:
                 with open("/sys/devices/virtual/dmi/id/product_name", "r") as f:
-                    self.__hostInfo.name = f.read().strip()
+                    product_name = f.read().strip()
+                    if product_name.startswith("To be filled by O.E.M."):
+                        self.__hostInfo.name = f"General {self.__arch} Host"
+                    else:
+                        self.__hostInfo.name = product_name
                 with open("/sys/devices/virtual/dmi/id/product_version", "r") as f:
-                    self.__hostInfo.version = f.read().strip()
+                    version = f.read().strip()
+                    if version.startswith("To be filled by O.E.M."):
+                        self.__hostInfo.version = ""
+                    else:
+                        self.__hostInfo.version = version
                 self.__hostInfo.model = self.__hostInfo.name + " " + self.__hostInfo.version
             except FileNotFoundError:
                 pass

pyhw/frontend/frontendBase.py

@@ -1,5 +1,7 @@
 from .logo import Logo
 from .color import ColorConfigSet, colorPrefix, colorSuffix, ColorSet
+from ..pyhwUtil import getOS
+import os
 import re
 
 
@@ -16,6 +18,7 @@ class Printer:
         self.__combined_lines = []
         self.__logo_color_indexes = {}
         self.__reg = r'\$(\d)'
+        self.__columns = self.__getColumns()
 
     def cPrint(self):
         self.__LogoPreprocess()
@@ -31,8 +34,37 @@ class Printer:
         for data_line in self.__processed_data_lines[len(self.__processed_logo_lines):]:
             self.__combined_lines.append(" " * (max_len_logo + 1) + data_line)
 
+        self.__dropLongString()
+
         print("\n".join(self.__combined_lines))
 
+    def __dropLongString(self):
+        # Need more accurate way to drop long strings
+        if getOS() == "linux":
+            fixed_lines = list()
+            for line in self.__combined_lines:
+                if len(line) > self.__columns+20:
+                    fixed_lines.append(line[:self.__columns+20])
+                else:
+                    fixed_lines.append(line)
+            self.__combined_lines = fixed_lines
+        else:
+            pass
+
+
+    @staticmethod
+    def __getColumns() -> int:
+        if getOS() == "linux":
+            try:
+                _, columns_str = os.popen('stty size', 'r').read().split()
+                columns = int(columns_str)
+            except:
+                columns = 80  # default terminal size is 80 columns
+        else:
+            # macOS default terminal size is 80 columns
+            columns = 80
+        return columns
+
     def __LogoPreprocess(self):
         global_color = self.__config.get("colors")[0]
         for logo_line in self.__logo_lines:

pyhw/pyhwUtil/pyhwUtil.py

@@ -38,7 +38,107 @@ def getArch():
         return "unknown"
 
 
+class DataStringProcessor:
+    def __init__(self, data: Data):
+        self.data = data
+        self.columns = self.__getENV()
+
+    @staticmethod
+    def __getENV() -> int:
+        if getOS() == "linux":
+            _, columns_str = os.popen('stty size', 'r').read().split()
+            columns = int(columns_str)
+        else:
+            # macOS default terminal size is 80 columns
+            columns = 80
+        return columns
+
+    def __dropLongString(self, string: str) -> str:
+        """
+        Drop the string if it's too long to fit in the terminal.
+        :param string: str, the input string.
+        :return: str, the shortened string, do not include newline char.
+        """
+        if len(string) >= self.columns:
+            return f"{string[:self.columns-1]}"
+        else:
+            return f"{string}"
+
+    def getTitle(self) -> str:
+        return f" {self.data.title}\n"
+
+    def getLine(self) -> str:
+        return f" {'-'*len(self.data.title)}\n"
+
+    def getOS(self) -> str:
+        os_str = f" OS: {self.data.OS}"
+        return f"{self.__dropLongString(os_str)}\n"
+
+    def getHost(self) -> str:
+        host_str = f" Host: {self.data.Host}"
+        return f"{self.__dropLongString(host_str)}\n"
+
+    def getKernel(self) -> str:
+        kernel_str = f" Kernel: {self.data.Kernel}"
+        return f"{self.__dropLongString(kernel_str)}\n"
+
+    def getUptime(self) -> str:
+        uptime_str = f" Uptime: {self.data.Uptime}"
+        return f"{self.__dropLongString(uptime_str)}\n"
+
+    def getShell(self) -> str:
+        shell_str = f" Shell: {self.data.Shell}"
+        return f"{self.__dropLongString(shell_str)}\n"
+
+    def getCPU(self) -> str:
+        cpu_str = f" CPU: {self.data.CPU}"
+        return f"{self.__dropLongString(cpu_str)}\n"
+
+    def getGPU(self) -> str:
+        ret_str = ""
+        for gpu in self.data.GPU:
+            gpu_str = f" GPU: {gpu}"
+            ret_str += f"{self.__dropLongString(gpu_str)}\n"
+        return ret_str
+
+    def getMemory(self) -> str:
+        memory_str = f" Memory: {self.data.Memory}"
+        return f"{self.__dropLongString(memory_str)}\n"
+
+    def getNIC(self) -> str:
+        ret_str = ""
+        for nic in self.data.NIC:
+            nic_str = f" NIC: {nic}"
+            ret_str += f"{self.__dropLongString(nic_str)}\n"
+        return ret_str
+
+    def getNPU(self) -> str:
+        ret_str = ""
+        for npu in self.data.NPU:
+            npu_str = f" NPU: {npu}"
+            ret_str += f"{self.__dropLongString(npu_str)}\n"
+        return ret_str
+
+
 def createDataString(data: Data):
+    data_string_processor = DataStringProcessor(data)
+    data_string = ""
+    data_string += data_string_processor.getTitle()
+    data_string += data_string_processor.getLine()
+    data_string += data_string_processor.getOS()
+    data_string += data_string_processor.getHost()
+    data_string += data_string_processor.getKernel()
+    data_string += data_string_processor.getUptime()
+    data_string += data_string_processor.getShell()
+    data_string += data_string_processor.getCPU()
+    data_string += data_string_processor.getGPU()
+    data_string += data_string_processor.getMemory()
+    data_string += data_string_processor.getNIC()
+    data_string += data_string_processor.getNPU()
+    return data_string
+
+
+def createDataStringOld(data: Data):
     data_string = ""
     data_string += f" {data.title}\n"
     data_string += f" {'-'*len(data.title)}\n"

{pyhw-0.6.4.dist-info → pyhw-0.6.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyhw
-Version: 0.6.4
+Version: 0.6.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
@@ -53,6 +53,18 @@ 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:
 If you use system pip to install pyhw, you will encounter this problem on debian12 and some related distributions:
 ```text
@@ -73,7 +85,7 @@ 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 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) or force remove this restriction (not recommended).
 
 ## Supported (Tested) OS
 * macOS arm64, x86_64

{pyhw-0.6.4.dist-info → pyhw-0.6.6.dist-info}/RECORD

@@ -7,7 +7,7 @@ pyhw/backend/cpu/__init__.py,sha256=5YfANJVRwNwTRodG0ENOgusrdN592aaSnfq5ok4dKTo,
 pyhw/backend/cpu/cpuBase.py,sha256=AGWqVjdvb82NiH4kxk3GERdBLwBNhkR23j2ei_l3S18,464
 pyhw/backend/cpu/cpuInfo.py,sha256=A_nNGElq9W7oZ5DFJowLdFBE0ZvXKr5h29E6TGAvbRc,251
 pyhw/backend/cpu/linux.py,sha256=zJ2cOwQHtolJrMMY1WXVbLLIRNPxeClUgzLAAkd7As4,3346
-pyhw/backend/cpu/macos.py,sha256=mnnH9ABiBgAiyA8-H9_tq2PC5OeneVLj67nMGoLDXh4,2873
+pyhw/backend/cpu/macos.py,sha256=pacU-yT7q-HKerkh2Q0BSdzSY6dKzHfSnRZBmimqqXk,2953
 pyhw/backend/gpu/__init__.py,sha256=EpMjPvUaXt0LTNMvGmB8WgXbUB9keCxuOhu8NT3Re6o,56
 pyhw/backend/gpu/gpuBase.py,sha256=Ge0DX2P8_EB7ovM7glmPUnVsPJL3OUHV2t_1T5mimR0,409
 pyhw/backend/gpu/gpuInfo.py,sha256=d_z_z5DiZAg85wP0VOBQEU0QHdaK3qFqA2Tp9Eq8-Zs,133
@@ -16,7 +16,7 @@ pyhw/backend/gpu/macos.py,sha256=SmTqqTrIMRW-GVPmDs8xAiOX7HsCjrGh9qkxLQCdvO8,385
 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
-pyhw/backend/host/linux.py,sha256=dr82gDA4SQgyTTI3Kq5V3V6qEDH4DXoJo0wyqeXYdHk,2005
+pyhw/backend/host/linux.py,sha256=wp65o_BJUxq-rkts_1UVP6IuK6U54Cl066G3QfZksiQ,2424
 pyhw/backend/host/macos.py,sha256=KW-EJK9g1xHNrFsVxJv5GPLpc_ZevX0Zv1WjZUzRkzo,15369
 pyhw/backend/host/windows.py,sha256=rjDJaIs-5zspzFsNCMCh6m2yZXEXI0vccqeBpmAdEBk,53
 pyhw/backend/kernel/__init__.py,sha256=fGjwjpOhwA_PnsWbwoq102hwhTay2ufYKaTqxjSV2-I,65
@@ -58,7 +58,7 @@ pyhw/backend/uptime/macos.py,sha256=8lTlR0WUzgGqUNspqegg4dP_j5ySOCTyFlXpyRBJ-Jw,
 pyhw/backend/uptime/uptimeBase.py,sha256=cP6aTPnFe6XQHgBX7YcDuuGHARI11ctMlyrrtsU-Opc,657
 pyhw/backend/uptime/uptimeInfo.py,sha256=TobPEV3MBT3Fiv3W6TOzD3a4MNW-vz2Oi_Trlcihu7k,114
 pyhw/frontend/__init__.py,sha256=xgv_iVv9w4cLXklbdtFWXu7J7KJxBCUw-ZcUQb_abFc,57
-pyhw/frontend/frontendBase.py,sha256=RUh1s2yzU0iHaDmrFR5O4P64SHDO2007OTPsylDv0as,3714
+pyhw/frontend/frontendBase.py,sha256=t_lq2mvBet3l8Kn7bvab1bvfwCaD7PZ6dzN8fMCzHOI,4713
 pyhw/frontend/color/__init__.py,sha256=xk511qWwdYWEVjk_zOaC4fs81HtwR4ELr3wi1tTL824,191
 pyhw/frontend/color/colorConfig.py,sha256=3k6aMoU7ymThG3yytzKqQDDxz8xL5wfZL_2cDiPusXI,4353
 pyhw/frontend/color/colorSet.py,sha256=spH8PlRu7capouf-yUgDHgoPCnM5aJ_ncascISZfz2g,1421
@@ -77,15 +77,15 @@ pyhw/frontend/logo/ascii/macOS.pyhw,sha256=HBGROtBb7wrNtRqAQ9ND7zxK0l17BRsmpgc2d
 pyhw/frontend/logo/ascii/raspbian.pyhw,sha256=jEl6WMKF-FGx359ipQ1kzweUJS-NuauYQCFaYime4PQ,159
 pyhw/frontend/logo/ascii/ubuntu.pyhw,sha256=l-Q0PfutxXYMwTojqeiM88063x4V0RBkZUHmi6YdsNc,833
 pyhw/frontend/logo/ascii/ubuntu_small.pyhw,sha256=Xf8LSZdZUu9aEG3efhb1FUlUEuJ-3UztcIOJISpKhPw,229
-pyhw/library/lib/iokitGPULib.dylib,sha256=18A4SyThKQvzEEOijeWb4XsgXO-iTFYGa0XtrDoBHjY,154808
+pyhw/library/lib/iokitGPULib.dylib,sha256=DcJ0GZY79gTFckLFYtZgeKn1T0NFvdO_k_ccCa7od5Y,154808
 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=CKXJrt6KGhZCV1J7MjsQ21c_jPmC1I3wZBPCKJfdqbM,2478
+pyhw/pyhwUtil/pyhwUtil.py,sha256=0Pn-0MqgloQV_p5HrM3HwrGsA_eB-P2eW2hLJrHWmhk,5762
 pyhw/pyhwUtil/sysctlUtil.py,sha256=S-rUvqi7ZrMyMouIhxlyHEQ4agM7sCT1Y7uzs3Hu5-o,841
-pyhw-0.6.4.dist-info/LICENSE,sha256=hJs6RBqSVCexbTsalkMLNFI5t06kekQEsSVaOt_-yLs,1497
-pyhw-0.6.4.dist-info/METADATA,sha256=sVm6HaUN-JkIvFZvFqCIbvzdxSp0rM0MlKKd1eCibv8,4742
-pyhw-0.6.4.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-pyhw-0.6.4.dist-info/entry_points.txt,sha256=q-AB8im_QahpmNrmy4aPTJRGi0LlbNlnI3kF7s6pKss,44
-pyhw-0.6.4.dist-info/top_level.txt,sha256=7Inxvxt1TngEricKZEex9_WJZS3DbKYFUXDz4v5WHYU,5
-pyhw-0.6.4.dist-info/RECORD,,
+pyhw-0.6.6.dist-info/LICENSE,sha256=hJs6RBqSVCexbTsalkMLNFI5t06kekQEsSVaOt_-yLs,1497
+pyhw-0.6.6.dist-info/METADATA,sha256=lDfujbVf0CPbvs5_n97qzeRBA5Y3xmjQ6hWAsuMIeV4,5225
+pyhw-0.6.6.dist-info/WHEEL,sha256=R06PA3UVYHThwHvxuRWMqaGcr-PuniXahwjmQRFMEkY,91
+pyhw-0.6.6.dist-info/entry_points.txt,sha256=q-AB8im_QahpmNrmy4aPTJRGi0LlbNlnI3kF7s6pKss,44
+pyhw-0.6.6.dist-info/top_level.txt,sha256=7Inxvxt1TngEricKZEex9_WJZS3DbKYFUXDz4v5WHYU,5
+pyhw-0.6.6.dist-info/RECORD,,

{pyhw-0.6.4.dist-info → pyhw-0.6.6.dist-info}/WHEEL

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