pyhw 0.7.4__py3-none-any.whl → 0.8.0__py3-none-any.whl

pyhw/__init__.py

@@ -1 +1 @@
-__version__ = '0.7.4'
+__version__ = '0.8.0'

pyhw/__main__.py

@@ -17,8 +17,8 @@ from .pyhwUtil import getOS, selectOSLogo
 
 def main():
     current_os = getOS()
-    if current_os not in ["linux", "macos", "freebsd"]:
-        print(f"Only Linux, macOS, and FreeBSD is supported for now. Current os: {current_os}")
+    if current_os not in ["linux", "macos", "freebsd", "windows"]:
+        print(f"Only Linux, macOS, FreeBSD and Windows are supported for now. Current OS: {current_os}")
         return
     data = Data()
     data.title = TitleDetect(os=current_os).getTitle().title

pyhw/backend/cpu/cpuBase.py

@@ -1,6 +1,3 @@
-from .linux import CPUDetectLinux
-from .macos import CPUDetectMacOS
-from .bsd import CPUDetectBSD
 from ...pyhwException import OSUnsupportedException
 
 
@@ -10,10 +7,16 @@ class CPUDetect:
 
     def getCPUInfo(self):
         if self.OS == "linux":
+            from .linux import CPUDetectLinux
             return CPUDetectLinux().getCPUInfo()
         elif self.OS == "macos":
+            from .macos import CPUDetectMacOS
             return CPUDetectMacOS().getCPUInfo()
         elif self.OS == "freebsd":
+            from .bsd import CPUDetectBSD
             return CPUDetectBSD().getCPUInfo()
+        elif self.OS == "windows":
+            from .windows import CPUDetectWindows
+            return CPUDetectWindows().getCPUInfo()
         else:
             raise OSUnsupportedException("Unsupported operating system")

pyhw/backend/cpu/windows.py

@@ -0,0 +1,48 @@
+import re
+import os
+import subprocess
+from .cpuInfo import CPUInfo
+import json
+
+
+class CPUDetectWindows:
+    def __init__(self):
+        self.__cpuInfo = CPUInfo()
+
+    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 != "":
+                self.__cpuInfo.cpu += f" ({self.__cpuInfo.cores})"
+            if self.__cpuInfo.frequency != "":
+                self.__cpuInfo.cpu += f" @ {self.__cpuInfo.frequency}"
+        return self.__cpuInfo
+
+    def __getCPUInfo(self):
+        COMMAND = "Get-CimInstance -ClassName Win32_Processor | Select-Object Name,NumberOfLogicalProcessors,MaxClockSpeed | ConvertTo-JSON"
+
+        try:
+            result = subprocess.run(["powershell", "-NoProfile", "-Command", COMMAND], capture_output=True, text=True)
+        except subprocess.SubprocessError:
+            exit(-1)
+
+        res = json.loads(result.stdout)
+        name = res["Name"]
+        cores = res["NumberOfLogicalProcessors"]
+        frequency = round(int(res["MaxClockSpeed"]) / 1000.0, 2)  # GHz
+        if "@" in name:
+            self.__cpuInfo.model = name.split("@")[0].strip()
+        else:
+            self.__cpuInfo.model = name
+        self.__cpuInfo.cores = str(cores)
+        self.__cpuInfo.frequency = f"{frequency:.2f} GHz"
+
+    def __modelClean(self):
+        self.__cpuInfo.model = self.__cpuInfo.model.replace("(R)", "")
+        self.__cpuInfo.model = self.__cpuInfo.model.replace("(TM)", "")
+        self.__cpuInfo.model = self.__cpuInfo.model.replace("CPU ", "")
+

pyhw/backend/gpu/gpuBase.py

@@ -1,6 +1,4 @@
-from .linux import GPUDetectLinux
-from .macos import GPUDetectMacOS
-from .bsd import GPUDetectBSD
+from ...pyhwException import OSUnsupportedException
 
 
 class GPUDetect:
@@ -9,10 +7,16 @@ class GPUDetect:
 
     def getGPUInfo(self):
         if self.OS == "linux":
+            from .linux import GPUDetectLinux
             return GPUDetectLinux().getGPUInfo()
         elif self.OS == "macos":
+            from .macos import GPUDetectMacOS
             return GPUDetectMacOS().getGPUInfo()
         elif self.OS == "freebsd":
+            from .bsd import GPUDetectBSD
             return GPUDetectBSD().getGPUInfo()
+        elif self.OS == "windows":
+            from .windows import GPUDetectWindows
+            return GPUDetectWindows().getGPUInfo()
         else:
-            raise NotImplementedError("Unsupported operating system")
+            raise OSUnsupportedException("Unsupported operating system")

pyhw/backend/gpu/windows.py

@@ -0,0 +1,41 @@
+import subprocess
+from .gpuInfo import GPUInfo
+from ..cpu import CPUDetect
+from ...pyhwUtil import getArch
+import pypci
+
+
+class GPUDetectWindows:
+    def __init__(self):
+        self.__gpuInfo = GPUInfo()
+
+    def getGPUInfo(self):
+        self.__getGPUInfo()
+        self.__sortGPUList()
+        return self.__gpuInfo
+
+    def __getGPUInfo(self):
+        gpu_devices = pypci.PCI().FindAllVGA()
+        if len(gpu_devices) == 0:
+            self.__handleNonePciDevices()
+        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
+
+    def __handleNonePciDevices(self):
+        self.__gpuInfo.gpus.append("Not found")
+        self.__gpuInfo.number = 1
+
+    @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/backend/host/hostBase.py

@@ -1,7 +1,3 @@
-from .linux import HostDetectLinux
-from .macos import HostDetectMacOS
-from .windows import HostDetectWindows
-from .bsd import HostDetectBSD
 from ...pyhwException import OSUnsupportedException
 
 
@@ -11,12 +7,16 @@ class HostDetect:
 
     def getHostInfo(self):
         if self.OS == "linux":
+            from .linux import HostDetectLinux
             return HostDetectLinux().getHostInfo()
         elif self.OS == "macos":
+            from .macos import HostDetectMacOS
             return HostDetectMacOS().getHostInfo()
         elif self.OS == "freebsd":
+            from .bsd import HostDetectBSD
             return HostDetectBSD().getHostInfo()
         elif self.OS == "windows":
-            pass
+            from .windows import HostDetectWindows
+            return HostDetectWindows().getHostInfo()
         else:
             raise OSUnsupportedException("Unsupported operating system")

pyhw/backend/host/hostInfo.py

@@ -3,11 +3,20 @@ from dataclasses import dataclass
 
 @dataclass
 class HostInfo:
