pyhw 0.6.6__tar.gz → 0.6.8__tar.gz

{pyhw-0.6.6/src/pyhw.egg-info → pyhw-0.6.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyhw
-Version: 0.6.6
+Version: 0.6.8
 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.6 → pyhw-0.6.8}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pyhw"
-version = "0.6.6"
+version = "0.6.8"
 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.8/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.6 → pyhw-0.6.8}/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,7 +20,10 @@ 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
         return self.__shellInfo
@@ -31,6 +35,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 +56,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 +71,4 @@ class ShellDetectUnix:
 
 
 
+

pyhw-0.6.8/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.6 → pyhw-0.6.8}/src/pyhw/pyhwUtil/pyhwUtil.py

@@ -38,6 +38,14 @@ 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
@@ -46,8 +54,11 @@ class DataStringProcessor:
     @staticmethod
     def __getENV() -> int:
         if getOS() == "linux":
-            _, columns_str = os.popen('stty size', 'r').read().split()
-            columns = int(columns_str)
+            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
@@ -176,9 +187,14 @@ def selectOSLogo(os_id: str):
         pass
     else:
         return "linux"
-    rows_str, columns_str = os.popen('stty size', 'r').read().split()
-    rows = int(rows_str)
-    columns = int(columns_str)
+    try:
+        rows_str, columns_str = os.popen('stty size', 'r').read().split()
+        rows = int(rows_str)
+        columns = int(columns_str)
+    except:
+        # Default terminal size is 24 rows and 80 columns
+        rows = 24
+        columns = 80
     if columns <= 80:
         if os_id in ["fedora", "ubuntu"]:
             return f"{os_id}_small"

{pyhw-0.6.6 → pyhw-0.6.8/src/pyhw.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyhw
-Version: 0.6.6
+Version: 0.6.8
 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.6 → pyhw-0.6.8}/src/pyhw.egg-info/SOURCES.txt

@@ -87,6 +87,7 @@ src/pyhw/frontend/logo/ascii/raspbian.pyhw
 src/pyhw/frontend/logo/ascii/ubuntu.pyhw
 src/pyhw/frontend/logo/ascii/ubuntu_small.pyhw
 src/pyhw/library/lib/iokitGPULib.dylib
+src/pyhw/library/lib/iokitHostLib.dylib
 src/pyhw/pyhwException/__init__.py
 src/pyhw/pyhwException/pyhwException.py
 src/pyhw/pyhwUtil/__init__.py

pyhw-0.6.6/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.6/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"]