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

pyhw/__main__.py

@@ -17,8 +17,8 @@ from .pyhwUtil import getOS, selectOSLogo
 
 def main():
     current_os = getOS()
-    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

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/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/backend/gpu/bsd.py

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

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

@@ -8,53 +8,53 @@ import os
 
 class HostDetectLinux:
     def __init__(self):
-        self.__hostInfo = HostInfo()
-        self.__arch = getArch()
-        self.__docker = getDocker()
+        self._hostInfo = HostInfo()
+        self._arch = getArch()
+        self._docker = getDocker()
 
     def getHostInfo(self):
-        self.__getModel()
-        return self.__hostInfo
+        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
+    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"]:
+            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"
+                            self._hostInfo.name = f"General {self._arch} Host"
                         else:
-                            self.__hostInfo.name = product_name
+                            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 = ""
+                            self._hostInfo.version = ""
                         else:
-                            self.__hostInfo.version = version
-                    self.__hostInfo.model = self.__hostInfo.name + " " + self.__hostInfo.version
+                            self._hostInfo.version = version
+                    self._hostInfo.model = self._hostInfo.name + " " + self._hostInfo.version
                 except FileNotFoundError:
                     pass
-            elif self.__arch in ["aarch64", "arm32"]:
+            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()
+                            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
+                            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()
+                            self._hostInfo.model = f.read().strip()
                     except FileNotFoundError:
                         pass
 

pyhw/backend/kernel/kernelBase.py

@@ -7,9 +7,7 @@ class KernelDetect:
         self.OS = os
 
     def getKernelInfo(self):
-        if self.OS == "linux":
-            return KernelDetectUnix().getKernelInfo()
-        elif self.OS == "macos":
+        if self.OS in ["linux", "macos", "freebsd"]:
             return KernelDetectUnix().getKernelInfo()
         elif self.OS == "windows":
             raise OSUnsupportedException("Unsupported operating system")

pyhw/backend/memory/bsd.py

@@ -0,0 +1,11 @@
+from .linux import MemoryDetectLinux
+
+
+class MemoryDetectBSD(MemoryDetectLinux):
+    def __init__(self):
+        MemoryDetectLinux.__init__(self)
+
+    def getMemoryInfo(self):
+        self._memoryInfo.memory = f"Pass"
+        return self._memoryInfo
+

pyhw/backend/memory/linux.py

@@ -3,22 +3,22 @@ from .memoryInfo import MemoryInfo
 
 class MemoryDetectLinux:
     def __init__(self):
-        self.__memoryInfo = MemoryInfo()
+        self._memoryInfo = MemoryInfo()
 
     def getMemoryInfo(self):
-        self.__getMemory()
-        self.__memoryInfo.memory = f"{self.__memoryInfo.used} MiB / {self.__memoryInfo.total} MiB"
-        return self.__memoryInfo
+        self._getMemory()
+        self._memoryInfo.memory = f"{self._memoryInfo.used} MiB / {self._memoryInfo.total} MiB"
+        return self._memoryInfo
 
-    def __getMemory(self):
+    def _getMemory(self):
         try:
             with open("/proc/meminfo", "r") as file:
                 for line in file:
                     if line.startswith("MemTotal:"):
-                        self.__memoryInfo.total = round(float(line.split(":")[1].strip()[:-3]) / 1024, 2)
+                        self._memoryInfo.total = round(float(line.split(":")[1].strip()[:-3]) / 1024, 2)
                     elif line.startswith("MemAvailable:"):
-                        self.__memoryInfo.available = round(float(line.split(":")[1].strip()[:-3]) / 1024, 2)
-                self.__memoryInfo.used = round(self.__memoryInfo.total - self.__memoryInfo.available, 2)
+                        self._memoryInfo.available = round(float(line.split(":")[1].strip()[:-3]) / 1024, 2)
+                self._memoryInfo.used = round(self._memoryInfo.total - self._memoryInfo.available, 2)
         except FileNotFoundError:
             pass
 

pyhw/backend/memory/memoryBase.py

@@ -1,5 +1,6 @@
 from .linux import MemoryDetectLinux
 from .macos import MemoryDetectMacOS
+from .bsd import MemoryDetectBSD
 
 
 class MemoryDetect:
@@ -11,5 +12,7 @@ class MemoryDetect:
             return MemoryDetectLinux().getMemoryInfo()
         elif self.OS == "macos":
             return MemoryDetectMacOS().getMemoryInfo()
+        elif self.OS == "freebsd":
+            return MemoryDetectBSD().getMemoryInfo()
         else:
             raise NotImplementedError("Unsupported operating system")

pyhw/backend/nic/bsd.py

@@ -0,0 +1,7 @@
+from .linux import NICDetectLinux
+
+
+class NICDetectBSD(NICDetectLinux):
+    def __init__(self):
+        NICDetectLinux.__init__(self)
+

pyhw/backend/nic/linux.py

@@ -7,14 +7,14 @@ import pypci
 
 class NICDetectLinux:
     def __init__(self):
-        self.__nicInfo = NICInfo()
+        self._nicInfo = NICInfo()
 
     def getNICInfo(self):
-        self.__getNICInfo()
-        self.__sortNICList()
-        return self.__nicInfo
+        self._getNICInfo()
+        self._sortNICList()
+        return self._nicInfo
 
-    def __getNICInfo(self):
+    def _getNICInfo(self):
         nic_devices = pypci.PCI().FindAllNIC()
         if len(nic_devices) == 0:
             self.__handleNonePciDevices()