-    model = ""
-    family = ""
-    name = ""
-    version = ""
-    sku = ""
-    serial = ""
-    uuid = ""
-    vendor = ""
+    """
+    HostInfo class to store host information.
+    """
+    def __init__(self):
+        """
+        Initialize HostInfo class, model attribute is required.
+        """
+        self.os = ""
+        self.model = ""
+        self.family = ""
+        self.name = ""
+        self.version = ""
+        self.sku = ""
+        self.serial = ""
+        self.uuid = ""
+        self.vendor = ""
+

pyhw/backend/host/windows.py

@@ -1,5 +1,36 @@
 """
     In dev.
 """
+from ...pyhwUtil import getArch
+from ...pyhwException import BackendException
+from .hostInfo import HostInfo
+import winreg
+
+
 class HostDetectWindows:
-    pass
+    def __init__(self):
+        self._hostInfo = HostInfo()
+        self._arch = getArch()
+
+    def getHostInfo(self):
+        self._getModel()
+        return self._hostInfo
+
+    def _getModel(self):
+        try:
+            key = winreg.OpenKey(winreg.HKEY_LOCAL_MACHINE, r"HARDWARE\DESCRIPTION\System\BIOS")
+            manufacturer, _ = winreg.QueryValueEx(key, "SystemManufacturer")
+            name, _ = winreg.QueryValueEx(key, "SystemProductName")
+            version, _ = winreg.QueryValueEx(key, "SystemVersion")
+            winreg.CloseKey(key)
+        except FileNotFoundError:
+            raise BackendException("Unable to retrieve system information.")
+        self._hostInfo.name = name
+        self._hostInfo.version = version
+        self._hostInfo.vendor = manufacturer
+        self.__handleVM()
+        self._hostInfo.model = self._hostInfo.name + " " + self._hostInfo.version
+
+    def __handleVM(self):
+        if self._hostInfo.name.startswith("VMware"):
+            self._hostInfo.version = ""

pyhw/backend/kernel/kernelBase.py

@@ -1,4 +1,3 @@
-from .unix import KernelDetectUnix
 from ...pyhwException import OSUnsupportedException
 
 
@@ -8,8 +7,10 @@ class KernelDetect:
 
     def getKernelInfo(self):
         if self.OS in ["linux", "macos", "freebsd"]:
+            from .unix import KernelDetectUnix
             return KernelDetectUnix().getKernelInfo()
         elif self.OS == "windows":
-            raise OSUnsupportedException("Unsupported operating system")
+            from .windows import KernelDetectWindows
+            return KernelDetectWindows().getKernelInfo()
         else:
             raise OSUnsupportedException("Unsupported operating system")

pyhw/backend/kernel/kernelInfo.py

@@ -3,7 +3,13 @@ from dataclasses import dataclass
 
 @dataclass
 class KernelInfo:
+    """
+    Data class for storing kernel information.
+    """
     def __init__(self):
+        """
+        Initialize the data class, kernel attribute is required.
+        """
         self.name = ""
         self.version = ""
         self.machine = ""

pyhw/backend/kernel/windows.py

@@ -1,7 +1,29 @@
 """
     In dev.
 """
+from .kernelInfo import KernelInfo
+from ...pyhwException import BackendException
+import platform
+import winreg
 
 
 class KernelDetectWindows:
-    pass
+    def __init__(self):
+        self.__kernelInfo = KernelInfo()
+
+    def getKernelInfo(self):
+        version = platform.version()
+        machine = platform.machine()
+        display = self.__get_windows_version()
+        self.__kernelInfo.kernel = f"{version} ({display}) {machine}"
+        return self.__kernelInfo
+
+    @staticmethod
+    def __get_windows_version():
+        try:
+            key = winreg.OpenKey(winreg.HKEY_LOCAL_MACHINE, r"SOFTWARE\Microsoft\Windows NT\CurrentVersion")
+            display_version, _ = winreg.QueryValueEx(key, "DisplayVersion")
+            winreg.CloseKey(key)
+            return str(display_version)
+        except:
+            raise BackendException("Unable to determine Windows kernel version.")

pyhw/backend/memory/memoryBase.py

@@ -1,6 +1,4 @@
-from .linux import MemoryDetectLinux
-from .macos import MemoryDetectMacOS
-from .bsd import MemoryDetectBSD
+from ...pyhwException import OSUnsupportedException
 
 
 class MemoryDetect:
@@ -9,10 +7,16 @@ class MemoryDetect:
 
     def getMemoryInfo(self):
         if self.OS == "linux":
+            from .linux import MemoryDetectLinux
             return MemoryDetectLinux().getMemoryInfo()
         elif self.OS == "macos":
+            from .macos import MemoryDetectMacOS
             return MemoryDetectMacOS().getMemoryInfo()
         elif self.OS == "freebsd":
+            from .bsd import MemoryDetectBSD
             return MemoryDetectBSD().getMemoryInfo()
+        elif self.OS == "windows":
+            from .windows import MemoryDetectWindows
+            return MemoryDetectWindows().getMemoryInfo()
         else:
-            raise NotImplementedError("Unsupported operating system")
+            raise OSUnsupportedException("Unsupported operating system")

pyhw/backend/memory/windows.py

@@ -0,0 +1,36 @@
+from ...pyhwException import BackendException
+from .memoryInfo import MemoryInfo
+import subprocess
+import json
+
+
+class MemoryDetectWindows:
+    def __init__(self):
+        self._memoryInfo = MemoryInfo()
+
+    def getMemoryInfo(self):
+        self._getMemory()
+        self._memoryInfo.memory = f"{self._memoryInfo.used} MiB / {self._memoryInfo.total} MiB"
+        return self._memoryInfo
+
+    def _getMemory(self):
+        COMMAND = 'Get-CimInstance -ClassName Win32_OperatingSystem | Select-Object FreePhysicalMemory,TotalVisibleMemorySize | ConvertTo-JSON'
+        try:
+            result = subprocess.run(["powershell", "-NoProfile", "-Command", COMMAND], capture_output=True, text=True)
+        except subprocess.SubprocessError:
+            raise BackendException("Failed to get memory information on Windows.")
+
+        res = json.loads(result.stdout)
+        free_memory = int(res['FreePhysicalMemory']) / 1024
+        total_memory = int(res['TotalVisibleMemorySize']) / 1024
+        used_memory = total_memory - free_memory
+        self._memoryInfo.total = round(total_memory, 2)
+        self._memoryInfo.available = round(free_memory, 2)
+        self._memoryInfo.used = round(used_memory, 2)
+
+
+
+
+
+
+

pyhw/backend/nic/nicBase.py

@@ -1,6 +1,4 @@
-from .linux import NICDetectLinux
-from .macos import NICDetectMacOS
-from .bsd import NICDetectBSD
+from ...pyhwException import OSUnsupportedException
 
 
 class NICDetect:
