pyhw 0.15.1__py3-none-any.whl → 0.15.2__py3-none-any.whl

pyhw/__init__.py

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

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.1.dist-info → pyhw-0.15.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyhw
-Version: 0.15.1
+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>

{pyhw-0.15.1.dist-info → pyhw-0.15.2.dist-info}/RECORD

@@ -1,4 +1,4 @@
-pyhw/__init__.py,sha256=HOB6zppm7om1pAT4p00ZL8jZJeZ3GXNEQS3ktRh0PQU,49
+pyhw/__init__.py,sha256=BQ_mh7NYOqC-G9WWF7YHQFKIPHIM0oXNr5NntIeUTUs,49
 pyhw/__main__.py,sha256=sycXv_HBzXuNET2w0-fRgMwHaWIsMALyJ_ZCxdZulDk,7696
 pyhw/backend/__init__.py,sha256=X1D1D28lSojDrUzUolgJvmbuctwBh_UxG3FwUeL8adA,51
 pyhw/backend/backendBase.py,sha256=mloo8mPEbgbIdmyQ3I4vdEXMSSjxWi_wnwACmzvHbEo,506
@@ -74,7 +74,7 @@ pyhw/backend/uptime/uptimeBase.py,sha256=HVRFZHO-2F_UKH0ti9wR16iHCH7Q8dga0HfxFxU
 pyhw/backend/uptime/uptimeInfo.py,sha256=TobPEV3MBT3Fiv3W6TOzD3a4MNW-vz2Oi_Trlcihu7k,114
 pyhw/backend/uptime/windows.py,sha256=JP6Co-V_fljOEMEkydNKDJ7OY7LGhtWf8IRLuIb6F4I,1742
 pyhw/frontend/__init__.py,sha256=jKkL3EvL069POGesru6FUlsMhW8AxiaVAErubWRFXE8,58
-pyhw/frontend/frontendBase.py,sha256=qRZOF5iTVgnzKBEKr4Kat1-Oowy-bRa6oOZu40ADUxo,5032
+pyhw/frontend/frontendBase.py,sha256=IiSbJwWjj4H2CQEcTmFVuzoyUWpl0lx5AIiYm1nbOJ0,7072
 pyhw/frontend/color/__init__.py,sha256=uPtOM76b_b9F85AgYDyoOGNKeUHGpZnT752g_kCUVng,192
 pyhw/frontend/color/colorConfig.py,sha256=ReCR3IR6K1c28Tkf3uFg74mSzCMqXmUniegRiyGeq_w,7752
 pyhw/frontend/color/colorSet.py,sha256=spH8PlRu7capouf-yUgDHgoPCnM5aJ_ncascISZfz2g,1421
@@ -121,9 +121,9 @@ pyhw/pyhwUtil/cliUtil.py,sha256=IUcWun5nDwQb20Qe8YefS5j3Jji8a-F41Qd9QwCf0h0,2454
 pyhw/pyhwUtil/pciUtil.py,sha256=WAluDRDb-gUbqhvSIusFzPrf6r98EkrNEAwbPyMwrTc,202
 pyhw/pyhwUtil/pyhwUtil.py,sha256=XA1sQnAZmfA3QdmCzqiNWN4CDJKtnPK7N0j_1p3shiQ,8373
 pyhw/pyhwUtil/sysctlUtil.py,sha256=S-rUvqi7ZrMyMouIhxlyHEQ4agM7sCT1Y7uzs3Hu5-o,841
-pyhw-0.15.1.dist-info/licenses/LICENSE,sha256=hJs6RBqSVCexbTsalkMLNFI5t06kekQEsSVaOt_-yLs,1497
-pyhw-0.15.1.dist-info/METADATA,sha256=3OfrFEDp6Yd09Vs06NFoEqvIVoztuj240TKTsJIT-TQ,7715
-pyhw-0.15.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pyhw-0.15.1.dist-info/entry_points.txt,sha256=q-AB8im_QahpmNrmy4aPTJRGi0LlbNlnI3kF7s6pKss,44
-pyhw-0.15.1.dist-info/top_level.txt,sha256=7Inxvxt1TngEricKZEex9_WJZS3DbKYFUXDz4v5WHYU,5
-pyhw-0.15.1.dist-info/RECORD,,
+pyhw-0.15.2.dist-info/licenses/LICENSE,sha256=hJs6RBqSVCexbTsalkMLNFI5t06kekQEsSVaOt_-yLs,1497
+pyhw-0.15.2.dist-info/METADATA,sha256=qRrmoj6mZiYaeyWN2T4z6eewCAli1uUeMBUEmv7W33w,7715
+pyhw-0.15.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pyhw-0.15.2.dist-info/entry_points.txt,sha256=q-AB8im_QahpmNrmy4aPTJRGi0LlbNlnI3kF7s6pKss,44
+pyhw-0.15.2.dist-info/top_level.txt,sha256=7Inxvxt1TngEricKZEex9_WJZS3DbKYFUXDz4v5WHYU,5
+pyhw-0.15.2.dist-info/RECORD,,