@@ -24,18 +24,18 @@ class NICDetectLinux:
                     device_name = f"{device.vendor_name} {device.device_name} ({device.subsystem_device_name})"
                 else:
                     device_name = f"{device.vendor_name} {device.device_name}"
-                self.__nicInfo.nics.append(self.__nicNameClean(device_name))
-                self.__nicInfo.number += 1
+                self._nicInfo.nics.append(self._nicNameClean(device_name))
+                self._nicInfo.number += 1
 
     def __handleNonePciDevices(self):
         # placeholder for a more advanced method.
-        self.__nicInfo.nics.append("Not found")
-        self.__nicInfo.number = 1
+        self._nicInfo.nics.append("Not found")
+        self._nicInfo.number = 1
 
     @staticmethod
-    def __nicNameClean(nic_name: str):
+    def _nicNameClean(nic_name: str):
         nic_name_clean = nic_name.replace("Corporation ", "")
         return nic_name_clean
 
-    def __sortNICList(self):
-        return self.__nicInfo.nics.sort()
+    def _sortNICList(self):
+        return self._nicInfo.nics.sort()

pyhw/backend/nic/nicBase.py

@@ -1,5 +1,6 @@
 from .linux import NICDetectLinux
 from .macos import NICDetectMacOS
+from .bsd import NICDetectBSD
 
 
 class NICDetect:
@@ -18,3 +19,7 @@ class NICDetect:
             return NICDetectLinux().getNICInfo()
         elif self.OS == "macos":
             return NICDetectMacOS().getNICInfo()
+        elif self.OS == "freebsd":
+            return NICDetectBSD().getNICInfo()
+        else:
+            raise NotImplementedError("Unsupported operating system")

pyhw/backend/npu/bsd.py

@@ -0,0 +1,6 @@
+from .linux import NPUDetectLinux
+
+
+class NPUDetectBSD(NPUDetectLinux):
+    def __init__(self):
+        NPUDetectLinux.__init__(self)

pyhw/backend/npu/linux.py

@@ -1,42 +1,38 @@
-import subprocess
 from .npuInfo import NPUInfo
-from ..cpu import CPUDetect
-from ...pyhwUtil import getArch
 import pypci
 
 
 class NPUDetectLinux:
     def __init__(self):
-        self.__npuInfo = NPUInfo()
+        self._npuInfo = NPUInfo()
 
     def getNPUInfo(self):
-        self.__getNPUInfo()
-        self.__sortNPUList()
-        return self.__npuInfo
+        self._getNPUInfo()
+        self._sortNPUList()
+        return self._npuInfo
 
-    def __getNPUInfo(self):
+    def _getNPUInfo(self):
         npu_devices = pypci.PCI().FindAllNPU()
         if len(npu_devices) == 0:
-            self.__handleNonePciDevices()
+            self._handleNonePciDevices()
         else:
             for device in npu_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.__npuInfo.npus.append(self.__npuNameClean(device_name))
-                self.__npuInfo.number += 1
+                self._npuInfo.npus.append(self._npuNameClean(device_name))
+                self._npuInfo.number += 1
 
-    def __handleNonePciDevices(self):
+    def _handleNonePciDevices(self):
         # Place Holder for unknown NPU
-        self.__npuInfo.number = 1
-        self.__npuInfo.npus.append("Not found")
+        self._npuInfo.number = 1
+        self._npuInfo.npus.append("Not found")
 
     @staticmethod
-    def __npuNameClean(npu_name: str):
+    def _npuNameClean(npu_name: str):
         npu_name_clean = npu_name.replace("Corporation ", "")
         return npu_name_clean
 
-    def __sortNPUList(self):
-        self.__npuInfo.npus.sort()
-
+    def _sortNPUList(self):
+        self._npuInfo.npus.sort()

pyhw/backend/npu/npuBase.py

@@ -1,5 +1,6 @@
 from .linux import NPUDetectLinux
 from .macos import NPUDetectMacOS
+from .bsd import NPUDetectBSD
 
 
 class NPUDetect:
@@ -11,6 +12,8 @@ class NPUDetect:
             return NPUDetectLinux().getNPUInfo()
         elif self.OS == "macos":
             return NPUDetectMacOS().getNPUInfo()
+        elif self.OS == "freebsd":
+            return NPUDetectBSD().getNPUInfo()
         else:
             raise NotImplementedError("Unsupported operating system")
 

pyhw/backend/os/bsd.py

@@ -0,0 +1,7 @@
+from .linux import OSDetectLinux
+
+
+class OSDetectBSD(OSDetectLinux):
+    def __init__(self):
+        OSDetectLinux.__init__(self)
+

pyhw/backend/os/linux.py

@@ -6,47 +6,47 @@ from .osInfo import OSInfo
 
 class OSDetectLinux:
     def __init__(self):
-        self.__osInfo = OSInfo()
+        self._osInfo = OSInfo()
 
     def getOSInfo(self):
         """
         Detects the os distribution and its version.
         :return: dataclass OSInfoLinux, direct attrs: prettyName
         """
-        self.__getOSInfo()
-        self.__handleArmbian()
-        return self.__osInfo
+        self._getOSInfo()
+        self._handleArmbian()
+        return self._osInfo
 
-    def __getOSInfo(self):
+    def _getOSInfo(self):
         try:
             with open("/etc/os-release", "r") as f:
                 for line in f:
                     key, value = line.strip().split("=")
                     if key == "PRETTY_NAME":
-                        self.__osInfo.prettyName = value.strip('"')
+                        self._osInfo.prettyName = value.strip('"')
                     elif key == "NAME":
-                        self.__osInfo.name = value.strip('"')
+                        self._osInfo.name = value.strip('"')
                     elif key == "ID":
