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

pyhw/__init__.py

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

pyhw/backend/memory/bsd.py

@@ -12,9 +12,9 @@ class MemoryDetectBSD(MemoryDetectLinux):
 
     def getMemoryInfo(self):
         self.__getMemorySysctl()
-        self._memoryInfo.total = self.__physical_memory / 1024 / 1024  # Convert bytes to MiB
-        self._memoryInfo.used = (self.__physical_memory - self.__free_memory) / 1024 / 1024  # Convert bytes to MiB
-        self._memoryInfo.memory = f"{round(self._memoryInfo.used, 2)} MiB / {round(self._memoryInfo.total, 2)} MiB"
+        self._memoryInfo.total = self.__physical_memory / 1024 / 1024 / 1024  # Convert bytes to GiB
+        self._memoryInfo.used = (self.__physical_memory - self.__free_memory) / 1024 / 1024 / 1024  # Convert bytes to GiB
+        self._memoryInfo.memory = f"{round(self._memoryInfo.used, 2)} GiB / {round(self._memoryInfo.total, 2)} GiB"
         return self._memoryInfo
 
     def __getMemorySysctl(self):

pyhw/backend/memory/linux.py

@@ -7,7 +7,7 @@ class MemoryDetectLinux:
 
     def getMemoryInfo(self):
         self._getMemory()
-        self._memoryInfo.memory = f"{self._memoryInfo.used} MiB / {self._memoryInfo.total} MiB"
+        self._memoryInfo.memory = f"{self._memoryInfo.used} GiB / {self._memoryInfo.total} GiB"
         return self._memoryInfo
 
     def _getMemory(self):
@@ -15,9 +15,9 @@ class MemoryDetectLinux:
             with open("/proc/meminfo", "r") as file:
                 for line in file:
                     if line.startswith("MemTotal:"):
-                        self._memoryInfo.total = round(float(line.split(":")[1].strip()[:-3]) / 1024, 2)
+                        self._memoryInfo.total = round(float(line.split(":")[1].strip()[:-3]) / 1024 / 1024, 2)
                     elif line.startswith("MemAvailable:"):
-                        self._memoryInfo.available = round(float(line.split(":")[1].strip()[:-3]) / 1024, 2)
+                        self._memoryInfo.available = round(float(line.split(":")[1].strip()[:-3]) / 1024 / 1024, 2)
                 self._memoryInfo.used = round(self._memoryInfo.total - self._memoryInfo.available, 2)
         except FileNotFoundError:
             pass

pyhw/backend/memory/macos.py

@@ -19,9 +19,9 @@ class MemoryDetectMacOS:
 
     def getMemoryInfo(self):
         self.__getMemory()
-        self.__memoryInfo.total = self.__mem_total / 1024 / 1024  # Convert bytes to MiB
-        self.__memoryInfo.used = self.__mem_used / 1024 / 1024  # Convert bytes to MiB
-        self.__memoryInfo.memory = f"{round(self.__memoryInfo.used, 2)} MiB / {round(self.__memoryInfo.total, 2)} MiB"
+        self.__memoryInfo.total = self.__mem_total / 1024 / 1024 / 1024  # Convert bytes to GiB
+        self.__memoryInfo.used = self.__mem_used / 1024 / 1024 / 1024  # Convert bytes to GiB
+        self.__memoryInfo.memory = f"{self.__memoryInfo.used:.2f} GiB / {self.__memoryInfo.total:.2f} GiB"
         return self.__memoryInfo
 
     def __getMemory(self):

pyhw/backend/memory/windows.py

@@ -10,7 +10,7 @@ class MemoryDetectWindows:
 
     def getMemoryInfo(self):
         self._getMemory()
-        self._memoryInfo.memory = f"{self._memoryInfo.used} MiB / {self._memoryInfo.total} MiB"
+        self._memoryInfo.memory = f"{self._memoryInfo.used} GiB / {self._memoryInfo.total} GiB"
         return self._memoryInfo
 
     def _getMemory(self):
@@ -21,8 +21,8 @@ class MemoryDetectWindows:
             raise BackendException("Failed to get memory information on Windows.")
 
         res = json.loads(result.stdout)
-        free_memory = int(res['FreePhysicalMemory']) / 1024
-        total_memory = int(res['TotalVisibleMemorySize']) / 1024
+        free_memory = int(res['FreePhysicalMemory']) / 1024 / 1024
+        total_memory = int(res['TotalVisibleMemorySize']) / 1024 / 1024
         used_memory = total_memory - free_memory
         self._memoryInfo.total = round(total_memory, 2)
         self._memoryInfo.available = round(free_memory, 2)

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.3.dist-info}/METADATA

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

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

@@ -1,4 +1,4 @@
-pyhw/__init__.py,sha256=HOB6zppm7om1pAT4p00ZL8jZJeZ3GXNEQS3ktRh0PQU,49
+pyhw/__init__.py,sha256=n85B2Q8z-AqEs2R2FvLy_oKqviq3yymy-uRkvZ2yRww,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
@@ -29,12 +29,12 @@ pyhw/backend/kernel/kernelInfo.py,sha256=Nkumd0McbimCjc7yJrvz6bcwpWu1Tdo_LKomjZr
 pyhw/backend/kernel/unix.py,sha256=opG4xTO_l4-boX8FeJmnPa2RJB9dFOfhsuPAf3SQAxg,1191
 pyhw/backend/kernel/windows.py,sha256=kFGnIXIgTp3endyVIoxmUgYh3RrvIqbMHmbWwqlyZro,1180
 pyhw/backend/memory/__init__.py,sha256=zGBWxfPAAk8ivCBWPLJIpuD-lB7wUJT3x8u2jHiAoCY,65