@@ -16,10 +14,16 @@ class NICDetect:
         :return: dataclass NICInfo, direct attr: nics
         """
         if self.OS == "linux":
+            from .linux import NICDetectLinux
             return NICDetectLinux().getNICInfo()
         elif self.OS == "macos":
+            from .macos import NICDetectMacOS
             return NICDetectMacOS().getNICInfo()
         elif self.OS == "freebsd":
+            from .bsd import NICDetectBSD
             return NICDetectBSD().getNICInfo()
+        elif self.OS == "windows":
+            from .windows import NICDetectWindows
+            return NICDetectWindows().getNICInfo()
         else:
-            raise NotImplementedError("Unsupported operating system")
+            raise OSUnsupportedException("Unsupported operating system")

pyhw/backend/nic/windows.py

@@ -0,0 +1,44 @@
+import subprocess
+from .nicInfo import NICInfo
+from ...pyhwUtil import getArch
+from ...pyhwException import BackendException
+import pypci
+import os
+
+
+class NICDetectWindows:
+    def __init__(self):
+        self._nicInfo = NICInfo()
+
+    def getNICInfo(self):
+        self._getNICInfo()
+        self._sortNICList()
+        return self._nicInfo
+
+    def _getNICInfo(self):
+        nic_devices = pypci.PCI().FindAllNIC()
+        if len(nic_devices) == 0:
+            self.__handleNonePciDevices()
+        else:
+            for device in nic_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._nicInfo.nics.append(self._nicNameClean(device_name))
+                self._nicInfo.number += 1
+
+    def __handleNonePciDevices(self):
+        # need to update
+        self._nicInfo.nics.append("Not found")
+        self._nicInfo.number = 1
+
+    @staticmethod
+    def _nicNameClean(nic_name: str):
+        nic_name_clean = nic_name.replace("Corporation ", "")
+        return nic_name_clean
+
+    def _sortNICList(self):
+        return self._nicInfo.nics.sort()
+
+

pyhw/backend/npu/npuBase.py

@@ -1,6 +1,4 @@
-from .linux import NPUDetectLinux
-from .macos import NPUDetectMacOS
-from .bsd import NPUDetectBSD
+from ...pyhwException import OSUnsupportedException
 
 
 class NPUDetect:
@@ -9,12 +7,16 @@ class NPUDetect:
 
     def getNPUInfo(self):
         if self.OS == "linux":
+            from .linux import NPUDetectLinux
             return NPUDetectLinux().getNPUInfo()
         elif self.OS == "macos":
+            from .macos import NPUDetectMacOS
             return NPUDetectMacOS().getNPUInfo()
         elif self.OS == "freebsd":
+            from .bsd import NPUDetectBSD
             return NPUDetectBSD().getNPUInfo()
+        elif self.OS == "windows":
+            from .windows import NPUDetectWindows
+            return NPUDetectWindows().getNPUInfo()
         else:
-            raise NotImplementedError("Unsupported operating system")
-
-
+            raise OSUnsupportedException("Unsupported operating system")

pyhw/backend/npu/windows.py

@@ -0,0 +1,40 @@
+from .npuInfo import NPUInfo
+import pypci
+
+
+class NPUDetectWindows:
+    def __init__(self):
+        self._npuInfo = NPUInfo()
+
+    def getNPUInfo(self):
+        self._getNPUInfo()
+        self._sortNPUList()
+        return self._npuInfo
+
+    def _getNPUInfo(self):
+        npu_devices = pypci.PCI().FindAllNPU()
+        if len(npu_devices) == 0:
+            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
+
+    def _handleNonePciDevices(self):
+        # Place Holder for unknown NPU
+        self._npuInfo.number = 1
+        self._npuInfo.npus.append("Not found")
+
+    @staticmethod
+    def _npuNameClean(npu_name: str):
+        npu_name_clean = npu_name.replace("Corporation ", "")
+        return npu_name_clean
+
+    def _sortNPUList(self):
+        self._npuInfo.npus.sort()
+
+

pyhw/backend/os/osBase.py

@@ -1,6 +1,3 @@
-from .linux import OSDetectLinux
-from .macos import OSDetectMacOS
-from .bsd import OSDetectBSD
 from ...pyhwException import OSUnsupportedException
 
 
@@ -10,10 +7,16 @@ class OSDetect:
 
     def getOSInfo(self):
         if self.__OS == "linux":
+            from .linux import OSDetectLinux
             return OSDetectLinux().getOSInfo()
         elif self.__OS == "macos":
+            from .macos import OSDetectMacOS
             return OSDetectMacOS().getOSInfo()
         elif self.__OS == "freebsd":
+            from .bsd import OSDetectBSD
             return OSDetectBSD().getOSInfo()
+        elif self.__OS == "windows":
+            from .windows import OSDetectWindows
+            return OSDetectWindows().getOSInfo()
         else:
             raise OSUnsupportedException("Unsupported operating system")

pyhw/backend/os/osInfo.py

@@ -3,7 +3,13 @@ from dataclasses import dataclass
 
 @dataclass
 class OSInfo:
+    """
+    Dataclass to hold the OS information
+    """
     def __init__(self):
+        """
+        Initialize the dataclass, prettyName and id attributes are required.
+        """
         self.prettyName = ""
         self.name = ""
         self.id = ""

pyhw/backend/os/windows.py

@@ -0,0 +1,35 @@
+from .osInfo import OSInfo
+from ...pyhwException import BackendException
+import platform
+import winreg
+
+
+class OSDetectWindows:
+    def __init__(self):
+        self._osInfo = OSInfo()
+
+    def getOSInfo(self):
+        system = platform.system()
+        release = platform.release()
+        edition = platform.win32_edition()
+        machine = platform.machine()
+        display = self.__get_windows_version()
+        self._osInfo.prettyName = f"{system} {release} {display} ({edition}) {machine}"
+        if release == "10":
+            self._osInfo.id = "windows_10"
+        elif release == "11":
+            self._osInfo.id = "windows_11"
+        else:
+            self._osInfo.id = "windows_old"
+        return self._osInfo
+
+    @staticmethod
+    def __get_windows_version():
+        try:
+            key = winreg.OpenKey(winreg.HKEY_LOCAL_MACHINE, r"SOFTWARE\Microsoft\Windows NT\CurrentVersion")
+            display_version, _ = winreg.QueryValueEx(key, "DisplayVersion")
+            winreg.CloseKey(key)
+            return str(display_version)
+        except:
+            raise BackendException("Unable to determine Windows kernel version.")
+

pyhw/backend/shell/shellBase.py

@@ -1,4 +1,3 @@
-from .unix import ShellDetectUnix
 from ...pyhwException import OSUnsupportedException
 
 
@@ -8,6 +7,10 @@ class ShellDetect:
 
     def getShellInfo(self):
         if self.OS in ["linux", "macos", "freebsd"]:
+            from .unix import ShellDetectUnix
             return ShellDetectUnix().getShellInfo()
+        elif self.OS == "windows":
+            from .windows import ShellDetectWindows
+            return ShellDetectWindows().getShellInfo()
         else:
             raise OSUnsupportedException("Unsupported operating system")

pyhw/backend/shell/shellInfo.py

@@ -0,0 +1,10 @@
+from dataclasses import dataclass
+
+
+@dataclass
+class ShellInfo:
+    def __init__(self):
+        self.shell = ""
+        self.version = ""
+        self.path = ""
+        self.info = ""

pyhw/backend/shell/unix.py

@@ -2,22 +2,14 @@
     In dev.
 """
 from ...pyhwUtil import getDocker