-                        self.__osInfo.id = value.strip('"')
+                        self._osInfo.id = value.strip('"')
                     elif key == "ID_LIKE":
-                        self.__osInfo.idLike = value.strip('"')
+                        self._osInfo.idLike = value.strip('"')
                     elif key == "VARIANT":
-                        self.__osInfo.variant = value.strip('"')
+                        self._osInfo.variant = value.strip('"')
                     elif key == "VARIANT_ID":
-                        self.__osInfo.variantID = value.strip('"')
+                        self._osInfo.variantID = value.strip('"')
                     elif key == "VERSION":
-                        self.__osInfo.version = value.strip('"')
+                        self._osInfo.version = value.strip('"')
                     elif key == "VERSION_ID":
-                        self.__osInfo.versionID = value.strip('"')
+                        self._osInfo.versionID = value.strip('"')
                     elif key == "VERSION_CODENAME":
-                        self.__osInfo.versionCodename = value.strip('"')
+                        self._osInfo.versionCodename = value.strip('"')
                     elif key == "CODE_NAME":
-                        self.__osInfo.codeName = value.strip('"')
+                        self._osInfo.codeName = value.strip('"')
                     elif key == "BUILD_ID":
-                        self.__osInfo.buildID = value.strip('"')
+                        self._osInfo.buildID = value.strip('"')
         except Exception:
             pass
 
-    def __handleArmbian(self):
-        if "Armbian" in self.__osInfo.prettyName or "armbian" in self.__osInfo.prettyName:
-            self.__osInfo.id = "armbian"
+    def _handleArmbian(self):
+        if "Armbian" in self._osInfo.prettyName or "armbian" in self._osInfo.prettyName:
+            self._osInfo.id = "armbian"

pyhw/backend/os/osBase.py

@@ -1,5 +1,6 @@
 from .linux import OSDetectLinux
 from .macos import OSDetectMacOS
+from .bsd import OSDetectBSD
 from ...pyhwException import OSUnsupportedException
 
 
@@ -12,5 +13,7 @@ class OSDetect:
             return OSDetectLinux().getOSInfo()
         elif self.__OS == "macos":
             return OSDetectMacOS().getOSInfo()
+        elif self.__OS == "freebsd":
+            return OSDetectBSD().getOSInfo()
         else:
             raise OSUnsupportedException("Unsupported operating system")

pyhw/backend/shell/shellBase.py

@@ -7,7 +7,7 @@ class ShellDetect:
         self.OS = os
 
     def getShellInfo(self):
-        if self.OS == "linux" or self.OS == "macos":
+        if self.OS in ["linux", "macos", "freebsd"]:
             return ShellDetectUnix().getShellInfo()
         else:
             raise OSUnsupportedException("Unsupported operating system")

pyhw/backend/shell/unix.py

@@ -26,7 +26,6 @@ class ShellDetectUnix:
             self.__getShell()
         self.__getVersion()
         self.__shellInfo.info = self.__shellInfo.shell + " " + self.__shellInfo.version
-        print(self.__shellInfo.info)
         return self.__shellInfo
 
     def __getShell(self):

pyhw/backend/title/titleBase.py

@@ -8,7 +8,7 @@ class TitleDetect:
         self.OS = os
 
     def getTitle(self):
-        if self.OS == "linux" or self.OS == "macos":
+        if self.OS in ["linux", "macos", "freebsd"]:
             return TitleDetectUnix().getTitle()
         elif self.OS == "windows":
             return TitleDetectWindows().getTitle()

pyhw/backend/uptime/bsd.py

@@ -0,0 +1,7 @@
+from .macos import UptimeDetectMacOS
+
+
+class UptimeDetectBSD(UptimeDetectMacOS):
+    def __init__(self):
+        UptimeDetectMacOS.__init__(self)
+

pyhw/backend/uptime/macos.py

@@ -6,13 +6,13 @@ import subprocess
 
 class UptimeDetectMacOS:
     def __init__(self):
-        self.__uptimeInfo = UptimeInfo()
-        self.__boot_time = 0
-        self.__now = 0
+        self._uptimeInfo = UptimeInfo()
+        self._boot_time = 0
+        self._now = 0
 
     def getUptimeInfo(self):
-        self.__getUptime()
-        uptime_seconds = self.__now - self.__boot_time
+        self._getUptime()
+        uptime_seconds = self._now - self._boot_time
         hours, remainder = divmod(uptime_seconds, 3600)
         minutes, seconds = divmod(remainder, 60)
         days, hours = divmod(hours, 24)
@@ -22,19 +22,19 @@ class UptimeDetectMacOS:
         seconds = int(seconds)
         if days == 0:
             if hours == 0:
-                self.__uptimeInfo.uptime = f"{minutes} min {seconds} sec"
+                self._uptimeInfo.uptime = f"{minutes} min {seconds} sec"
             else:
-                self.__uptimeInfo.uptime = f"{hours} hours {minutes} min {seconds} sec"
+                self._uptimeInfo.uptime = f"{hours} hours {minutes} min {seconds} sec"
         else:
-            self.__uptimeInfo.uptime = f"{days} days {hours} hours {minutes} min {seconds} sec"
-        return self.__uptimeInfo
+            self._uptimeInfo.uptime = f"{days} days {hours} hours {minutes} min {seconds} sec"
+        return self._uptimeInfo
 
-    def __getUptime(self):
+    def _getUptime(self):
         result = sysctlGetString("kern.boottime")
         match = re.search(r'sec = (\d+),', result)
         if match:
-            self.__boot_time = int(match.group(1))
+            self._boot_time = int(match.group(1))
         else:
             return
