pyhw 0.2.0b0__tar.gz → 0.7.3__tar.gz

pyhw-0.7.3/PKG-INFO

@@ -0,0 +1,131 @@
+Metadata-Version: 2.2
+Name: pyhw
+Version: 0.7.3
+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
+Requires-Python: >=3.9
+Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: pypci-ng>=0.0.10
+
+# PyHw
+[![Downloads](https://static.pepy.tech/badge/pyhw)](https://pepy.tech/project/pyhw)
+![PyPI - Version](https://img.shields.io/pypi/v/pyhw?label=version)
+
+![Static Badge](https://img.shields.io/badge/macOS-11%2B-green)
+![Static Badge](https://img.shields.io/badge/Linux-blue)
+![Static Badge](https://img.shields.io/badge/FreeBSD-red)
+
+![Static Badge](https://img.shields.io/badge/amd64-green)
+![Static Badge](https://img.shields.io/badge/arm-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 Linux, macOS, and FreeBSD 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 🤔).
+
+
+[//]: # (![demo]&#40;https://i2.imgs.ovh/d/BQACAgUAAx0EUvSR8wACMvpmyFVohzKxLcUdLiJaEa3wlo_OrQACuw4AAoX-QVaSpG0-rTAeRTUE&#41;)
+![demo](https://files.catbox.moe/xx58xy.jpg)
+
+
+
+
+
+## Install
+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 -U
+# or
+pip install pyhw --upgrade
+```
+You can then use this tool directly from the command line with the following command, just like neofetch.
+```shell
+pyhw
+# or
+python -m pyhw
+```
+Please note that the command line entry for __pyhw__ is created by pip, and depending on the user, this entry may not in the __system PATH__. If you encounter this problem, pip will give you a prompt, follow the prompts to add entry to the __system PATH__.
+
+### Install by pipx
+**pipx** is an amazing tool to help you install and run applications written in Python. It is more like **brew** or **apt**. You can find more information about it here [pipx](https://github.com/pypa/pipx).
+
+You can install pyhw by the following command:
+```shell
+pipx install pyhw
+```
+You can then use this tool directly from the command line with the following command, just like neofetch.
+```shell
+pyhw
+```
+
+### Important note about debian 12:
+If you use system pip to install pyhw, you will encounter this problem on debian12 and some related distributions (like Ubuntu 24.04):
+```text
+error: externally-managed-environment
+
+× This environment is externally managed
+╰─> To install Python packages system-wide, try apt install
+    python3-xyz, where xyz is the package you are trying to
+    install.
+    
+    If you wish to install a non-Debian-packaged Python package,
+    create a virtual environment using python3 -m venv path/to/venv.
+    Then use path/to/venv/bin/python and path/to/venv/bin/pip. Make
+    sure you have python3-full installed.
+    
+    For more information visit http://rptl.io/venv
+
+note: If you believe this is a mistake, please contact your Python installation or OS distribution provider. You can override this, at the risk of breaking your Python installation or OS, by passing --break-system-packages.
+hint: See PEP 668 for the detailed specification.
+```
+This is due to the fact that system python is not supposed to be managed by pip. You can simply use **pipx** to install **pyhw**. Or you can use a virtual environment (venv) or force remove this restriction (not recommended).
+
+## Tested OS
+* macOS arm64, x86_64
+* Linux arm64, x86_64
+* FreeBSD arm64
+
+
+## Build from source
+Currently, build process relay on swiftc and macOS IOKit framework. To build package from source, you need a Mac machine with macOS 11 and newer.
+
+### Dependencies
+This package was originally implemented in pure python and only depends on the python standard library. However, in subsequent development, the code for the pci part was separated into a separate package **pypci-ng**, which can be obtained using pip (or check out [this](https://github.com/xiaoran007/pypci) GitHub repository).
+
+### Build tools
+Make sure the following Python build tools are already installed.
+* setuptools
+* build
+* twine
+
+### Build package
+clone the project, and run:
+```shell
+python -m build
+```
+After the build process, the source package and the binary whl package can be found in the dist folder. Then you can use the following command to install the new package.
+```shell
+pip install dist/*.whl --force-reinstall
+```
+Or simply type:
+```shell
+make build
+make install
+```
+If you have docker installed, you can test this package through docker by type:
+```shell
+make test # local build
+make test-pypi # release version
+```

pyhw-0.7.3/README.md

@@ -0,0 +1,114 @@
+# PyHw
+[![Downloads](https://static.pepy.tech/badge/pyhw)](https://pepy.tech/project/pyhw)
+![PyPI - Version](https://img.shields.io/pypi/v/pyhw?label=version)
+
+![Static Badge](https://img.shields.io/badge/macOS-11%2B-green)
+![Static Badge](https://img.shields.io/badge/Linux-blue)
+![Static Badge](https://img.shields.io/badge/FreeBSD-red)
+
+![Static Badge](https://img.shields.io/badge/amd64-green)
+![Static Badge](https://img.shields.io/badge/arm-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 Linux, macOS, and FreeBSD 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 🤔).
+
+
+[//]: # (![demo](https://i2.imgs.ovh/d/BQACAgUAAx0EUvSR8wACMvpmyFVohzKxLcUdLiJaEa3wlo_OrQACuw4AAoX-QVaSpG0-rTAeRTUE))
+![demo](https://files.catbox.moe/xx58xy.jpg)
+
+
+
+
+
+## Install
+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 -U
+# or
+pip install pyhw --upgrade
+```
+You can then use this tool directly from the command line with the following command, just like neofetch.
+```shell
+pyhw
+# or
+python -m pyhw
+```
+Please note that the command line entry for __pyhw__ is created by pip, and depending on the user, this entry may not in the __system PATH__. If you encounter this problem, pip will give you a prompt, follow the prompts to add entry to the __system PATH__.
+
+### Install by pipx
+**pipx** is an amazing tool to help you install and run applications written in Python. It is more like **brew** or **apt**. You can find more information about it here [pipx](https://github.com/pypa/pipx).
+
+You can install pyhw by the following command:
+```shell
+pipx install pyhw
+```
+You can then use this tool directly from the command line with the following command, just like neofetch.
+```shell
+pyhw
+```
+
+### Important note about debian 12:
+If you use system pip to install pyhw, you will encounter this problem on debian12 and some related distributions (like Ubuntu 24.04):
+```text
+error: externally-managed-environment
+
+× This environment is externally managed
+╰─> To install Python packages system-wide, try apt install
+    python3-xyz, where xyz is the package you are trying to
+    install.
+    
+    If you wish to install a non-Debian-packaged Python package,
+    create a virtual environment using python3 -m venv path/to/venv.
+    Then use path/to/venv/bin/python and path/to/venv/bin/pip. Make
+    sure you have python3-full installed.
+    
+    For more information visit http://rptl.io/venv
+
+note: If you believe this is a mistake, please contact your Python installation or OS distribution provider. You can override this, at the risk of breaking your Python installation or OS, by passing --break-system-packages.
+hint: See PEP 668 for the detailed specification.
+```
+This is due to the fact that system python is not supposed to be managed by pip. You can simply use **pipx** to install **pyhw**. Or you can use a virtual environment (venv) or force remove this restriction (not recommended).
+
+## Tested OS
+* macOS arm64, x86_64
+* Linux arm64, x86_64
+* FreeBSD arm64
+
+
+## Build from source
+Currently, build process relay on swiftc and macOS IOKit framework. To build package from source, you need a Mac machine with macOS 11 and newer.
+
+### Dependencies
+This package was originally implemented in pure python and only depends on the python standard library. However, in subsequent development, the code for the pci part was separated into a separate package **pypci-ng**, which can be obtained using pip (or check out [this](https://github.com/xiaoran007/pypci) GitHub repository).
+
+### Build tools
+Make sure the following Python build tools are already installed.
+* setuptools
+* build
+* twine
+
+### Build package
+clone the project, and run:
+```shell
+python -m build
+```
+After the build process, the source package and the binary whl package can be found in the dist folder. Then you can use the following command to install the new package.
+```shell
+pip install dist/*.whl --force-reinstall
+```
+Or simply type:
+```shell
+make build
+make install
+```
+If you have docker installed, you can test this package through docker by type:
+```shell
+make test # local build
+make test-pypi # release version
+```

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

@@ -4,15 +4,20 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pyhw"
-version = "0.2.0b"
+version = "0.7.3"
 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" }
 ]
 readme = "README.md"
 license = {text = "BSD-3-Clause"}
 requires-python = ">=3.9"
+dependencies = [
+    "pypci-ng>=0.0.10"
+]
 classifiers = [
+    "Development Status :: 4 - Beta",
     "Programming Language :: Python :: 3",
     "License :: OSI Approved :: BSD License",
     "Operating System :: OS Independent"
@@ -25,7 +30,7 @@ package-dir = {"" = "src"}
 include-package-data = true
 
 [tool.setuptools.package-data]
-"pyhw" = ["frontend/logo/ascii/*.pyhw"]
+"pyhw" = ["frontend/logo/ascii/*.pyhw", "library/lib/*.dylib"]
 
 [project.scripts]
 pyhw = "pyhw.__main__:main"

pyhw-0.7.3/src/pyhw/__init__.py

@@ -0,0 +1 @@
+__version__ = '0.7.3'

{pyhw-0.2.0b0 → pyhw-0.7.3}/src/pyhw/__main__.py

@@ -9,15 +9,16 @@ from .backend.os import OSDetect
 from .backend.cpu import CPUDetect
 from .backend.gpu import GPUDetect
 from .backend.memory import MemoryDetect
+from .backend.nic import NICDetect
+from .backend.npu import NPUDetect
 from .pyhwUtil import createDataString
 from .pyhwUtil import getOS, selectOSLogo
 
 
 def main():
     current_os = getOS()
-    print("This is a test version of PyHw. Currently, it only supports Linux and macOS.")
-    if current_os != "linux" and current_os != "macos":
-        print(f"Only Linux and macOS is supported for now. Current os: {current_os}")
+    if current_os not in ["linux", "macos", "freebsd"]:
+        print(f"Only Linux, macOS, and FreeBSD is supported for now. Current os: {current_os}")
         return
     data = Data()
     data.title = TitleDetect(os=current_os).getTitle().title
@@ -31,6 +32,12 @@ def main():
     if gpu_info.number > 0:
         data.GPU = gpu_info.gpus
     data.Memory = MemoryDetect(os=current_os).getMemoryInfo().memory
+    nic_info = NICDetect(os=current_os).getNICInfo()
+    if nic_info.number > 0:
+        data.NIC = nic_info.nics
+    npu_info = NPUDetect(os=current_os).getNPUInfo()
+    if npu_info.number > 0:
+        data.NPU = npu_info.npus
 
     Printer(logo_os=selectOSLogo(OSDetect(os=current_os).getOSInfo().id), data=createDataString(data)).cPrint()
 

{pyhw-0.2.0b0 → pyhw-0.7.3}/src/pyhw/backend/backendBase.py

@@ -19,3 +19,5 @@ class Data:
     CPU = "Default Value"
     GPU = ["Default Value"]
     Memory = "Default Value"
+    NIC = ["Default Value"]
+    NPU = ["Default Value"]

pyhw-0.7.3/src/pyhw/backend/cpu/bsd.py

@@ -0,0 +1,12 @@
+from .cpuInfo import CPUInfo
+from ...pyhwUtil import sysctlGetString, sysctlGetInt, getArch
+
+
+class CPUDetectBSD:
+    def __init__(self):
+        self.__cpuInfo = CPUInfo()
+
+    def getCPUInfo(self):
+        self.__cpuInfo.cpu = sysctlGetString("hw.model")
+        return self.__cpuInfo
+

{pyhw-0.2.0b0 → pyhw-0.7.3}/src/pyhw/backend/cpu/cpuBase.py

@@ -1,5 +1,6 @@
 from .linux import CPUDetectLinux
 from .macos import CPUDetectMacOS
+from .bsd import CPUDetectBSD
 from ...pyhwException import OSUnsupportedException
 
 
@@ -12,5 +13,7 @@ class CPUDetect:
             return CPUDetectLinux().getCPUInfo()
         elif self.OS == "macos":
             return CPUDetectMacOS().getCPUInfo()
+        elif self.OS == "freebsd":
+            return CPUDetectBSD().getCPUInfo()
         else:
             raise OSUnsupportedException("Unsupported operating system")

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

@@ -10,6 +10,9 @@ class CPUDetectLinux:
     def getCPUInfo(self):
         self.__getCPUInfo()
         self.__modelClean()
+        self.__handleSBC()
+        if self.__cpuInfo.model == "":
+            self.__cpuInfo.model = "Unknown"
         if self.__cpuInfo.model != "":
             self.__cpuInfo.cpu = self.__cpuInfo.model
             if self.__cpuInfo.cores != "":
@@ -51,3 +54,26 @@ class CPUDetectLinux:
     def __modelClean(self):
         self.__cpuInfo.model = self.__cpuInfo.model.replace("(R)", "")
         self.__cpuInfo.model = self.__cpuInfo.model.replace("(TM)", "")
+
+    def __handleSBC(self):
+        # some values should be double-checked
+        # Info source: https://github.com/raspberrypi/firmware/tree/master/boot
+        if os.path.exists("/sys/firmware/devicetree/base/compatible"):
+            try:
+                with open("/sys/firmware/devicetree/base/compatible", "r") as f:
+                    compatible = f.read().strip()
+            except FileNotFoundError:
+                compatible = ""
+            if "raspberrypi" in compatible:
+                model = compatible.split(",")[-1]
+                if model.startswith("bcm"):
+                    self.__cpuInfo.model = model.upper()
+            elif "orangepi" in compatible:
+                if "allwinner" in compatible:
+                    model = compatible.split(",")[-1]
+                    if model.startswith("sun"):
+                        self.__cpuInfo.model = f"Allwinner {model.split('-')[-1].upper()} ({model})"
+        else:
+            pass
+
+

{pyhw-0.2.0b0 → pyhw-0.7.3}/src/pyhw/backend/cpu/macos.py

@@ -64,6 +64,8 @@ class CPUDetectMacOS:
             "Apple M3": "4.05 GHz",
             "Apple M3 Pro": "4.05 GHz",
             "Apple M3 Max": "4.05 GHz",
-            "Apple M4": "4.40 GHz"
+            "Apple M4": "4.40 GHz",
+            "Apple M4 Pro": "4.40 GHz",
+            "Apple M4 Max": "4.40 GHz"
         }
         self.__cpuInfo.frequency = freq.get(self.__cpuInfo.model, "Unknown")

pyhw-0.7.3/src/pyhw/backend/gpu/bsd.py

@@ -0,0 +1,7 @@
+from .linux import GPUDetectLinux
+
+
+class GPUDetectBSD(GPUDetectLinux):
+    def __init__(self):
+        super().__init__()
+

{pyhw-0.2.0b0 → pyhw-0.7.3}/src/pyhw/backend/gpu/gpuBase.py

@@ -1,5 +1,6 @@
 from .linux import GPUDetectLinux
 from .macos import GPUDetectMacOS
+from .bsd import GPUDetectBSD
 
 
 class GPUDetect:
@@ -11,5 +12,7 @@ class GPUDetect:
             return GPUDetectLinux().getGPUInfo()
         elif self.OS == "macos":
             return GPUDetectMacOS().getGPUInfo()
+        elif self.OS == "freebsd":
+            return GPUDetectBSD().getGPUInfo()
         else:
             raise NotImplementedError("Unsupported operating system")

{pyhw-0.2.0b0 → pyhw-0.7.3}/src/pyhw/backend/gpu/linux.py

@@ -2,6 +2,7 @@ import subprocess
 from .gpuInfo import GPUInfo
 from ..cpu import CPUDetect
 from ...pyhwUtil import getArch
+import pypci
 
 
 class GPUDetectLinux:
@@ -10,22 +11,21 @@ class GPUDetectLinux:
 
     def getGPUInfo(self):
         self.__getGPUInfo()
+        self.__sortGPUList()
         return self.__gpuInfo
 
     def __getGPUInfo(self):
-        try:
-            pci_info = subprocess.run(["bash", "-c", "lspci"], capture_output=True, text=True).stdout.strip()
-        except subprocess.SubprocessError:
-            return
-        if len(pci_info) == 0:  # no pcie devices found
+        gpu_devices = pypci.PCI().FindAllVGA()
+        if len(gpu_devices) == 0:
             self.__handleNonePciDevices()
-        for line in pci_info.split("\n"):
-            if "VGA" in line or "Display" in line or "3D" in line:
-                gpu = line.split(": ")[1]
-                self.__gpuInfo.gpus.append(gpu)
+        else:
+            for device in gpu_devices:
+                if device.subsystem_device_name != "":
+                    device_name = f"{device.vendor_name} {device.device_name} ({device.subsystem_device_name})"
+                else:
+                    device_name = f"{device.vendor_name} {device.device_name}"
+                self.__gpuInfo.gpus.append(self.__gpuNameClean(device_name))
                 self.__gpuInfo.number += 1
-        if self.__gpuInfo.number == 0:
-            self.__handleNonePciDevices()  # fallback to a sbc device detection method
 
     def __handleNonePciDevices(self):
         # if detector can't find any VGA/Display/3D GPUs, assume the host is a sbc device, this function is a placeholder for a more advanced method.
@@ -35,3 +35,12 @@ class GPUDetectLinux:
         else:
             self.__gpuInfo.number = 1
             self.__gpuInfo.gpus.append("Not found")
+
+    @staticmethod
+    def __gpuNameClean(gpu_name: str):
+        gpu_name_clean = gpu_name.replace("Corporation ", "")
+        return gpu_name_clean
+
+    def __sortGPUList(self):
+        self.__gpuInfo.gpus.sort()
+

pyhw-0.7.3/src/pyhw/backend/gpu/macos.py

@@ -0,0 +1,100 @@
+from .gpuInfo import GPUInfo
+from ...pyhwUtil import getArch
+import json
+import subprocess
+import ctypes
+from pathlib import Path
+
+
+class GPUDetectMacOS:
+    def __init__(self):
+        self.__gpuInfo = GPUInfo()
+        self.__arch = getArch()
+
+    def getGPUInfo(self):
+        if self.__arch == "aarch64":
+            self.__getGPUAppleSilicon()
+        else:   # Does not consider powerPC based Macs.
+            self.__getGPUIntel()
+        return self.__gpuInfo
+
+    def __getGPUAppleSilicon(self):
+        gpus = list()
+        try:
+            gpu_info_dict = json.loads(subprocess.check_output(["system_profiler", "SPDisplaysDataType", "-json"]))
+            if 'SPDisplaysDataType' in gpu_info_dict:
+                gpus = gpu_info_dict['SPDisplaysDataType']
+                self.__gpuInfo.number = len(gpus)
+            else:
+                pass
+        except Exception:
+            return
+
+        for gpu in gpus:
+            self.__gpuInfo.gpus.append(f'{gpu.get("sppci_model")} ({gpu.get("sppci_cores")} cores) [SOC Integrated]')
+
+    def __getGPUIntel(self):
+        if self.__getGPUIOKit():
+            pass
+        else:  # fallback to the default implementation
+            gpus = list()
+            try:
+                gpu_info_dict = json.loads(subprocess.check_output(["system_profiler", "SPDisplaysDataType", "-json"]))
+                if 'SPDisplaysDataType' in gpu_info_dict:
+                    gpus = gpu_info_dict['SPDisplaysDataType']
+                    self.__gpuInfo.number = len(gpus)
+                else:
+                    pass
+            except Exception:
+                return
+
+            for gpu in gpus:
+                if self.__handleVendor(gpu.get("spdisplays_vendor")) == "Intel":    # Integrated GPU
+                    self.__gpuInfo.gpus.append(f'{gpu.get("sppci_model")} [CPU Integrated]')
+                elif self.__handleVendor(gpu.get("spdisplays_vendor")) == "AMD":    # dGPU
+                    self.__gpuInfo.gpus.append(f'{gpu.get("sppci_model")} {gpu.get("spdisplays_vram")} [Discrete]')
+                elif self.__handleVendor(gpu.get("spdisplays_vendor")) == "Nvidia":    # Since current macOS does not support NVIDIA GPUs, this condition is not applicable
+                    pass
+
+    def __getGPUIOKit(self):
+        try:
+            package_root = Path(__file__).resolve().parent.parent.parent
+            lib = ctypes.CDLL(f"{package_root}/library/lib/iokitGPULib.dylib")
+            lib.getGPUInfo.restype = ctypes.c_char_p
+            gpu_info = lib.getGPUInfo()
+            gpus = gpu_info.decode('utf-8').split("; ")
+            self.__gpuInfo.number = len(gpus)
+            for gpu in gpus:
+                info_list = gpu.split(", ")
+                model = info_list[0]
+                vendor_id = info_list[1]
+                vram = round(int(info_list[2]) / 1024, None)
+                if self.__handleVendorID(vendor_id) == "Intel":    # Integrated GPU
+                    self.__gpuInfo.gpus.append(f'{model} [CPU Integrated]')
+                elif self.__handleVendorID(vendor_id) == "AMD":    # dGPU
+                    self.__gpuInfo.gpus.append(f'{model} {vram} GB [Discrete]')
+            return True
+        except Exception as e:
+            # print(f"An error occurred while getting GPU info using IOKit: {e}")
+            return False
+
+    @staticmethod
+    def __handleVendor(vendor):
+        if vendor == "sppci_vendor_Apple":
+            return "Apple"
+        elif vendor == "sppci_vendor_intel":
+            return "Intel"
+        elif vendor == "sppci_vendor_amd":
+            return "AMD"
+        else:
+            return vendor
+
+    @staticmethod
+    def __handleVendorID(vendor_id):
+        if vendor_id == "0x8086":
+            return "Intel"
+        elif vendor_id == "0x1002":
+            return "AMD"
+        else:
+            return vendor_id
+

pyhw-0.7.3/src/pyhw/backend/host/bsd.py

@@ -0,0 +1,13 @@
+from .linux import HostDetectLinux
+
+
+class HostDetectBSD(HostDetectLinux):
+    def __init__(self):
+        HostDetectLinux.__init__(self)
+
+    def getHostInfo(self):
+        self._hostInfo.name = f"General {self._arch} FreeBSD Host"
+        self._hostInfo.version = ""
+        self._hostInfo.model = self._hostInfo.name + " " + self._hostInfo.version
+        return self._hostInfo
+

{pyhw-0.2.0b0 → pyhw-0.7.3}/src/pyhw/backend/host/hostBase.py

@@ -1,6 +1,7 @@
 from .linux import HostDetectLinux
 from .macos import HostDetectMacOS
 from .windows import HostDetectWindows
+from .bsd import HostDetectBSD
 from ...pyhwException import OSUnsupportedException
 
 
@@ -13,6 +14,8 @@ class HostDetect:
             return HostDetectLinux().getHostInfo()
         elif self.OS == "macos":
             return HostDetectMacOS().getHostInfo()
+        elif self.OS == "freebsd":
+            return HostDetectBSD().getHostInfo()
         elif self.OS == "windows":
             pass
         else:

pyhw-0.7.3/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