-from dataclasses import dataclass
+from .shellInfo import ShellInfo
 import os
 import subprocess
 
 
-@dataclass
-class ShellInfoUnix:
-    shell = ""
-    version = ""
-    path = ""
-    info = ""
-
-
 class ShellDetectUnix:
     def __init__(self):
-        self.__shellInfo = ShellInfoUnix()
+        self.__shellInfo = ShellInfo()
 
     def getShellInfo(self):
         if getDocker():

pyhw/backend/shell/windows.py

@@ -0,0 +1,29 @@
+"""
+    In dev.
+"""
+from ...pyhwException import BackendException
+from .shellInfo import ShellInfo
+import json
+import subprocess
+
+
+class ShellDetectWindows:
+    def __init__(self):
+        self.__shellInfo = ShellInfo()
+
+    def getShellInfo(self):
+        COMMAND = "$PSVersionTable.PSVersion | ConvertTo-JSON"
+
+        try:
+            result = subprocess.run(["powershell", "-NoProfile", "-Command", COMMAND], capture_output=True, text=True)
+        except subprocess.SubprocessError:
+            raise BackendException("Error running PowerShell command.")
+
+        res = json.loads(result.stdout)
+        major = res["Major"]
+        minor = res["Minor"]
+
+        self.__shellInfo.shell = "PowerShell"
+        self.__shellInfo.version = f"{major}.{minor}"
+        self.__shellInfo.info = f"PowerShell {major}.{minor}"
+        return self.__shellInfo

pyhw/backend/title/titleBase.py

@@ -1,5 +1,3 @@
-from .unix import TitleDetectUnix
-from .windows import TitleDetectWindows
 from ...pyhwException import OSUnsupportedException
 
 
@@ -9,8 +7,10 @@ class TitleDetect:
 
     def getTitle(self):
         if self.OS in ["linux", "macos", "freebsd"]:
+            from .unix import TitleDetectUnix
             return TitleDetectUnix().getTitle()
         elif self.OS == "windows":
+            from .windows import TitleDetectWindows
             return TitleDetectWindows().getTitle()
         else:
             raise OSUnsupportedException("Unsupported operating system")

pyhw/backend/title/titleInfo.py

@@ -0,0 +1,9 @@
+from dataclasses import dataclass
+
+
+@dataclass
+class TitleInfo:
+    def __init__(self):
+        self.username = ""
+        self.hostname = ""
+        self.title = ""

pyhw/backend/title/unix.py

@@ -2,19 +2,12 @@
  In dev.
 """
 import subprocess
-from dataclasses import dataclass
-
-
-@dataclass
-class TitleInfoUnix:
-    username = ""
-    hostname = ""
-    title = ""
+from .titleInfo import TitleInfo
 
 
 class TitleDetectUnix:
     def __init__(self):
-        self.__titleInfo = TitleInfoUnix()
+        self.__titleInfo = TitleInfo()
 
     def getTitle(self):
         self.__getTitle()

pyhw/backend/title/windows.py

@@ -1,8 +1,17 @@
 """
  In dev.
 """
+from .titleInfo import TitleInfo
+import getpass
+import platform
 
 
 class TitleDetectWindows:
+    def __init__(self):
+        self.__titleInfo = TitleInfo()
+
     def getTitle(self):
-        pass
+        self.__titleInfo.username = getpass.getuser()
+        self.__titleInfo.hostname = platform.node()
+        self.__titleInfo.title = f"{self.__titleInfo.username}@{self.__titleInfo.hostname}"
+        return self.__titleInfo

pyhw/backend/uptime/linux.py

@@ -24,8 +24,8 @@ class UptimeDetectLinux:
             seconds = int(seconds)
             if days == 0:
                 if hours == 0:
-                    self.__uptimeInfo.uptime = f"{minutes} min {seconds} sec"
+                    self.__uptimeInfo.uptime = f"{minutes} mins {seconds} secs"
                 else:
-                    self.__uptimeInfo.uptime = f"{hours} hours {minutes} min {seconds} sec"
+                    self.__uptimeInfo.uptime = f"{hours} hours {minutes} mins {seconds} secs"
             else:
-                self.__uptimeInfo.uptime = f"{days} days {hours} hours {minutes} min {seconds} sec"
+                self.__uptimeInfo.uptime = f"{days} days {hours} hours {minutes} mins {seconds} secs"

pyhw/backend/uptime/macos.py

@@ -22,11 +22,11 @@ class UptimeDetectMacOS:
         seconds = int(seconds)
         if days == 0:
             if hours == 0:
-                self._uptimeInfo.uptime = f"{minutes} min {seconds} sec"
+                self._uptimeInfo.uptime = f"{minutes} mins {seconds} secs"
             else:
-                self._uptimeInfo.uptime = f"{hours} hours {minutes} min {seconds} sec"
+                self._uptimeInfo.uptime = f"{hours} hours {minutes} mins {seconds} secs"
         else:
-            self._uptimeInfo.uptime = f"{days} days {hours} hours {minutes} min {seconds} sec"
+            self._uptimeInfo.uptime = f"{days} days {hours} hours {minutes} mins {seconds} secs"
         return self._uptimeInfo
 
     def _getUptime(self):

pyhw/backend/uptime/uptimeBase.py

@@ -1,6 +1,3 @@
-from .linux import UptimeDetectLinux
-from .macos import UptimeDetectMacOS
-from .bsd import UptimeDetectBSD
 from ...pyhwException import OSUnsupportedException
 
 
@@ -17,10 +14,16 @@ class UptimeDetect:
         :return: dataclass UptimeInfo, direct attr: uptime
         """
         if self.OS == "linux":
+            from .linux import UptimeDetectLinux
             return UptimeDetectLinux().getUptimeInfo()
         elif self.OS == "macos":
+            from .macos import UptimeDetectMacOS
             return UptimeDetectMacOS().getUptimeInfo()
         elif self.OS == "freebsd":
+            from .bsd import UptimeDetectBSD
             return UptimeDetectBSD().getUptimeInfo()
+        elif self.OS == "windows":
+            from .windows import UptimeDetectWindows
+            return UptimeDetectWindows().getUptimeInfo()
         else:
             raise OSUnsupportedException("Unsupported operating system")

pyhw/backend/uptime/windows.py