-        self.__now = int(subprocess.check_output(["date", "+%s"]).decode().strip())
+        self._now = int(subprocess.check_output(["date", "+%s"]).decode().strip())
 

pyhw/backend/uptime/uptimeBase.py

@@ -1,5 +1,6 @@
 from .linux import UptimeDetectLinux
 from .macos import UptimeDetectMacOS
+from .bsd import UptimeDetectBSD
 from ...pyhwException import OSUnsupportedException
 
 
@@ -19,5 +20,7 @@ class UptimeDetect:
             return UptimeDetectLinux().getUptimeInfo()
         elif self.OS == "macos":
             return UptimeDetectMacOS().getUptimeInfo()
+        elif self.OS == "freebsd":
+            return UptimeDetectBSD().getUptimeInfo()
         else:
             raise OSUnsupportedException("Unsupported operating system")

pyhw/frontend/color/colorConfig.py

@@ -31,6 +31,8 @@ class ColorConfigSet:
             return ColorConfigSetA.arch
         elif self.__os_name == "centos":
             return ColorConfigSetC.centos
+        elif self.__os_name == "freebsd":
+            return ColorConfigSetF.freebsd
         else:
             return ColorConfigSetL.linux  # default to Linux
 
@@ -107,6 +109,14 @@ class ColorConfigSetF:
         "colorKeys": ColorSet.COLOR_FG_BLUE,
         "colorTitle": ColorSet.COLOR_FG_BLUE
     }
+    freebsd = {
+        "colors": [
+            ColorSet.COLOR_FG_WHITE,
+            ColorSet.COLOR_FG_RED
+        ],
+        "colorKeys": ColorSet.COLOR_FG_RED,
+        "colorTitle": ColorSet.COLOR_FG_RED
+    }
 
 
 @dataclass

pyhw/frontend/frontendBase.py

@@ -1,6 +1,7 @@
 from .logo import Logo
 from .color import ColorConfigSet, colorPrefix, colorSuffix, ColorSet
 from ..pyhwUtil import getOS
+from ..pyhwException import BackendException
 import os
 import re
 
@@ -95,7 +96,13 @@ class Printer:
                                            self.__data_lines[0].split("@")[1] + colorSuffix())
         self.__processed_data_lines.append(colorSuffix() + self.__data_lines[1])
         for data_line in self.__data_lines[2:]:
-            name, value = data_line.split(": ")
+            try:
+                spl = data_line.split(": ")
+                name = spl[0]
+                value = "".join(spl[1:])
+            except:
+                print(data_line)
+                raise BackendException("Invalid data format")
             self.__processed_data_lines.append(colorPrefix(ColorSet.COLOR_MODE_BOLD) + colorPrefix(keys_color) + name + ": " + colorSuffix() + value)
 
 

pyhw/frontend/logo/ascii/freebsd.pyhw

@@ -0,0 +1,15 @@
+```                        $2`
+  $1` `.....---...$2....--.```   -/
+  $1+o   .--`         $2/y:`      +.
+   $1yo`:.            $2:o      `+-
+    $1y/               $2-/`   -o/
+   $1.-                  $2::/sy+:.
+   $1/                     $2`--  /
+  $1`:                          $2:`
+  $1`:                          $2:`
+   $1/                          $2/
+   $1.-                        $2-.
+    $1--                      $2-.
+     $1`:`                  $2`:`
+       .--             `--.
+          .---.....----.

pyhw/pyhwUtil/pyhwUtil.py

@@ -7,7 +7,7 @@ from dataclasses import dataclass
 def getOS():
     """
     Get the os type in lower case.
-    :return: str, os type, value in [windows, linux, macos, unknown].
+    :return: str, os type, value in [windows, linux, macos, freebsd, unknown].
     """
     system = platform.system()
     if system == "Windows":
@@ -16,6 +16,8 @@ def getOS():
         return "linux"
     elif system == "Darwin":
         return "macos"
+    elif system == "FreeBSD":
+        return "freebsd"
     else:
         return "unknown"
 
@@ -54,8 +56,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
@@ -168,8 +173,8 @@ def createDataStringOld(data: Data):
 
 @dataclass
 class SupportedOS:
-    ColorConfig = ["armbian", "arch", "alpine", "centos", "debian", "fedora", "macOS", "raspbian", "ubuntu"]
-    AsciiLogo = ["armbian", "arch", "alpine", "centos", "debian", "fedora", "macOS", "raspbian", "ubuntu"]
+    ColorConfig = ["armbian", "arch", "alpine", "centos", "debian", "fedora", "macOS", "raspbian", "ubuntu", "freebsd"]
+    AsciiLogo = ["armbian", "arch", "alpine", "centos", "debian", "fedora", "macOS", "raspbian", "ubuntu", "freebsd"]
 
 
 def selectOSLogo(os_id: str):
@@ -184,9 +189,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.7.dist-info → pyhw-0.7.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyhw
-Version: 0.6.7
+Version: 0.7.0
 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
@@ -22,9 +22,10 @@ Requires-Dist: pypci-ng>=0.0.8
 ![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)
 
 
-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.**
+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 🤔).
 
@@ -50,6 +51,8 @@ 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__.
 
@@ -66,7 +69,7 @@ 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:
+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
 
@@ -87,14 +90,14 @@ 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).
 
-## Supported (Tested) OS
+## Tested OS
 * macOS arm64, x86_64
-* debian-based distro arm64, x86_64
-* RaspberryPi OS arm64
+* 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.
+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).
@@ -119,3 +122,8 @@ Or simply type:
 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.6.7.dist-info → pyhw-0.7.0.dist-info}/RECORD

