pyhw 0.15.0__tar.gz → 0.15.2__tar.gz

{pyhw-0.15.0/src/pyhw.egg-info → pyhw-0.15.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyhw
-Version: 0.15.0
+Version: 0.15.2
 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.6
+Requires-Dist: pypci-ng>=0.2.7
 Dynamic: license-file
 
 # PyHw, a neofetch-like system information fetching tool

{pyhw-0.15.0 → pyhw-0.15.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pyhw"
-version = "0.15.0"
+version = "0.15.2"
 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.6"
+    "pypci-ng>=0.2.7"
 ]
 classifiers = [
     "Development Status :: 4 - Beta",

{pyhw-0.15.0 → pyhw-0.15.2}/src/pyhw/__init__.py

@@ -1,2 +1,2 @@
-__version__ = '0.15.0'
+__version__ = '0.15.2'
 __author__ = 'xiaoran007'

{pyhw-0.15.0 → pyhw-0.15.2}/src/pyhw/frontend/frontendBase.py

@@ -4,6 +4,7 @@ from ..pyhwUtil import getOS
 from ..pyhwException import BackendException
 import subprocess
 import re
+import os
 
 
 class Printer:
@@ -40,31 +41,91 @@ class Printer:
         print("\n".join(self.__combined_lines))
 
     def __dropLongString(self):
-        # Need more accurate way to drop long strings
-        if getOS() == "linux":
+        """
+        Truncate lines that exceed terminal width, accounting for ANSI escape sequences.
+        ANSI escape sequences don't contribute to visible width but are counted by len().
+        Enabled on both Linux and macOS.
+        """
+        if getOS() in ["linux", "macos"]:
             fixed_lines = list()
             for line in self.__combined_lines:
-                if len(line) > self.__columns+20:
-                    fixed_lines.append(line[:self.__columns+20])
+                visible_length = self.__getVisibleLength(line)
+                if visible_length > self.__columns:
+                    truncated_line = self.__truncateToWidth(line, self.__columns)
+                    fixed_lines.append(truncated_line)
                 else:
                     fixed_lines.append(line)
             self.__combined_lines = fixed_lines
         else:
             pass
 
+    @staticmethod
+    def __getVisibleLength(text: str) -> int:
+        """
+        Calculate the visible length of a string, excluding ANSI escape sequences.
+        ANSI codes follow the pattern: \033[...m
+        """
+        ansi_pattern = re.compile(r'\033\[[0-9;]*m')
+        clean_text = ansi_pattern.sub('', text)
+        return len(clean_text)
+
+    @staticmethod
+    def __truncateToWidth(text: str, max_width: int) -> str:
+        """
+        Truncate a string to a maximum visible width while preserving ANSI escape sequences.
+        Ensures proper color reset at the end if truncated.
+        """
+        ansi_pattern = re.compile(r'(\033\[[0-9;]*m)')
+        parts = ansi_pattern.split(text)
+        
+        result = []
+        visible_count = 0
+        
+        for part in parts:
+            if ansi_pattern.match(part):
+                result.append(part)
+            else:
+                remaining = max_width - visible_count
+                if remaining <= 0:
+                    break
+                if len(part) <= remaining:
+                    result.append(part)
+                    visible_count += len(part)
+                else:
+                    result.append(part[:remaining])
+                    visible_count += remaining
+                    break
+        
+        truncated = ''.join(result)
+        if not truncated.endswith('\033[0m'):
+            truncated += '\033[0m'
+        
+        return truncated
+
     @staticmethod
     def __getColumns() -> int:
-        if getOS() == "linux":
-            try:
-                result = subprocess.run(['stty', 'size'], capture_output=True, text=True)
-                _, columns_str = result.stdout.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
+        try:
+            columns = os.get_terminal_size().columns
+            return columns
+        except (OSError, AttributeError):
+            pass
+
+        try:
+            result = subprocess.run(['stty', 'size'], capture_output=True, text=True, check=True)
+            _, columns_str = result.stdout.strip().split()
+            columns = int(columns_str)
+            return columns
+        except (subprocess.CalledProcessError, ValueError, FileNotFoundError):
+            pass
+
+        try:
+            columns = int(os.environ.get('COLUMNS', 0))
+            if columns > 0:
+                return columns
+        except (ValueError, TypeError):
+            pass
+
+        return 80
 
     def __LogoPreprocess(self):
         global_color = self.__config.get("colors")[0]

{pyhw-0.15.0 → pyhw-0.15.2/src/pyhw.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyhw
-Version: 0.15.0
+Version: 0.15.2
 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.6
+Requires-Dist: pypci-ng>=0.2.7
 Dynamic: license-file
 
 # PyHw, a neofetch-like system information fetching tool

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

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

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

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