@@ -0,0 +1,49 @@
+from ...pyhwException import BackendException
+from .uptimeInfo import UptimeInfo
+import subprocess
+import json
+import re
+from datetime import datetime
+
+
+class UptimeDetectWindows:
+    def __init__(self):
+        self.__uptimeInfo = UptimeInfo()
+
+    def getUptimeInfo(self):
+        self.__getUptime()
+        return self.__uptimeInfo
+
+    def __getUptime(self):
+        COMMAND = 'Get-CimInstance -ClassName Win32_OperatingSystem | Select-Object LastBootUpTime | ConvertTo-JSON'
+        try:
+            result = subprocess.run(["powershell", "-NoProfile", "-Command", COMMAND], capture_output=True, text=True)
+        except subprocess.SubprocessError:
+            raise BackendException("Error while getting system uptime")
+
+        res = json.loads(result.stdout)
+        timestamp_str = res['LastBootUpTime']
+        match = re.search(r'\d+', timestamp_str)
+
+        if match:
+            timestamp_ms = int(match.group(0))
+            last_boot_time = datetime.utcfromtimestamp(timestamp_ms / 1000)
+            current_time = datetime.utcnow()
+            uptime = current_time - last_boot_time
+            days = uptime.days
+            seconds = uptime.seconds
+            hours = seconds // 3600
+            minutes = (seconds % 3600) // 60
+            secs = (seconds % 3600) % 60
+
+            if days == 0:
+                if hours == 0:
+                    self.__uptimeInfo.uptime = f"{minutes} mins {secs} secs"
+                else:
+                    self.__uptimeInfo.uptime = f"{hours} hours {minutes} mins {secs} secs"
+            else:
+                self.__uptimeInfo.uptime = f"{days} days {hours} hours {minutes} mins {secs} secs"
+        else:
+            raise BackendException("Error while getting system uptime")
+
+

pyhw/frontend/color/colorConfig.py

@@ -33,6 +33,14 @@ class ColorConfigSet:
             return ColorConfigSetC.centos
         elif self.__os_name == "freebsd":
             return ColorConfigSetF.freebsd
+        elif self.__os_name == "windows_old":
+            return ColorConfigSetW.windows_old
+        elif self.__os_name == "windows_10":
+            return ColorConfigSetW.windows_10
+        elif self.__os_name == "windows_11":
+            return ColorConfigSetW.windows_11
+        elif self.__os_name == "windows_2025":
+            return ColorConfigSetW.windows_2025
         else:
             return ColorConfigSetL.linux  # default to Linux
 
@@ -176,3 +184,47 @@ class ColorConfigSetU:
         "colorKeys": ColorSet.COLOR_FG_RED,
         "colorTitle": ColorSet.COLOR_FG_RED
     }
+
+
+@dataclass
+class ColorConfigSetW:
+    windows_old = {
+        "colors": [
+            ColorSet.COLOR_FG_RED,
+            ColorSet.COLOR_FG_GREEN,
+            ColorSet.COLOR_FG_BLUE,
+            ColorSet.COLOR_FG_YELLOW
+        ],
+        "colorKeys": ColorSet.COLOR_FG_BLUE,
+        "colorTitle": ColorSet.COLOR_FG_GREEN
+    }
+    windows_10 = {
+        "colors": [
+            ColorSet.COLOR_FG_CYAN,
+            ColorSet.COLOR_FG_CYAN,
+            ColorSet.COLOR_FG_CYAN,
+            ColorSet.COLOR_FG_CYAN
+        ],
+        "colorKeys": ColorSet.COLOR_FG_YELLOW,
+        "colorTitle": ColorSet.COLOR_FG_GREEN
+    }
+    windows_11 = {
+        "colors": [
+            ColorSet.COLOR_FG_BLUE,
+            ColorSet.COLOR_FG_BLUE,
+            ColorSet.COLOR_FG_BLUE,
+            ColorSet.COLOR_FG_BLUE
+        ],
+        "colorKeys": ColorSet.COLOR_FG_YELLOW,
+        "colorTitle": ColorSet.COLOR_FG_CYAN
+    }
+    windows_2025 = {
+        "colors": [
+            ColorSet.COLOR_FG_BLUE,
+            ColorSet.COLOR_FG_BLUE,
+            ColorSet.COLOR_FG_BLUE,
+            ColorSet.COLOR_FG_BLUE
+        ],
+        "colorKeys": ColorSet.COLOR_FG_YELLOW,
+        "colorTitle": ColorSet.COLOR_FG_CYAN
+    }

pyhw/frontend/logo/ascii/windows_10.pyhw

@@ -0,0 +1,19 @@
+                                $2..,
+                    ....,,:;+ccllll
+$1      ...,,+:;  $2cllllllllllllllllll
+$1,cclllllllllll  $2lllllllllllllllllll
+$1llllllllllllll  $2lllllllllllllllllll
+$1llllllllllllll  $2lllllllllllllllllll
+$1llllllllllllll  $2lllllllllllllllllll
+$1llllllllllllll  $2lllllllllllllllllll
+$1llllllllllllll  $2lllllllllllllllllll
+
+$3llllllllllllll  $4lllllllllllllllllll
+$3llllllllllllll  $4lllllllllllllllllll
+$3llllllllllllll  $4lllllllllllllllllll
+$3llllllllllllll  $4lllllllllllllllllll
+$3llllllllllllll  $4lllllllllllllllllll
+$3`'ccllllllllll  $4lllllllllllllllllll
+$3       `' \*::  $4:ccllllllllllllllll
+                       ````''*::cll
+                                 ``

pyhw/frontend/logo/ascii/windows_11.pyhw

@@ -0,0 +1,17 @@
+$1/////////////////  $2/////////////////
+$1/////////////////  $2/////////////////
+$1/////////////////  $2/////////////////
+$1/////////////////  $2/////////////////
+$1/////////////////  $2/////////////////
+$1/////////////////  $2/////////////////
+$1/////////////////  $2/////////////////
+$1/////////////////  $2/////////////////
+
+$3/////////////////  $4/////////////////
+$3/////////////////  $4/////////////////
+$3/////////////////  $4/////////////////
+$3/////////////////  $4/////////////////
+$3/////////////////  $4/////////////////
+$3/////////////////  $4/////////////////
+$3/////////////////  $4/////////////////
+$3/////////////////  $4/////////////////

pyhw/frontend/logo/ascii/windows_2025.pyhw