@@ -1,66 +1,73 @@
 pyhw/__init__.py,sha256=IMjkMO3twhQzluVTo8Z6rE7Eg-9U79_LGKMcsWLKBkY,22
-pyhw/__main__.py,sha256=3iVi-P0ciOYQPUrelB48gGOWlzFFkEw8n7MzX1K5Pck,1765
-pyhw/macos.py,sha256=kF973QvtEFky4m8RnYTJ-HWPuJi3625tvnWqJAT_DHM,4598
+pyhw/__main__.py,sha256=A0t0jkcwdTXd6ca7POUfm8krjCn2FQaXTIss5gNmNcI,1775
 pyhw/backend/__init__.py,sha256=knn_3Yroow1h0dqdrozk3zyy3vz-kQyNBRjR6OLmVoY,50
 pyhw/backend/backendBase.py,sha256=mloo8mPEbgbIdmyQ3I4vdEXMSSjxWi_wnwACmzvHbEo,506
 pyhw/backend/cpu/__init__.py,sha256=5YfANJVRwNwTRodG0ENOgusrdN592aaSnfq5ok4dKTo,56
-pyhw/backend/cpu/cpuBase.py,sha256=AGWqVjdvb82NiH4kxk3GERdBLwBNhkR23j2ei_l3S18,464
+pyhw/backend/cpu/bsd.py,sha256=Ls97NAsvZGVJj3_fBUcYXjY2gsZvFKhXYtkTHxVVXSs,288
+pyhw/backend/cpu/cpuBase.py,sha256=u9kQORv8RJ9BLjG219wNTgBAivHy_lUll4Bkk6TBlXY,576
 pyhw/backend/cpu/cpuInfo.py,sha256=A_nNGElq9W7oZ5DFJowLdFBE0ZvXKr5h29E6TGAvbRc,251
 pyhw/backend/cpu/linux.py,sha256=zJ2cOwQHtolJrMMY1WXVbLLIRNPxeClUgzLAAkd7As4,3346
 pyhw/backend/cpu/macos.py,sha256=pacU-yT7q-HKerkh2Q0BSdzSY6dKzHfSnRZBmimqqXk,2953
 pyhw/backend/gpu/__init__.py,sha256=EpMjPvUaXt0LTNMvGmB8WgXbUB9keCxuOhu8NT3Re6o,56
-pyhw/backend/gpu/gpuBase.py,sha256=Ge0DX2P8_EB7ovM7glmPUnVsPJL3OUHV2t_1T5mimR0,409
+pyhw/backend/gpu/bsd.py,sha256=hNFiCek770CXOh3DK3I3-g272-a1S5D7LolGJBsLXaU,124
+pyhw/backend/gpu/gpuBase.py,sha256=DyY1bVrsaWczkbrrN6J7kG-Kh9yic3Lqww8yLZNCet8,521
 pyhw/backend/gpu/gpuInfo.py,sha256=d_z_z5DiZAg85wP0VOBQEU0QHdaK3qFqA2Tp9Eq8-Zs,133
 pyhw/backend/gpu/linux.py,sha256=E-evoL-spQbHB8JvbZXSq5ypc2SeePVUPnhEQrSPQpg,1619
 pyhw/backend/gpu/macos.py,sha256=SmTqqTrIMRW-GVPmDs8xAiOX7HsCjrGh9qkxLQCdvO8,3850
 pyhw/backend/host/__init__.py,sha256=Efaj7-Oya7H8HdpZHQCLrwn-mcfPb-d6yfh4dzsE_7I,58
-pyhw/backend/host/hostBase.py,sha256=POyDW3f5JSWtEKyCfrVSBEddSwoywe_OBgUExCEuje8,563
+pyhw/backend/host/bsd.py,sha256=9gKnM6yysHBKwS3EQvb0pCeylh3dzHvoEuPe14zo9wQ,382
+pyhw/backend/host/hostBase.py,sha256=Dt3zZjkL6iUM9eOKkPUBAZ_2Lx-GQSIjsQhkLmjCUAk,678
 pyhw/backend/host/hostInfo.py,sha256=Xvz0LugPiCSWMkcDsp4p2rrojYFZauL6Q-gCZ6NLz5k,184
-pyhw/backend/host/linux.py,sha256=5wfEbe4au4JqDazBuUTfWLC2sPPa_YuidSGKVwzyI-0,2853
+pyhw/backend/host/linux.py,sha256=vGIl1b61vB-uilPk6awPOIWRaxnIsR43L20sNHeM5bI,2824
 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
-pyhw/backend/kernel/kernelBase.py,sha256=CMvBszl4_aP48YWnFI03I2GtngYStkcY4uDU3ub8C3E,555
+pyhw/backend/kernel/kernelBase.py,sha256=ZUj5wqar9mLUlIYrTDzyCWjrwzGtP6WJIIAXy5v1zhM,490
 pyhw/backend/kernel/kernelInfo.py,sha256=QQYni0IVeFZ2IVNDC06U728Q01Rq3R6qRDYCxMjtJrY,189
 pyhw/backend/kernel/unix.py,sha256=XDV2GIjamERcmlrQFaKFZY-OJO1xj76Im_7lmg2uFzo,1192
 pyhw/backend/kernel/windows.py,sha256=lxZ7T9Ea0Qbq3pf_TjSAHSM2YTozC6ivv7dKdLOTl3s,58
 pyhw/backend/memory/__init__.py,sha256=zGBWxfPAAk8ivCBWPLJIpuD-lB7wUJT3x8u2jHiAoCY,65
