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

pyhw/backend/host/linux.py

@@ -1,7 +1,7 @@
 """
     In dev.
 """
-from ...pyhwUtil import getArch
+from ...pyhwUtil import getArch, getDocker
 from .hostInfo import HostInfo
 import os
 
@@ -10,47 +10,53 @@ class HostDetectLinux:
     def __init__(self):
         self.__hostInfo = HostInfo()
         self.__arch = getArch()
+        self.__docker = getDocker()
 
     def getHostInfo(self):
         self.__getModel()
         return self.__hostInfo
 
     def __getModel(self):
-        if self.__arch in ["x86_64", "x86"]:
-            try:
-                with open("/sys/devices/virtual/dmi/id/product_name", "r") as f:
-                    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:
-                    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
-        elif self.__arch in ["aarch64", "arm32"]:
-            # try to find dmi folder since some arm based desktops and servers may have same structure as x86_64 machines.
-            if os.path.exists("/sys/devices/virtual/dmi/id"):
+        if self.__docker:
+            self.__hostInfo.name = f"General {self.__arch} Docker Host"
+            self.__hostInfo.version = ""
+            self.__hostInfo.model = self.__hostInfo.name + " " + self.__hostInfo.version
+        else:
+            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
-            else:
-                # some single board computers may not have dmi folder, try to find model name in device tree.
-                try:
-                    with open("/sys/firmware/devicetree/base/model", "r") as f:
-                        self.__hostInfo.model = f.read().strip()
-                except FileNotFoundError:
-                    pass
+            elif self.__arch in ["aarch64", "arm32"]:
+                # try to find dmi folder since some arm based desktops and servers may have same structure as x86_64 machines.
+                if os.path.exists("/sys/devices/virtual/dmi/id"):
+                    try:
+                        with open("/sys/devices/virtual/dmi/id/product_name", "r") as f:
+                            self.__hostInfo.name = f.read().strip()
+                        with open("/sys/devices/virtual/dmi/id/product_version", "r") as f:
+                            self.__hostInfo.version = f.read().strip()
+                        self.__hostInfo.model = self.__hostInfo.name + " " + self.__hostInfo.version
+                    except FileNotFoundError:
+                        pass
+                else:
+                    # some single board computers may not have dmi folder, try to find model name in device tree.
+                    try:
+                        with open("/sys/firmware/devicetree/base/model", "r") as f:
+                            self.__hostInfo.model = f.read().strip()
+                    except FileNotFoundError:
+                        pass
 
     def __getHostFamily(self):
         pass

pyhw/backend/shell/unix.py

@@ -1,6 +1,7 @@
 """
     In dev.
 """
+from ...pyhwUtil import getDocker
 from dataclasses import dataclass
 import os
 import subprocess
@@ -19,9 +20,13 @@ class ShellDetectUnix:
         self.__shellInfo = ShellInfoUnix()
 
     def getShellInfo(self):
-        self.__getShell()
+        if getDocker():
+            self.__getShellDocker()
+        else:
+            self.__getShell()
         self.__getVersion()
         self.__shellInfo.info = self.__shellInfo.shell + " " + self.__shellInfo.version
+        print(self.__shellInfo.info)
         return self.__shellInfo
 
     def __getShell(self):
@@ -31,6 +36,19 @@ class ShellDetectUnix:
             self.__shellInfo.shell = shell_env.split("/")[-1]
             self.__shellInfo.path = shell_env
 
+    def __getShellDocker(self):
+        try:
+            with open("/etc/passwd", "r") as f:
+                for line in f:
+                    if line.startswith("root:"):
+                        root_shell = line.strip().split(":")[-1]
+                        break
+        except:
+            root_shell = ""
+        if root_shell != "":
+            self.__shellInfo.shell = root_shell.split("/")[-1]
+            self.__shellInfo.path = root_shell
+
     def __getVersion(self):
         shell = self.__shellInfo.shell
         if shell != "":
@@ -39,7 +57,7 @@ class ShellDetectUnix:
             elif shell == "bash":
                 try:
                     result = subprocess.run(["bash", "-c", "echo $BASH_VERSION"], capture_output=True, text=True)
-                    self.__shellInfo.version = result.stdout.strip()
+                    self.__shellInfo.version = result.stdout.strip().split("(")[0]
                 except subprocess.SubprocessError:
                     pass
             elif shell == "zsh":
@@ -54,3 +72,4 @@ class ShellDetectUnix:
 
 
 
+

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/__init__.py

@@ -1,4 +1,4 @@
-from .pyhwUtil import getOS, getArch, createDataString, selectOSLogo
+from .pyhwUtil import getOS, getArch, getDocker, createDataString, selectOSLogo
 from .sysctlUtil import sysctlGetString, sysctlGetInt
 
-__all__ = ["getOS", "getArch", "createDataString", "selectOSLogo", "sysctlGetString", "sysctlGetInt"]
+__all__ = ["getOS", "getArch", "getDocker", "createDataString", "selectOSLogo", "sysctlGetString", "sysctlGetInt"]

pyhw/pyhwUtil/pyhwUtil.py

