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

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

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

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

@@ -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
@@ -81,11 +81,11 @@ pyhw/library/lib/iokitGPULib.dylib,sha256=DcJ0GZY79gTFckLFYtZgeKn1T0NFvdO_k_ccCa
 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.5.dist-info/LICENSE,sha256=hJs6RBqSVCexbTsalkMLNFI5t06kekQEsSVaOt_-yLs,1497
-pyhw-0.6.5.dist-info/METADATA,sha256=uVDEqgQ1fOLbwd9ydzgaKxs43MWavliFVm_z2avsg-k,5225
-pyhw-0.6.5.dist-info/WHEEL,sha256=R06PA3UVYHThwHvxuRWMqaGcr-PuniXahwjmQRFMEkY,91
-pyhw-0.6.5.dist-info/entry_points.txt,sha256=q-AB8im_QahpmNrmy4aPTJRGi0LlbNlnI3kF7s6pKss,44
-pyhw-0.6.5.dist-info/top_level.txt,sha256=7Inxvxt1TngEricKZEex9_WJZS3DbKYFUXDz4v5WHYU,5
-pyhw-0.6.5.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,,