-pyhw/backend/memory/linux.py,sha256=eEH3oOYdbANw2B0Ce32fDOidh1GhtEd_UPIo2GohBEA,929
+pyhw/backend/memory/bsd.py,sha256=GKTCs6RocdoWj-5ZZRMB4xAWGWljor6leuwX-L-7bW0,251
+pyhw/backend/memory/linux.py,sha256=kxP0LxXdTWYRtu9nDyKqZeIzZrQI84kVOPMeN1GwSOo,917
 pyhw/backend/memory/macos.py,sha256=ur2HxmmmVkXmaxEcw_otphifVp_csfNMJdgt-idCq7M,2770
-pyhw/backend/memory/memoryBase.py,sha256=RFRWTByH25T3T77maxLyIRRoedIi5M8XLtVbvwBmjfY,433
+pyhw/backend/memory/memoryBase.py,sha256=wl6zN3-U_jRNsaWM9szWPvWjiq3Ca8Rcm-aMRdAJge8,554
 pyhw/backend/memory/memoryInfo.py,sha256=OQF165uEyuapAsi7cKacQYDRnKdrQHeldfyFwzS9N2g,186
 pyhw/backend/metal/t.py,sha256=52yv-JoXNfaIOfcxEEidIg0MoyFtzWvTRm550kQKPZA,391
 pyhw/backend/nic/__init__.py,sha256=eP4eOYIvMF3LcTf954hJa6TnB8R4Qahss2g-UcgypKY,57
-pyhw/backend/nic/linux.py,sha256=2IDhesM77qLt7QK8HzYiMeLyuKWOVVrrDtkLHs7R6lU,1321
+pyhw/backend/nic/bsd.py,sha256=lIXnPqzSA2qexUt0P9OHMmxoI5c5XBi2V80RY9S0wsM,135
+pyhw/backend/nic/linux.py,sha256=vS-bZSvPOjNaPLO6wyJHILVEsEVJJK2aQ4wUcXsgm74,1308
 pyhw/backend/nic/macos.py,sha256=63gZjSmUGwGqfs41IWrEXmSz9O8eQy4G5oql3JLZmoo,855
-pyhw/backend/nic/nicBase.py,sha256=hmVbiPOrDFClQrOBgAUgE8GVkC5nVH280jnlb65CDV4,539
+pyhw/backend/nic/nicBase.py,sha256=cT_rxqIEcvvKFsvjKlkCJ8RIfp7QHxDE9_SImXDae0s,735
 pyhw/backend/nic/nicInfo.py,sha256=wuBuL-aIzD441IUDPGz5e0xctcZ-opdpgqkVxgbvZLg,133
 pyhw/backend/npu/__init__.py,sha256=PgLKbwpgT5vw9xpa294Zxb94McyxNXW46_vMbT2Iqyc,58
-pyhw/backend/npu/linux.py,sha256=eQLozhGOh3iHoFXdRYp_Fn9OsrmJ7tsyxcOPUvopOSw,1286
+pyhw/backend/npu/bsd.py,sha256=eKkOWZ4MBybR_KOGGcsWUpzCGgghhvuBy5VNsnEE8cI,134
+pyhw/backend/npu/linux.py,sha256=mXHSYRION3pghwk6_4vgHxjSkNxI68ksGLkFZstR0mc,1192
 pyhw/backend/npu/macos.py,sha256=mNnfvjjPQNlA-mViuhmfeb__uI1be93ZSZvv7PVD52s,1037
-pyhw/backend/npu/npuBase.py,sha256=6lPYmsOGHO-lT-GqaJ2hNXRV_FLYqguuZ_7L6JJCG-g,411
+pyhw/backend/npu/npuBase.py,sha256=qiioBmHDeh2Et1F7lwmNight-2W32C0VmMtx2DIOCz4,523
 pyhw/backend/npu/npuInfo.py,sha256=82dK6XvW_XKw4O5-RfR4-qQRR7Plh8qqJLj0YDzISmU,135
 pyhw/backend/os/__init__.py,sha256=rPHQYdQK3qU6ZwwodqVoEWeqBnKffXlJyi4k3-8ViPY,53
-pyhw/backend/os/linux.py,sha256=UDUSbCMQQJZqfRFHS270u-ZrW4KfqZxcS_vQZl6VbPo,1977
+pyhw/backend/os/bsd.py,sha256=5Q30mkFKdhuup1dRjTEVN58MEGcj7JzbUzh40ld6C14,131
+pyhw/backend/os/linux.py,sha256=U7dIOKZaG5MSw0S65hAfDfFaBMvbwSCHFIHTwckU9iI,1957
 pyhw/backend/os/macos.py,sha256=DwgpwRD1a2oTANR_XL3kkMzNawqrt23F79dqBw3ULK8,1906
-pyhw/backend/os/osBase.py,sha256=AA17HIwmWy7E6nCtqbojTNsHKtcNuehf51FxGcfXu7A,462
+pyhw/backend/os/osBase.py,sha256=IiyrA5IEtlcaR-xigi8SxD70BimFKCBMjgF0MLihSOk,573
 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=Yradj6aj4nqc9CNQvVqzOgwO-p2IIJ_Jt_okL7cF4as,2146
+pyhw/backend/shell/shellBase.py,sha256=U4HPg_iWhAqaLceBnEVMHFj4A-FNYu7JjsQyi2seEU4,377
+pyhw/backend/shell/unix.py,sha256=Vt2wSxAIrzN679v0MjJwBoK6L12OqZOichociFZ9lw8,2109
 pyhw/backend/title/__init__.py,sha256=l6_WqreSBeK7krapCrbrr4ndnydrXB1aZ50Ve-beV_w,62
