pyhw 0.6.5__tar.gz → 0.6.7__tar.gz

{pyhw-0.6.5/src/pyhw.egg-info → pyhw-0.6.7}/PKG-INFO

@@ -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 → pyhw-0.6.7}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pyhw"
-version = "0.6.5"
+version = "0.6.7"
 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 = [

pyhw-0.6.7/src/pyhw/backend/host/linux.py

@@ -0,0 +1,65 @@
+"""
+    In dev.
+"""
+from ...pyhwUtil import getArch, getDocker
+from .hostInfo import HostInfo
+import os
+
+
+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.__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:
+                        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"):
+                    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
+
+    def __getHostProductName(self):
+        pass

{pyhw-0.6.5 → pyhw-0.6.7}/src/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-0.6.5 → pyhw-0.6.7}/src/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-0.6.7/src/pyhw/pyhwUtil/__init__.py

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

pyhw-0.6.7/src/pyhw/pyhwUtil/pyhwUtil.py

@@ -0,0 +1,197 @@
+import platform
+from ..backend import Data
+import os
+from dataclasses import dataclass
+
+
+def getOS():
+    """
+    Get the os type in lower case.
+    :return: str, os type, value in [windows, linux, macos, unknown].
+    """
+    system = platform.system()
+    if system == "Windows":
+        return "windows"
+    elif system == "Linux":
+        return "linux"
+    elif system == "Darwin":
+        return "macos"
+    else:
+        return "unknown"
+
+
+def getArch():
+    """
+    Get the machine architecture.
+    :return: str, value in [x86_64, x86, aarch64, arm32].
+    """
+    arch = platform.machine()
+    if arch == "x86_64" or arch == "AMD64" or arch == "amd64":
+        return "x86_64"
+    elif arch == "i386" or arch == "i686" or arch == "x86":
+        return "x86"
+    elif arch == "aarch64" or arch == "arm64":
+        return "aarch64"
+    elif arch.find("arm") != -1:
+        return "arm32"
+    else:
+        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"
+    data_string += f" OS: {data.OS}\n"
+    data_string += f" Host: {data.Host}\n"
+    data_string += f" Kernel: {data.Kernel}\n"
+    data_string += f" Uptime: {data.Uptime}\n"
+    data_string += f" Shell: {data.Shell}\n"
+    data_string += f" CPU: {data.CPU}\n"
+    for gpu in data.GPU:
+        data_string += f" GPU: {gpu}\n"
+    data_string += f" Memory: {data.Memory}\n"
+    for nic in data.NIC:
+        data_string += f" NIC: {nic}\n"
+    for npu in data.NPU:
+        data_string += f" NPU: {npu}\n"
+    return data_string
+
+
+@dataclass
+class SupportedOS:
+    ColorConfig = ["armbian", "arch", "alpine", "centos", "debian", "fedora", "macOS", "raspbian", "ubuntu"]
+    AsciiLogo = ["armbian", "arch", "alpine", "centos", "debian", "fedora", "macOS", "raspbian", "ubuntu"]
+
+
+def selectOSLogo(os_id: str):
+    """
+    Select the logo based on the os id and terminal size.
+    :param os_id: str, os id.
+    :return: str, logo id.
+    """
+    if getOS() == "macos":
+        return os_id
+    if os_id in SupportedOS.ColorConfig and os_id in SupportedOS.AsciiLogo:
+        pass
+    else:
+        return "linux"
+    rows_str, columns_str = os.popen('stty size', 'r').read().split()
+    rows = int(rows_str)
+    columns = int(columns_str)
+    if columns <= 80:
+        if os_id in ["fedora", "ubuntu"]:
+            return f"{os_id}_small"
+        else:
+            return os_id
+    else:
+        return os_id
+

{pyhw-0.6.5 → pyhw-0.6.7/src/pyhw.egg-info}/PKG-INFO

@@ -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/src/pyhw/backend/host/linux.py

@@ -1,59 +0,0 @@
-"""
-    In dev.
-"""
-from ...pyhwUtil import getArch
-from .hostInfo import HostInfo
-import os
-
-
-class HostDetectLinux:
-    def __init__(self):
-        self.__hostInfo = HostInfo()
-        self.__arch = getArch()
-
-    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"):
-                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
-
-    def __getHostProductName(self):
-        pass

pyhw-0.6.5/src/pyhw/pyhwUtil/__init__.py

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

pyhw-0.6.5/src/pyhw/pyhwUtil/pyhwUtil.py

@@ -1,89 +0,0 @@
-import platform
-from ..backend import Data
-import os
-from dataclasses import dataclass
-
-
-def getOS():
-    """
-    Get the os type in lower case.
-    :return: str, os type, value in [windows, linux, macos, unknown].
-    """
-    system = platform.system()
-    if system == "Windows":
-        return "windows"
-    elif system == "Linux":
-        return "linux"
-    elif system == "Darwin":
-        return "macos"
-    else:
-        return "unknown"
-
-
-def getArch():
-    """
-    Get the machine architecture.
-    :return: str, value in [x86_64, x86, aarch64, arm32].
-    """
-    arch = platform.machine()
-    if arch == "x86_64" or arch == "AMD64" or arch == "amd64":
-        return "x86_64"
-    elif arch == "i386" or arch == "i686" or arch == "x86":
-        return "x86"
-    elif arch == "aarch64" or arch == "arm64":
-        return "aarch64"
-    elif arch.find("arm") != -1:
-        return "arm32"
-    else:
-        return "unknown"
-
-
-def createDataString(data: Data):
-    data_string = ""
-    data_string += f" {data.title}\n"
-    data_string += f" {'-'*len(data.title)}\n"
-    data_string += f" OS: {data.OS}\n"
-    data_string += f" Host: {data.Host}\n"
-    data_string += f" Kernel: {data.Kernel}\n"
-    data_string += f" Uptime: {data.Uptime}\n"
-    data_string += f" Shell: {data.Shell}\n"
-    data_string += f" CPU: {data.CPU}\n"
-    for gpu in data.GPU:
-        data_string += f" GPU: {gpu}\n"
-    data_string += f" Memory: {data.Memory}\n"
-    for nic in data.NIC:
-        data_string += f" NIC: {nic}\n"
-    for npu in data.NPU:
-        data_string += f" NPU: {npu}\n"
-    return data_string
-
-
-@dataclass
-class SupportedOS:
-    ColorConfig = ["armbian", "arch", "alpine", "centos", "debian", "fedora", "macOS", "raspbian", "ubuntu"]
-    AsciiLogo = ["armbian", "arch", "alpine", "centos", "debian", "fedora", "macOS", "raspbian", "ubuntu"]
-
-
-def selectOSLogo(os_id: str):
-    """
-    Select the logo based on the os id and terminal size.
-    :param os_id: str, os id.
-    :return: str, logo id.
-    """
-    if getOS() == "macos":
-        return os_id
-    if os_id in SupportedOS.ColorConfig and os_id in SupportedOS.AsciiLogo:
-        pass
-    else:
-        return "linux"
-    rows_str, columns_str = os.popen('stty size', 'r').read().split()
-    rows = int(rows_str)
-    columns = int(columns_str)
-    if columns <= 80:
-        if os_id in ["fedora", "ubuntu"]:
-            return f"{os_id}_small"
-        else:
-            return os_id
-    else:
-        return os_id
-