pyhw 0.6.4__tar.gz → 0.6.6__tar.gz

{pyhw-0.6.4/src/pyhw.egg-info → pyhw-0.6.6}/PKG-INFO

@@ -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 → pyhw-0.6.6}/README.md

@@ -36,6 +36,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
@@ -56,7 +68,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 → pyhw-0.6.6}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pyhw"
-version = "0.6.4"
+version = "0.6.6"
 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.6.4 → pyhw-0.6.6}/src/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-0.6.4 → pyhw-0.6.6}/src/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-0.6.4 → pyhw-0.6.6}/src/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-0.6.6/src/pyhw/pyhwUtil/pyhwUtil.py

@@ -0,0 +1,189 @@
+import platform
+from ..backend import Data
+import os
+from dataclasses import dataclass
+
+
+def getOS():
+    """
+    Get the os type in lower case.
+    :return: str, os type, value in [windows, linux, macos, unknown].
+    """
+    system = platform.system()
+    if system == "Windows":
+        return "windows"
+    elif system == "Linux":
+        return "linux"
+    elif system == "Darwin":
+        return "macos"
+    else:
+        return "unknown"
+
+
+def getArch():
+    """
+    Get the machine architecture.
+    :return: str, value in [x86_64, x86, aarch64, arm32].
+    """
+    arch = platform.machine()
+    if arch == "x86_64" or arch == "AMD64" or arch == "amd64":
+        return "x86_64"
+    elif arch == "i386" or arch == "i686" or arch == "x86":
+        return "x86"
+    elif arch == "aarch64" or arch == "arm64":
+        return "aarch64"
+    elif arch.find("arm") != -1:
+        return "arm32"
+    else:
+        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"
+    data_string += f" OS: {data.OS}\n"
+    data_string += f" Host: {data.Host}\n"
+    data_string += f" Kernel: {data.Kernel}\n"
+    data_string += f" Uptime: {data.Uptime}\n"
+    data_string += f" Shell: {data.Shell}\n"
+    data_string += f" CPU: {data.CPU}\n"
+    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"
+    for npu in data.NPU:
+        data_string += f" NPU: {npu}\n"
+    return data_string
+
+
+@dataclass
+class SupportedOS:
+    ColorConfig = ["armbian", "arch", "alpine", "centos", "debian", "fedora", "macOS", "raspbian", "ubuntu"]
+    AsciiLogo = ["armbian", "arch", "alpine", "centos", "debian", "fedora", "macOS", "raspbian", "ubuntu"]
+
+
+def selectOSLogo(os_id: str):
+    """
+    Select the logo based on the os id and terminal size.
+    :param os_id: str, os id.
+    :return: str, logo id.
+    """
+    if getOS() == "macos":
+        return os_id
+    if os_id in SupportedOS.ColorConfig and os_id in SupportedOS.AsciiLogo:
+        pass
+    else:
+        return "linux"
+    rows_str, columns_str = os.popen('stty size', 'r').read().split()
+    rows = int(rows_str)
+    columns = int(columns_str)
+    if columns <= 80:
+        if os_id in ["fedora", "ubuntu"]:
+            return f"{os_id}_small"
+        else:
+            return os_id
+    else:
+        return os_id
+

{pyhw-0.6.4 → pyhw-0.6.6/src/pyhw.egg-info}/PKG-INFO

@@ -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/src/pyhw/pyhwUtil/pyhwUtil.py

@@ -1,89 +0,0 @@
-import platform
-from ..backend import Data
-import os
-from dataclasses import dataclass
-
-
-def getOS():
-    """
-    Get the os type in lower case.
-    :return: str, os type, value in [windows, linux, macos, unknown].
-    """
-    system = platform.system()
-    if system == "Windows":
-        return "windows"
-    elif system == "Linux":
-        return "linux"
-    elif system == "Darwin":
-        return "macos"
-    else:
-        return "unknown"
-
-
-def getArch():
-    """
-    Get the machine architecture.
-    :return: str, value in [x86_64, x86, aarch64, arm32].
-    """
-    arch = platform.machine()
-    if arch == "x86_64" or arch == "AMD64" or arch == "amd64":
-        return "x86_64"
-    elif arch == "i386" or arch == "i686" or arch == "x86":
-        return "x86"
-    elif arch == "aarch64" or arch == "arm64":
-        return "aarch64"
-    elif arch.find("arm") != -1:
-        return "arm32"
-    else:
-        return "unknown"
-
-
-def createDataString(data: Data):
-    data_string = ""
-    data_string += f" {data.title}\n"
-    data_string += f" {'-'*len(data.title)}\n"
-    data_string += f" OS: {data.OS}\n"
-    data_string += f" Host: {data.Host}\n"
-    data_string += f" Kernel: {data.Kernel}\n"
-    data_string += f" Uptime: {data.Uptime}\n"
-    data_string += f" Shell: {data.Shell}\n"
-    data_string += f" CPU: {data.CPU}\n"
-    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"
-    for npu in data.NPU:
-        data_string += f" NPU: {npu}\n"
-    return data_string
-
-
-@dataclass
-class SupportedOS:
-    ColorConfig = ["armbian", "arch", "alpine", "centos", "debian", "fedora", "macOS", "raspbian", "ubuntu"]
-    AsciiLogo = ["armbian", "arch", "alpine", "centos", "debian", "fedora", "macOS", "raspbian", "ubuntu"]
-
-
-def selectOSLogo(os_id: str):
-    """
-    Select the logo based on the os id and terminal size.
-    :param os_id: str, os id.
-    :return: str, logo id.
-    """
-    if getOS() == "macos":
-        return os_id
-    if os_id in SupportedOS.ColorConfig and os_id in SupportedOS.AsciiLogo:
-        pass
-    else:
-        return "linux"
-    rows_str, columns_str = os.popen('stty size', 'r').read().split()
-    rows = int(rows_str)
-    columns = int(columns_str)
-    if columns <= 80:
-        if os_id in ["fedora", "ubuntu"]:
-            return f"{os_id}_small"
-        else:
-            return os_id
-    else:
-        return os_id
-