-pyhw/backend/title/titleBase.py,sha256=pcnkiNn9N69yc4iicAmpMpC6G7HUMyGCh0V1jjGIP_c,495
+pyhw/backend/title/titleBase.py,sha256=nzHcVJqAMZqWJP101YWgRwilSiZ_hHiK-jiI90Pm3r8,495
 pyhw/backend/title/unix.py,sha256=9B-zLE8yhlWBnJ-6Aa-DmFmgMV9KdvvNU40drJIaNck,837
 pyhw/backend/title/windows.py,sha256=5bXR6yxHk3diVx92sjxPeD6fUVR5sKZJG3K4aM3CGn8,82
 pyhw/backend/uptime/__init__.py,sha256=X8RVhHWmHpyey0C4gcmrt_u1cHKowhAQRDMAxY3i7p0,65
+pyhw/backend/uptime/bsd.py,sha256=XdLIvivr78Pr8PqSwQG3eLvjjaM52nK5QcWrwtuNZlg,147
 pyhw/backend/uptime/linux.py,sha256=Sh05CgUjAOzPM8LSoZf4fCU-Cl5pwhSJSC7XJ-jFaHU,1027
-pyhw/backend/uptime/macos.py,sha256=8lTlR0WUzgGqUNspqegg4dP_j5ySOCTyFlXpyRBJ-Jw,1306
-pyhw/backend/uptime/uptimeBase.py,sha256=cP6aTPnFe6XQHgBX7YcDuuGHARI11ctMlyrrtsU-Opc,657
+pyhw/backend/uptime/macos.py,sha256=Io-JrFjmRWHgB7uh4mBTV4rnfJuUvepGh2uiKNhUZcc,1293
+pyhw/backend/uptime/uptimeBase.py,sha256=PB0SWpsZyNz5GL5n39rC7DDSpKVAlH2K2eKqOuiEfy0,778
 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=t_lq2mvBet3l8Kn7bvab1bvfwCaD7PZ6dzN8fMCzHOI,4713
+pyhw/frontend/frontendBase.py,sha256=rPAf7tE1u8uGgZ-mDTOw_O2S2-YsevEzGJsq34eJlXQ,4957
 pyhw/frontend/color/__init__.py,sha256=xk511qWwdYWEVjk_zOaC4fs81HtwR4ELr3wi1tTL824,191
-pyhw/frontend/color/colorConfig.py,sha256=3k6aMoU7ymThG3yytzKqQDDxz8xL5wfZL_2cDiPusXI,4353
+pyhw/frontend/color/colorConfig.py,sha256=6VADbaM_xwlYF4Ds38xvmRgxVSDWBB71WWDFhiLrQaI,4650
 pyhw/frontend/color/colorSet.py,sha256=spH8PlRu7capouf-yUgDHgoPCnM5aJ_ncascISZfz2g,1421
 pyhw/frontend/color/colorUtil.py,sha256=VhcPmAJmXGIiRBfVZE2jg_iy-SfbxqwOSvkRz-nbUOQ,94
 pyhw/frontend/logo/__init__.py,sha256=mozEarHueBUgtDHKSd-RDaFysMLUiW3VQ8KcBtlKGCI,47
@@ -72,6 +79,7 @@ pyhw/frontend/logo/ascii/centos.pyhw,sha256=t-pFKQslIAKN4Jl1ilKLzB79BHSi0_zaJUDG
 pyhw/frontend/logo/ascii/debian.pyhw,sha256=ZmO1fg3Uc_ofF-CZSOP0Qo298luDASh2Zt50UmY6DBQ,437
 pyhw/frontend/logo/ascii/fedora.pyhw,sha256=IuFE6BByaNfVgn1pn7rKH7QVlIJyEmgGopCAOpXa6oM,742
 pyhw/frontend/logo/ascii/fedora_small.pyhw,sha256=_LSBzuCJjMa8pzmiJ3KN7Ndi-TryYPmtEfKqxxPAFfE,601
+pyhw/frontend/logo/ascii/freebsd.pyhw,sha256=Socjz8LCxWDpIaFjfISHX5TjlmWLtXTYqci6-m6hzJY,514
 pyhw/frontend/logo/ascii/linux.pyhw,sha256=IMe6YNElwCjLtv6kgSkERbATyyJAK531vcrT-otaLWE,300
 pyhw/frontend/logo/ascii/macOS.pyhw,sha256=HBGROtBb7wrNtRqAQ9ND7zxK0l17BRsmpgc2dMo_m6s,474
 pyhw/frontend/logo/ascii/raspbian.pyhw,sha256=jEl6WMKF-FGx359ipQ1kzweUJS-NuauYQCFaYime4PQ,159
@@ -81,11 +89,11 @@ pyhw/library/lib/iokitGPULib.dylib,sha256=DcJ0GZY79gTFckLFYtZgeKn1T0NFvdO_k_ccCa
 pyhw/pyhwException/__init__.py,sha256=8JsFvtF13g0Y5t4z9fRndDXtfCzuBM59jDf6PhWSFSk,220
 pyhw/pyhwException/pyhwException.py,sha256=wxuzFQa9g7XB1q9TUKO_55lw7wMEJMpzG8w1GVTFVa0,197
 pyhw/pyhwUtil/__init__.py,sha256=diIqlNUBfuHu-2VAOJk5nipGLafnWxR3chAAOmX8QRo,250
-pyhw/pyhwUtil/pyhwUtil.py,sha256=OY89sHr5LBjob7JMbCl-6x1AEPr-15UOE8UoQ04sLvI,5968
+pyhw/pyhwUtil/pyhwUtil.py,sha256=X8m49FHR56QLmkF2rJodH9wtpLZWYrRs9Hc7lBD3G_s,6297
 pyhw/pyhwUtil/sysctlUtil.py,sha256=S-rUvqi7ZrMyMouIhxlyHEQ4agM7sCT1Y7uzs3Hu5-o,841