@@ -0,0 +1,17 @@
+$1      ##%%%%%%%%%  $2%%%%%%%%%##
+$1    ###%%%%%%%%%%  $2%%%%%%%%%%###
+$1  ####%%%%%%%%%%%  $2%%%%%%%%%%%####
+$1 ##%%%%%%%%%%%%%%  $2%%%%%%%%%%%%%%##
+$1#%%%%%%%%%%%%%%%%  $2%%%%%%%%%%%%%%%%#
+$1%%%%%%%%%%%%%%%%%  $2%%%%%%%%%%%%%%%%%
+$1%%%%%%%%%%%%%%%%%  $2%%%%%%%%%%%%%%%%%
+$1%%%%%%%%%%%%%%%%%  $2#%%%%%%%%%%%%%%%%
+
+$3%%%%%%%%%%%%%%%%%  $4#%%%%%%%%%%%%%%%%
+$3%%%%%%%%%%%%%%%%%  $4%%%%%%%%%%%%%%%%%
+$3%%%%%%%%%%%%%%%%%  $4%%%%%%%%%%%%%%%%%
+$3%%%%%%%%%%%%%%%%%  $4%%%%%%%%%%%%%%%%#
+$3 ###%%%%%%%%%%%%%  $4%%%%%%%%%%%%%%%##
+$3  ####%%%%%%%%%%%  $4%%%%%%%%%%%#%####
+$3    ##%#%%%%%%%%%  $4%%%%%%%%%%%######
+$3      ##%%%%%%%%%  $4%%%%%%%%%########

pyhw/frontend/logo/ascii/windows_old.pyhw

