pyhw 0.2.0b0__tar.gz → 0.2.1b0__tar.gz

{pyhw-0.2.0b0/src/pyhw.egg-info → pyhw-0.2.1b0}/PKG-INFO

@@ -1,10 +1,12 @@
 Metadata-Version: 2.1
 Name: pyhw
-Version: 0.2.0b0
+Version: 0.2.1b0
 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
 Project-URL: homepage, https://github.com/xiaoran007/pyhw
+Keywords: neofetch,system information,command line tool,python,hardware information,fastfetch,fetching
+Classifier: Development Status :: 4 - Beta
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: BSD License
 Classifier: Operating System :: OS Independent
@@ -16,21 +18,33 @@ License-File: LICENSE
 ![PyPI - Downloads](https://img.shields.io/pypi/dw/pyhw?label=PyPI)
 ![PyPI - Version](https://img.shields.io/pypi/v/pyhw?label=version)
 
+![Static Badge](https://img.shields.io/badge/macOS-brightgreen)
+![Static Badge](https://img.shields.io/badge/Linux-blue)
 
 
 PyHw, a neofetch-like command line tool for fetching system information but written mostly in Python. **Currently, this project is still in the initial stage, only part of the linux systems and macOS are supported.**
 
-This project is a Python reimplementation of [neofetch](https://github.com/dylanaraps/neofetch) and references the [fastfetch](https://github.com/fastfetch-cli/fastfetch) project for logo style settings. Since this project is implemented in Python, it will be easier to maintain and extend than bash and c implementation. Also, this project only relies on the Python standard library, so you can run it on any device that has a Python environment (I hope so 🤔)
+This project is a Python reimplementation of [neofetch](https://github.com/dylanaraps/neofetch) and references the [fastfetch](https://github.com/fastfetch-cli/fastfetch) project for logo style settings. Since this project is implemented in Python, it will be easier to maintain and extend than bash and c implementation. Also, this project only relies on the Python standard library, so you can run it on any device that has a Python environment (I hope so 🤔).
 
 There are already a lot of similar tools so you can choose any of them; they're all essentially no different. If you want to try this tool, just install it directly by pip.
 ```shell
 pip install pyhw
 ```
+To upgrade pyhw:
+```shell
+pip install pyhw --upgrade
+```
 You can then use this tool directly from the command line with the following command, just like neofetch.
 ```shell
 pyhw
 ```
 
+## Supported (Tested) OS
+* macOS arm64, x86_64
+* debian-based distro x86_64
+* RaspberryPi OS arm64
+
+
 ## Build from source
 ### Build tools
 Make sure the following Python build tools are already installed.

{pyhw-0.2.0b0 → pyhw-0.2.1b0}/README.md

@@ -2,21 +2,33 @@
 ![PyPI - Downloads](https://img.shields.io/pypi/dw/pyhw?label=PyPI)
 ![PyPI - Version](https://img.shields.io/pypi/v/pyhw?label=version)
 
+![Static Badge](https://img.shields.io/badge/macOS-brightgreen)
+![Static Badge](https://img.shields.io/badge/Linux-blue)
 
 
 PyHw, a neofetch-like command line tool for fetching system information but written mostly in Python. **Currently, this project is still in the initial stage, only part of the linux systems and macOS are supported.**
 
-This project is a Python reimplementation of [neofetch](https://github.com/dylanaraps/neofetch) and references the [fastfetch](https://github.com/fastfetch-cli/fastfetch) project for logo style settings. Since this project is implemented in Python, it will be easier to maintain and extend than bash and c implementation. Also, this project only relies on the Python standard library, so you can run it on any device that has a Python environment (I hope so 🤔)
+This project is a Python reimplementation of [neofetch](https://github.com/dylanaraps/neofetch) and references the [fastfetch](https://github.com/fastfetch-cli/fastfetch) project for logo style settings. Since this project is implemented in Python, it will be easier to maintain and extend than bash and c implementation. Also, this project only relies on the Python standard library, so you can run it on any device that has a Python environment (I hope so 🤔).
 
 There are already a lot of similar tools so you can choose any of them; they're all essentially no different. If you want to try this tool, just install it directly by pip.
 ```shell
 pip install pyhw
 ```
+To upgrade pyhw:
+```shell
+pip install pyhw --upgrade
+```
 You can then use this tool directly from the command line with the following command, just like neofetch.
 ```shell
 pyhw
 ```
 
+## Supported (Tested) OS
+* macOS arm64, x86_64
+* debian-based distro x86_64
+* RaspberryPi OS arm64
+
+
 ## Build from source
 ### Build tools
 Make sure the following Python build tools are already installed.

{pyhw-0.2.0b0 → pyhw-0.2.1b0}/pyproject.toml

@@ -4,8 +4,9 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pyhw"
-version = "0.2.0b"
+version = "0.2.1b"
 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 = [
     { name = "Xiao Ran", email = "xiaoran.007@icloud.com" }
 ]
@@ -13,6 +14,7 @@ readme = "README.md"
 license = {text = "BSD-3-Clause"}
 requires-python = ">=3.9"
 classifiers = [
+    "Development Status :: 4 - Beta",
     "Programming Language :: Python :: 3",
     "License :: OSI Approved :: BSD License",
     "Operating System :: OS Independent"

{pyhw-0.2.0b0 → pyhw-0.2.1b0}/src/pyhw/backend/cpu/linux.py

@@ -10,6 +10,8 @@ class CPUDetectLinux:
     def getCPUInfo(self):
         self.__getCPUInfo()
         self.__modelClean()
+        if self.__cpuInfo.model == "":
+            self.__cpuInfo.model = "Unknown"
         if self.__cpuInfo.model != "":
             self.__cpuInfo.cpu = self.__cpuInfo.model
             if self.__cpuInfo.cores != "":

pyhw-0.2.1b0/src/pyhw/backend/host/linux.py

@@ -0,0 +1,51 @@
+"""
+    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:
+                    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
+        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.2.0b0 → pyhw-0.2.1b0}/src/pyhw/pyhwUtil/pyhwUtil.py

@@ -61,6 +61,10 @@ def selectOSLogo(os_id: str):
     """
     if getOS() == "macos":
         return os_id
+    if os_id in ["debian", "ubuntu", "macOS", "fedora"]:
+        pass
+    else:
+        return "linux"
     rows_str, columns_str = os.popen('stty size', 'r').read().split()
     rows = int(rows_str)
     columns = int(columns_str)

{pyhw-0.2.0b0 → pyhw-0.2.1b0/src/pyhw.egg-info}/PKG-INFO

@@ -1,10 +1,12 @@
 Metadata-Version: 2.1
 Name: pyhw
-Version: 0.2.0b0
+Version: 0.2.1b0
 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
 Project-URL: homepage, https://github.com/xiaoran007/pyhw
+Keywords: neofetch,system information,command line tool,python,hardware information,fastfetch,fetching
+Classifier: Development Status :: 4 - Beta
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: BSD License
 Classifier: Operating System :: OS Independent
@@ -16,21 +18,33 @@ License-File: LICENSE
 ![PyPI - Downloads](https://img.shields.io/pypi/dw/pyhw?label=PyPI)
 ![PyPI - Version](https://img.shields.io/pypi/v/pyhw?label=version)
 
+![Static Badge](https://img.shields.io/badge/macOS-brightgreen)
+![Static Badge](https://img.shields.io/badge/Linux-blue)
 
 
 PyHw, a neofetch-like command line tool for fetching system information but written mostly in Python. **Currently, this project is still in the initial stage, only part of the linux systems and macOS are supported.**
 
-This project is a Python reimplementation of [neofetch](https://github.com/dylanaraps/neofetch) and references the [fastfetch](https://github.com/fastfetch-cli/fastfetch) project for logo style settings. Since this project is implemented in Python, it will be easier to maintain and extend than bash and c implementation. Also, this project only relies on the Python standard library, so you can run it on any device that has a Python environment (I hope so 🤔)
+This project is a Python reimplementation of [neofetch](https://github.com/dylanaraps/neofetch) and references the [fastfetch](https://github.com/fastfetch-cli/fastfetch) project for logo style settings. Since this project is implemented in Python, it will be easier to maintain and extend than bash and c implementation. Also, this project only relies on the Python standard library, so you can run it on any device that has a Python environment (I hope so 🤔).
 
 There are already a lot of similar tools so you can choose any of them; they're all essentially no different. If you want to try this tool, just install it directly by pip.
 ```shell
 pip install pyhw
 ```
+To upgrade pyhw:
+```shell
+pip install pyhw --upgrade
+```
 You can then use this tool directly from the command line with the following command, just like neofetch.
 ```shell
 pyhw
 ```
 
+## Supported (Tested) OS
+* macOS arm64, x86_64
+* debian-based distro x86_64
+* RaspberryPi OS arm64
+
+
 ## Build from source
 ### Build tools
 Make sure the following Python build tools are already installed.

pyhw-0.2.0b0/src/pyhw/backend/host/linux.py

@@ -1,38 +0,0 @@
-"""
-    In dev.
-"""
-from ...pyhwUtil import getArch
-from .hostInfo import HostInfo
-
-
-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:
-                    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
-        elif self.__arch in ["aarch64", "arm32"]:
-            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