@@ -38,7 +38,115 @@ def getArch():
         return "unknown"
 
 
+def getDocker() -> bool:
+    """
+    Check if the current environment is running in Docker.
+    :return: bool, True if running in Docker, False otherwise.
+    """
+    return os.path.exists("/.dockerenv")
+
+
+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.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyhw
-Version: 0.6.5
+Version: 0.6.7
 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.7.dist-info}/RECORD

@@ -16,7 +16,7 @@ pyhw/backend/gpu/macos.py,sha256=SmTqqTrIMRW-GVPmDs8xAiOX7HsCjrGh9qkxLQCdvO8,385
 pyhw/backend/host/__init__.py,sha256=Efaj7-Oya7H8HdpZHQCLrwn-mcfPb-d6yfh4dzsE_7I,58
 pyhw/backend/host/hostBase.py,sha256=POyDW3f5JSWtEKyCfrVSBEddSwoywe_OBgUExCEuje8,563
 pyhw/backend/host/hostInfo.py,sha256=Xvz0LugPiCSWMkcDsp4p2rrojYFZauL6Q-gCZ6NLz5k,184
-pyhw/backend/host/linux.py,sha256=wp65o_BJUxq-rkts_1UVP6IuK6U54Cl066G3QfZksiQ,2424
+pyhw/backend/host/linux.py,sha256=5wfEbe4au4JqDazBuUTfWLC2sPPa_YuidSGKVwzyI-0,2853
 pyhw/backend/host/macos.py,sha256=KW-EJK9g1xHNrFsVxJv5GPLpc_ZevX0Zv1WjZUzRkzo,15369
 pyhw/backend/host/windows.py,sha256=rjDJaIs-5zspzFsNCMCh6m2yZXEXI0vccqeBpmAdEBk,53
 pyhw/backend/kernel/__init__.py,sha256=fGjwjpOhwA_PnsWbwoq102hwhTay2ufYKaTqxjSV2-I,65
@@ -47,7 +47,7 @@ pyhw/backend/os/osBase.py,sha256=AA17HIwmWy7E6nCtqbojTNsHKtcNuehf51FxGcfXu7A,462
 pyhw/backend/os/osInfo.py,sha256=iLPc7INFHH3izascwooj4JBVgvBsSgVPXWBlFXG47mQ,378
 pyhw/backend/shell/__init__.py,sha256=SeQ7OLNSl_V1JCCWnJGjLilAWiSe9e5kgsMEt63TMS0,62
 pyhw/backend/shell/shellBase.py,sha256=mylNazVtTbCSzus-IPe1QwnuIGSFNP-z5vYKwTIl_yg,377
-pyhw/backend/shell/unix.py,sha256=COPpSE_wnuuSWDckTvBT0nNwLzgh8iPLicY8XghTSYM,1530
+pyhw/backend/shell/unix.py,sha256=Yradj6aj4nqc9CNQvVqzOgwO-p2IIJ_Jt_okL7cF4as,2146
 pyhw/backend/title/__init__.py,sha256=l6_WqreSBeK7krapCrbrr4ndnydrXB1aZ50Ve-beV_w,62
 pyhw/backend/title/titleBase.py,sha256=pcnkiNn9N69yc4iicAmpMpC6G7HUMyGCh0V1jjGIP_c,495
 pyhw/backend/title/unix.py,sha256=9B-zLE8yhlWBnJ-6Aa-DmFmgMV9KdvvNU40drJIaNck,837
@@ -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
@@ -80,12 +80,12 @@ pyhw/frontend/logo/ascii/ubuntu_small.pyhw,sha256=Xf8LSZdZUu9aEG3efhb1FUlUEuJ-3U
 pyhw/library/lib/iokitGPULib.dylib,sha256=DcJ0GZY79gTFckLFYtZgeKn1T0NFvdO_k_ccCa7od5Y,154808
 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/__init__.py,sha256=diIqlNUBfuHu-2VAOJk5nipGLafnWxR3chAAOmX8QRo,250
+pyhw/pyhwUtil/pyhwUtil.py,sha256=OY89sHr5LBjob7JMbCl-6x1AEPr-15UOE8UoQ04sLvI,5968
 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.7.dist-info/LICENSE,sha256=hJs6RBqSVCexbTsalkMLNFI5t06kekQEsSVaOt_-yLs,1497
+pyhw-0.6.7.dist-info/METADATA,sha256=NL0A7juUgOQRXCkDyg32z1NXzAFq8AF2drk4FSrkJi8,5225
+pyhw-0.6.7.dist-info/WHEEL,sha256=R06PA3UVYHThwHvxuRWMqaGcr-PuniXahwjmQRFMEkY,91
+pyhw-0.6.7.dist-info/entry_points.txt,sha256=q-AB8im_QahpmNrmy4aPTJRGi0LlbNlnI3kF7s6pKss,44
+pyhw-0.6.7.dist-info/top_level.txt,sha256=7Inxvxt1TngEricKZEex9_WJZS3DbKYFUXDz4v5WHYU,5
+pyhw-0.6.7.dist-info/RECORD,,