@@ -0,0 +1,16 @@
+$1        ,.=:!!t3Z3z.,
+       :tt:::tt333EE3
+$1       Et:::ztt33EEEL$2 @Ee.,      ..,
+$1      ;tt:::tt333EE7$2 ;EEEEEEttttt33#
+$1     :Et:::zt333EEQ.$2 $EEEEEttttt33QL
+$1     it::::tt333EEF$2 @EEEEEEttttt33F
+$1    ;3=*^```"*4EEV$2 :EEEEEEttttt33@.
+$3    ,.=::::!t=., $1`$2 @EEEEEEtttz33QF
+$3   ;::::::::zt33)$2   "4EEEtttji3P*
+$3  :t::::::::tt33.$4:Z3z..$2  ``$4 ,..g.
+$3  i::::::::zt33F$4 AEEEtttt::::ztF
+$3 ;:::::::::t33V$4 ;EEEttttt::::t3
+$3 E::::::::zt33L$4 @EEEtttt::::z3F
+$3{3=*^```"*4E3)$4 ;EEEtttt:::::tZ`
+$3             `$4 :EEEEtttt::::z7
+                 "VEzjt:;;z>*`

pyhw/pyhwUtil/pyhwUtil.py

@@ -173,8 +173,10 @@ def createDataStringOld(data: Data):
 
 @dataclass
 class SupportedOS:
-    ColorConfig = ["armbian", "arch", "alpine", "centos", "debian", "fedora", "macOS", "raspbian", "ubuntu", "freebsd"]
-    AsciiLogo = ["armbian", "arch", "alpine", "centos", "debian", "fedora", "macOS", "raspbian", "ubuntu", "freebsd"]
+    ColorConfig = ["armbian", "arch", "alpine", "centos", "debian", "fedora", "macOS", "raspbian", "ubuntu", "freebsd",
+                   "windows_old", "windows_10", "windows_11", "windows_2025"]
+    AsciiLogo = ["armbian", "arch", "alpine", "centos", "debian", "fedora", "macOS", "raspbian", "ubuntu", "freebsd",
+                 "windows_old", "windows_10", "windows_11", "windows_2025"]
 
 
 def selectOSLogo(os_id: str):
@@ -183,8 +185,13 @@ def selectOSLogo(os_id: str):
     :param os_id: str, os id.
     :return: str, logo id.
     """
-    if getOS() == "macos":
+    if getOS() == "macos":  # macOS does not have small logo
         return os_id
+    if getOS() == "windows":    # windows does not have small logo
+        if os_id in SupportedOS.ColorConfig and os_id in SupportedOS.AsciiLogo:
+            return os_id
+        else:
+            return "windows_11"
     if os_id in SupportedOS.ColorConfig and os_id in SupportedOS.AsciiLogo:
         pass
     else:

{pyhw-0.7.4.dist-info → pyhw-0.8.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: pyhw
-Version: 0.7.4
+Version: 0.8.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
@@ -13,21 +13,23 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: pypci-ng>=0.0.10
+Requires-Dist: pypci-ng>=0.1.2
 
 # 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/Python-3.9%2B-green)
 
 ![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/Windows-yellow)
 
 ![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.**
+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, FreeBSD and Windows 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 🤔).
 
@@ -96,6 +98,7 @@ This is due to the fact that system python is not supposed to be managed by pip.
 * macOS arm64, x86_64
 * Linux arm64, x86_64
 * FreeBSD arm64
+* Windows 10 X86_64
 
 ## Add Logo
 1. Create a file named **\<os>.pyhw** in **logo/ascii** folder

{pyhw-0.7.4.dist-info → pyhw-0.8.0.dist-info}/RECORD

@@ -1,73 +1,83 @@
-pyhw/__init__.py,sha256=lBlBxbnftiADKPpC3XRA3jUPjRsVclCd3P95aQ33p_g,22
-pyhw/__main__.py,sha256=A0t0jkcwdTXd6ca7POUfm8krjCn2FQaXTIss5gNmNcI,1775
+pyhw/__init__.py,sha256=27YY3zFpeaDh6JoC40AqkjBrn68SqFlsWZzjZtw5jwU,22
+pyhw/__main__.py,sha256=AYSSricHPScjYNF-LgFHfQUqKcxq8FruDW2a89FAXfA,1795
 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/bsd.py,sha256=Ls97NAsvZGVJj3_fBUcYXjY2gsZvFKhXYtkTHxVVXSs,288
-pyhw/backend/cpu/cpuBase.py,sha256=u9kQORv8RJ9BLjG219wNTgBAivHy_lUll4Bkk6TBlXY,576
+pyhw/backend/cpu/cpuBase.py,sha256=2YAOz1K8VLKtLY7iYBxUV9Ikuf4I4d4YivocvZDrdUU,748
 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/cpu/windows.py,sha256=A3oIvVUVMGPEqiM9QBiK0OwElcEf1LDhNi_23AimooQ,1723
 pyhw/backend/gpu/__init__.py,sha256=EpMjPvUaXt0LTNMvGmB8WgXbUB9keCxuOhu8NT3Re6o,56
 pyhw/backend/gpu/bsd.py,sha256=hNFiCek770CXOh3DK3I3-g272-a1S5D7LolGJBsLXaU,124
-pyhw/backend/gpu/gpuBase.py,sha256=DyY1bVrsaWczkbrrN6J7kG-Kh9yic3Lqww8yLZNCet8,521
+pyhw/backend/gpu/gpuBase.py,sha256=ZPT9o7PhYpzlwign0GsCT519F9DGx-1UEMVVOM8MV_k,748
 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/gpu/windows.py,sha256=Hv-vtWQGKv6_Nxc8raEBq7NNm5TR6xg6x6BK3Aa2uP4,1249
 pyhw/backend/host/__init__.py,sha256=Efaj7-Oya7H8HdpZHQCLrwn-mcfPb-d6yfh4dzsE_7I,58
 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/hostBase.py,sha256=gM49SY6rEaxec_0bUOMk7QlEfR7vjfWp3BXEUqgdncc,762
+pyhw/backend/host/hostInfo.py,sha256=grz15M2t3f_enqQvc7Qn6HlEfYwa66bu2NYvm8VpJ-g,452
 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/host/windows.py,sha256=qn2QiTK2wIijyyw_QKdiSizY3teyS-9RNBu5RxEPRSw,1185
 pyhw/backend/kernel/__init__.py,sha256=fGjwjpOhwA_PnsWbwoq102hwhTay2ufYKaTqxjSV2-I,65
-pyhw/backend/kernel/kernelBase.py,sha256=ZUj5wqar9mLUlIYrTDzyCWjrwzGtP6WJIIAXy5v1zhM,490
-pyhw/backend/kernel/kernelInfo.py,sha256=QQYni0IVeFZ2IVNDC06U728Q01Rq3R6qRDYCxMjtJrY,189
+pyhw/backend/kernel/kernelBase.py,sha256=3ZmkRkvwoWk3R-by2cgBlZnMSQzVjTC8Owmv53Pm4II,539
+pyhw/backend/kernel/kernelInfo.py,sha256=Nkumd0McbimCjc7yJrvz6bcwpWu1Tdo_LKomjZr7Jgk,341
 pyhw/backend/kernel/unix.py,sha256=XDV2GIjamERcmlrQFaKFZY-OJO1xj76Im_7lmg2uFzo,1192
-pyhw/backend/kernel/windows.py,sha256=lxZ7T9Ea0Qbq3pf_TjSAHSM2YTozC6ivv7dKdLOTl3s,58
+pyhw/backend/kernel/windows.py,sha256=RY0Cwwn_eJP4iP43gHLjcQzhwwdU4yc2NGLDajbmtvI,900
 pyhw/backend/memory/__init__.py,sha256=zGBWxfPAAk8ivCBWPLJIpuD-lB7wUJT3x8u2jHiAoCY,65
 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=wl6zN3-U_jRNsaWM9szWPvWjiq3Ca8Rcm-aMRdAJge8,554
+pyhw/backend/memory/memoryBase.py,sha256=trubcJ_7JD_FnrKefUycPFd4OZMFj3Rk75ih5YVsSXg,790
 pyhw/backend/memory/memoryInfo.py,sha256=OQF165uEyuapAsi7cKacQYDRnKdrQHeldfyFwzS9N2g,186
+pyhw/backend/memory/windows.py,sha256=T_yWJCu-joWvXXuaIgnMRGaDtsp-frQD_cx8IFVgdpA,1208
 pyhw/backend/metal/t.py,sha256=52yv-JoXNfaIOfcxEEidIg0MoyFtzWvTRm550kQKPZA,391
 pyhw/backend/nic/__init__.py,sha256=eP4eOYIvMF3LcTf954hJa6TnB8R4Qahss2g-UcgypKY,57
 pyhw/backend/nic/bsd.py,sha256=lIXnPqzSA2qexUt0P9OHMmxoI5c5XBi2V80RY9S0wsM,135
 pyhw/backend/nic/linux.py,sha256=3H91Nw87frzZA4P6Q5GbjHSaI7q4Q5-v6R8BgdvplgQ,1976
 pyhw/backend/nic/macos.py,sha256=63gZjSmUGwGqfs41IWrEXmSz9O8eQy4G5oql3JLZmoo,855
-pyhw/backend/nic/nicBase.py,sha256=cT_rxqIEcvvKFsvjKlkCJ8RIfp7QHxDE9_SImXDae0s,735
+pyhw/backend/nic/nicBase.py,sha256=Kng5qoe7FHcnQaf6S-LUe_HyOaBJe0L1SVstdIQ_WJY,962
 pyhw/backend/nic/nicInfo.py,sha256=wuBuL-aIzD441IUDPGz5e0xctcZ-opdpgqkVxgbvZLg,133
+pyhw/backend/nic/windows.py,sha256=c67JwHARtPxNsZ-0_MVKUfc7DwpsRVn7kiHdx_NyDn8,1297
 pyhw/backend/npu/__init__.py,sha256=PgLKbwpgT5vw9xpa294Zxb94McyxNXW46_vMbT2Iqyc,58
 pyhw/backend/npu/bsd.py,sha256=eKkOWZ4MBybR_KOGGcsWUpzCGgghhvuBy5VNsnEE8cI,134
 pyhw/backend/npu/linux.py,sha256=mXHSYRION3pghwk6_4vgHxjSkNxI68ksGLkFZstR0mc,1192
 pyhw/backend/npu/macos.py,sha256=c-iSmGfBWYeoh7nXuCFmPlVH6bc6sil_yRsAlabl93k,2513
-pyhw/backend/npu/npuBase.py,sha256=qiioBmHDeh2Et1F7lwmNight-2W32C0VmMtx2DIOCz4,523
+pyhw/backend/npu/npuBase.py,sha256=1cVWRmr8g-mDXrJAx2cUO4qWZft2TtT7L2-HzRot2nI,748
 pyhw/backend/npu/npuInfo.py,sha256=82dK6XvW_XKw4O5-RfR4-qQRR7Plh8qqJLj0YDzISmU,135
+pyhw/backend/npu/windows.py,sha256=Z2v5CORSa1ap66k48G7uVLbon3zaoT4ug5sX2_rt6vM,1196
 pyhw/backend/os/__init__.py,sha256=rPHQYdQK3qU6ZwwodqVoEWeqBnKffXlJyi4k3-8ViPY,53
 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=IiyrA5IEtlcaR-xigi8SxD70BimFKCBMjgF0MLihSOk,573
-pyhw/backend/os/osInfo.py,sha256=iLPc7INFHH3izascwooj4JBVgvBsSgVPXWBlFXG47mQ,378
+pyhw/backend/os/osBase.py,sha256=2zaOGhaXLrNJS9-9qR4hH9_uFTgA2Sv4ab7YZvNVFaE,744
+pyhw/backend/os/osInfo.py,sha256=NEr76aicI9N3SFrwi1skcpUEjzsyCryTjdE9X1nBjBM,536
+pyhw/backend/os/windows.py,sha256=WyUhkO9loIqwiZ_ezI6J2JHL4A2xzQAuTzkO1ZOStr4,1149
 pyhw/backend/shell/__init__.py,sha256=SeQ7OLNSl_V1JCCWnJGjLilAWiSe9e5kgsMEt63TMS0,62
-pyhw/backend/shell/shellBase.py,sha256=U4HPg_iWhAqaLceBnEVMHFj4A-FNYu7JjsQyi2seEU4,377
-pyhw/backend/shell/unix.py,sha256=Vt2wSxAIrzN679v0MjJwBoK6L12OqZOichociFZ9lw8,2109
+pyhw/backend/shell/shellBase.py,sha256=829rchiqXfyA-oKT81mkGGoKBjZflM5NHIRs0_ZSwaY,531
+pyhw/backend/shell/shellInfo.py,sha256=pU32_Akg0TDVFprTfPYaOKWcFkijJkm0FOowfILNRKk,184
+pyhw/backend/shell/unix.py,sha256=qTP3Mk8prI2lnQmUJ41G1Fgu1l8nGn9PB3pyBoewtJg,2010
+pyhw/backend/shell/windows.py,sha256=_Ou4QFkS-_K8xMjxw9X3N0t5duZCa3LnMhft_aiPuE0,854
 pyhw/backend/title/__init__.py,sha256=l6_WqreSBeK7krapCrbrr4ndnydrXB1aZ50Ve-beV_w,62
-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/title/titleBase.py,sha256=RVWwtTea8G1MutrN3Ttkjky9wwVtRxnHIsOJKpBbvF8,519
+pyhw/backend/title/titleInfo.py,sha256=lUsbQNx80MLHuSCgMzWhc72mj0ykcRuWngn9wydYSos,166
+pyhw/backend/title/unix.py,sha256=XEjPbnbygxs1qDv79kdaGHFGU_8elW7Q2kvpbYWo0P8,747
+pyhw/backend/title/windows.py,sha256=XcW_M5a31zCo11FylOn0R-J0fQGnWZr8n75YJraJlZM,427
 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=Io-JrFjmRWHgB7uh4mBTV4rnfJuUvepGh2uiKNhUZcc,1293
-pyhw/backend/uptime/uptimeBase.py,sha256=PB0SWpsZyNz5GL5n39rC7DDSpKVAlH2K2eKqOuiEfy0,778
+pyhw/backend/uptime/linux.py,sha256=m9NmnVeQV8ZwRbytQ0gsrkY6UqhuCoMkdc3QQX4v8nI,1033
+pyhw/backend/uptime/macos.py,sha256=sVLmtLgOC7CDBVrfCBKCVApSUmbHEbd6BK3yRgzNzWQ,1299
+pyhw/backend/uptime/uptimeBase.py,sha256=HVRFZHO-2F_UKH0ti9wR16iHCH7Q8dga0HfxFxUEUck,959
 pyhw/backend/uptime/uptimeInfo.py,sha256=TobPEV3MBT3Fiv3W6TOzD3a4MNW-vz2Oi_Trlcihu7k,114
+pyhw/backend/uptime/windows.py,sha256=fRj218K9gx2Ffg8_dEjWyaFrqFl-niiPHvJjwJhfGeM,1744
 pyhw/frontend/__init__.py,sha256=xgv_iVv9w4cLXklbdtFWXu7J7KJxBCUw-ZcUQb_abFc,57
 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=6VADbaM_xwlYF4Ds38xvmRgxVSDWBB71WWDFhiLrQaI,4650
+pyhw/frontend/color/colorConfig.py,sha256=hvpA9R4ajAbqZ0bVq5hOs0PXtTF00ViZ_qXLbBJ1DWU,6225
 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
@@ -85,15 +95,19 @@ pyhw/frontend/logo/ascii/macOS.pyhw,sha256=HBGROtBb7wrNtRqAQ9ND7zxK0l17BRsmpgc2d
 pyhw/frontend/logo/ascii/raspbian.pyhw,sha256=jEl6WMKF-FGx359ipQ1kzweUJS-NuauYQCFaYime4PQ,159
 pyhw/frontend/logo/ascii/ubuntu.pyhw,sha256=l-Q0PfutxXYMwTojqeiM88063x4V0RBkZUHmi6YdsNc,833
 pyhw/frontend/logo/ascii/ubuntu_small.pyhw,sha256=Xf8LSZdZUu9aEG3efhb1FUlUEuJ-3UztcIOJISpKhPw,229
+pyhw/frontend/logo/ascii/windows_10.pyhw,sha256=jv5pzZs_CdOzpeTjyXfXJWcTQwK-J0LNlnyj_sJcuOI,706
+pyhw/frontend/logo/ascii/windows_11.pyhw,sha256=VuQTzbBabaEQhm2JBVhy6Ja6lClUGacQsaiNUih9nhU,656
+pyhw/frontend/logo/ascii/windows_2025.pyhw,sha256=o8eWsiyhNpDoEjiWFiBMfkd-8MdIslGc1Jpm85LU4P8,643
+pyhw/frontend/logo/ascii/windows_old.pyhw,sha256=AMsvWAZ50HM8lweWEmzDWbRNDGkKFJo9qLY_VRKrciY,580
 pyhw/library/lib/iokitGPULib.dylib,sha256=DcJ0GZY79gTFckLFYtZgeKn1T0NFvdO_k_ccCa7od5Y,154808
 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=6aKYh7sEPkqrfevckJO7MGmehGwgu_QVniFjVOw4dYk,6297
+pyhw/pyhwUtil/pyhwUtil.py,sha256=h3XsZFGwzkW75kj853IWVlxwDz8R8A3UR-bxju95aeY,6703
 pyhw/pyhwUtil/sysctlUtil.py,sha256=S-rUvqi7ZrMyMouIhxlyHEQ4agM7sCT1Y7uzs3Hu5-o,841
-pyhw-0.7.4.dist-info/LICENSE,sha256=hJs6RBqSVCexbTsalkMLNFI5t06kekQEsSVaOt_-yLs,1497
-pyhw-0.7.4.dist-info/METADATA,sha256=uRpLICG3Fl7YN7ofwJBnoD38B_D9T2_jE7yxN6Ive7M,5791
-pyhw-0.7.4.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-pyhw-0.7.4.dist-info/entry_points.txt,sha256=q-AB8im_QahpmNrmy4aPTJRGi0LlbNlnI3kF7s6pKss,44
-pyhw-0.7.4.dist-info/top_level.txt,sha256=7Inxvxt1TngEricKZEex9_WJZS3DbKYFUXDz4v5WHYU,5
-pyhw-0.7.4.dist-info/RECORD,,
+pyhw-0.8.0.dist-info/LICENSE,sha256=hJs6RBqSVCexbTsalkMLNFI5t06kekQEsSVaOt_-yLs,1497
+pyhw-0.8.0.dist-info/METADATA,sha256=2jICwuL3kDvCFc1aJN67Hk3YFGHqQSOjpZkyAAYk5c0,5945
+pyhw-0.8.0.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+pyhw-0.8.0.dist-info/entry_points.txt,sha256=q-AB8im_QahpmNrmy4aPTJRGi0LlbNlnI3kF7s6pKss,44
+pyhw-0.8.0.dist-info/top_level.txt,sha256=7Inxvxt1TngEricKZEex9_WJZS3DbKYFUXDz4v5WHYU,5
+pyhw-0.8.0.dist-info/RECORD,,