-pyhw/backend/memory/bsd.py,sha256=0sQrdeaxmR-jEtGbcBQLjUVpACU3LIULlJwdP4jVu08,1013
-pyhw/backend/memory/linux.py,sha256=_4wsyz-C8pElIG_xcjQQrnhHueRWfg8JUWggVZQaPhc,916
-pyhw/backend/memory/macos.py,sha256=ur2HxmmmVkXmaxEcw_otphifVp_csfNMJdgt-idCq7M,2770
+pyhw/backend/memory/bsd.py,sha256=DDlryPsjPiJcAHpqX1e-ERqYirp61elcrlCbzCDBPng,1027
+pyhw/backend/memory/linux.py,sha256=gu1FsVZ_ZuG1hObTfuAdCp_7LKJr3NxtN5UfDXptvF8,930
+pyhw/backend/memory/macos.py,sha256=lUYWBdJpAwaHB1HkFGkW4poMVDSlJ21ZbAIPCb3BA2Y,2772
 pyhw/backend/memory/memoryBase.py,sha256=trubcJ_7JD_FnrKefUycPFd4OZMFj3Rk75ih5YVsSXg,790
 pyhw/backend/memory/memoryInfo.py,sha256=OQF165uEyuapAsi7cKacQYDRnKdrQHeldfyFwzS9N2g,186
-pyhw/backend/memory/windows.py,sha256=ISihGHBnV8iD4Xj8_kelFSCydPu05CYKxG5q_wM5ZbA,1201
+pyhw/backend/memory/windows.py,sha256=_hYKJ-y4kRFo5NzJd0C__3tfsJnmXQT1VzOPgQzdJo0,1215
 pyhw/backend/nic/__init__.py,sha256=eP4eOYIvMF3LcTf954hJa6TnB8R4Qahss2g-UcgypKY,57
 pyhw/backend/nic/bsd.py,sha256=6nj7XXII5dRz3FGRYAXVgTt0vSgyQo0Re9JA1vlcnuw,134
 pyhw/backend/nic/linux.py,sha256=e6gX58RBE9IDKb0FrzZ7U2EhDNfGJsR6OvXq6qO5ZOc,2003
@@ -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
@@ -103,10 +103,10 @@ pyhw/frontend/logo/ascii/windows_10.pyhw,sha256=jv5pzZs_CdOzpeTjyXfXJWcTQwK-J0LN
 pyhw/frontend/logo/ascii/windows_11.pyhw,sha256=VuQTzbBabaEQhm2JBVhy6Ja6lClUGacQsaiNUih9nhU,656
 pyhw/frontend/logo/ascii/windows_2025.pyhw,sha256=o8eWsiyhNpDoEjiWFiBMfkd-8MdIslGc1Jpm85LU4P8,643
 pyhw/frontend/logo/ascii/windows_old.pyhw,sha256=AMsvWAZ50HM8lweWEmzDWbRNDGkKFJo9qLY_VRKrciY,580
-pyhw/library/lib/iokitCPULib.dylib,sha256=uMDDaijZGvTNkdT0ccQ55SDO4rRrzj8GSbrDMKeLAZ0,34280
-pyhw/library/lib/iokitGPULib.dylib,sha256=uiULOcAPpwOG7LZGR8Sdmjh_p5QjKN1OBBCfDMnUohk,155640
-pyhw/library/lib/iokitHostLib.dylib,sha256=MKxyKUkD4IZomP4exATikWx2SxqSDqQx4FEuIkFAEnc,149912
-pyhw/library/lib/iokitNICLib.dylib,sha256=4IP-GPmxiS6unnj8poktJrMGEWh0dQPclghdjVI9atE,212360
+pyhw/library/lib/iokitCPULib.dylib,sha256=6E77TMJcIFInm_uCTmzH_Q16JWCKKTMK7Cm4Z6AiqmQ,34280
+pyhw/library/lib/iokitGPULib.dylib,sha256=H6_RMZcFyH1NfiATq-RCJ-X97-Huh4TdktT-om-yLBI,155816
+pyhw/library/lib/iokitHostLib.dylib,sha256=vt5YDen6pLBk26u2ODCz8jkSNo2sR7elU4kjgABGSfQ,148968
+pyhw/library/lib/iokitNICLib.dylib,sha256=TNNDDdx60QjY9JA8BrPVnyQZ2EhyiiD_ebaFzspp7So,209448
 pyhw/library/lib/nvmlGPULib_amd64.so,sha256=lrkxeJjChUs8oVhaw_uMeXKbUJp24KroQ_hhcLtHfTg,12784
 pyhw/library/lib/nvmlGPULib_arm64.so,sha256=DFIYqNcuRxiZ8_jrYoaRB3Dx9GrY7UBXscwXQvV4k3I,13528
 pyhw/library/test/iokitCPULibTest.py,sha256=BrhMypgfJTeMectpDc9Tmwzp8gYwYAcowaTFf72LlLE,311
@@ -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.3.dist-info/licenses/LICENSE,sha256=hJs6RBqSVCexbTsalkMLNFI5t06kekQEsSVaOt_-yLs,1497
+pyhw-0.15.3.dist-info/METADATA,sha256=2MgmAU1onwWHoFj-2UjpLXK-vDE8zEMBgRA1Hb4-mIc,7715
+pyhw-0.15.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pyhw-0.15.3.dist-info/entry_points.txt,sha256=q-AB8im_QahpmNrmy4aPTJRGi0LlbNlnI3kF7s6pKss,44
+pyhw-0.15.3.dist-info/top_level.txt,sha256=7Inxvxt1TngEricKZEex9_WJZS3DbKYFUXDz4v5WHYU,5
+pyhw-0.15.3.dist-info/RECORD,,