-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,,
+pyhw-0.7.0.dist-info/LICENSE,sha256=hJs6RBqSVCexbTsalkMLNFI5t06kekQEsSVaOt_-yLs,1497
+pyhw-0.7.0.dist-info/METADATA,sha256=fI3DwfOv4xwuWSCuJSa_4yIb1gTGQ-VHyDA3Gq25TcM,5430
+pyhw-0.7.0.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+pyhw-0.7.0.dist-info/entry_points.txt,sha256=q-AB8im_QahpmNrmy4aPTJRGi0LlbNlnI3kF7s6pKss,44
+pyhw-0.7.0.dist-info/top_level.txt,sha256=7Inxvxt1TngEricKZEex9_WJZS3DbKYFUXDz4v5WHYU,5
+pyhw-0.7.0.dist-info/RECORD,,

{pyhw-0.6.7.dist-info → pyhw-0.7.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.5.0)
+Generator: setuptools (75.6.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

pyhw/macos.py

@@ -1,146 +0,0 @@
-import subprocess
-import json
-import platform
-from pyhwException import GPUNotFoundException, BackendException
-
-
-class GPUInfo:
-    def __init__(self, verbose=False):
-        self._gpus = list()
-        self._verbose = verbose
-
-    def init(self):
-        pass
-
-    def _get_gpu_info(self):
-        try:
-            gpus = json.loads(subprocess.check_output(["system_profiler", "SPDisplaysDataType", "-json"])).get('SPDisplaysDataType')
-            if gpus is not None:
-                if self._verbose:
-                    print(f"Detected {len(gpus)} GPU(s).")
-            else:
-                raise GPUNotFoundException("No GPU information found.")
-        except Exception as e:
-            raise BackendException(f"An error occurred while getting GPU info: {e}")
-
-        gpu_info_list = list()
-
-        for i in range(len(gpus)):
-            gpu = gpus[i]
-            info = dict()
-            info["name"] = gpu.get("sppci_model")
-            if gpu.get("spdisplays_vendor") == "sppci_vendor_Apple":
-                info["vram"] = f"{get_mem_info()} (shared memory)"
-            else:
-                info["vram"] = gpu.get("spdisplays_vram")
-            info["vendor"] = gpu.get("spdisplays_vendor")
-            info["cores"] = gpu.get("sppci_cores")
-            info["metal"] = gpu.get("spdisplays_mtlgpufamilysupport")
-            info["bus"] = gpu.get("sppci_bus")
-            info["link"] = gpu.get("spdisplays_pcie_width")
-            gpu_info_list.append(info)
-
-    @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 _handleVram(vram, vendor):
-        if vendor == "Apple":
-            return f"{get_mem_info()} (shared memory)"
-        else:
-            return vram
-
-    @staticmethod
-    def _getVramApple():
-        try:
-            return json.loads(subprocess.check_output(["system_profiler", "SPHardwareDataType", "-json"]))["SPHardwareDataType"][0]["physical_memory"]
-        except Exception as e:
-            raise BackendException(f"An error occurred while getting memory info: {e}")
-
-
-class GPU:
-    def __init__(self):
-        self._name = str()
-        self._vram = str()
-        self._vendor = str()
-        self._cores = str()
-        self._metal = str()
-        self._bus = str()
-        self._bus_width = str()
-        self._id = int()
-
-    def init(self):
-        pass
-
-    def _get_gpu_info(self):
-        pass
-
-
-
-
-def get_mem_info():
-    try:
-        mem_info_dict = json.loads(subprocess.check_output(["system_profiler", "SPHardwareDataType", "-json"]))
-        mem_info = mem_info_dict["SPHardwareDataType"][0]["physical_memory"]
-        return mem_info
-    except Exception as e:
-        print(f"An error occurred while getting memory info: {e}")
-        exit(-1)
-
-
-def get_gpu_info():
-    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']
-            print(f"Detected {len(gpus)} GPU(s).")
-        else:
-            print("No GPU information found.")
-    except Exception as e:
-        print(f"An error occurred while getting GPU info: {e}")
-        exit(-1)
-
-    gpu_info_list = list()
-
-    for i in range(len(gpus)):
-        gpu = gpus[i]
-        info = dict()
-        info["name"] = gpu.get("sppci_model")
-        if gpu.get("spdisplays_vendor") == "sppci_vendor_Apple":
-            info["vram"] = f"{get_mem_info()} (shared memory)"
-        else:
-            info["vram"] = gpu.get("spdisplays_vram")
-        info["vendor"] = gpu.get("spdisplays_vendor")
-        info["cores"] = gpu.get("sppci_cores")
-        info["metal"] = gpu.get("spdisplays_mtlgpufamilysupport")
-        info["bus"] = gpu.get("sppci_bus")
-        info["link"] = gpu.get("spdisplays_pcie_width")
-        gpu_info_list.append(info)
-    return gpu_info_list
-
-
-if __name__ == "__main__":
-    li = get_gpu_info()
-    for i in range(len(li)):
-        info = li[i]
-        print('----------')
-        print(f"GPU {i}:")
-        print(f'name: {info["name"]}')
-        print(f'vram: {info["vram"]}')
-        print(f'vendor: {info["vendor"]}')
-        print(f'cores: {info["cores"]}')
-        print(f'metal: {info["metal"]}')
-        print(f'bus: {info["bus"]}')
-        print(f'link: {info["link"]}')
-
-        print('----------')
-