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

pyhw/backend/os/windows.py

@@ -0,0 +1,43 @@
+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()
+        if display != "":
+            self._osInfo.prettyName = f"{system} {release} {display} ({edition}) {machine}"
+        else:
+            self._osInfo.prettyName = f"{system} {release} ({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:
+            try:
+                key = winreg.OpenKey(winreg.HKEY_LOCAL_MACHINE, r"SOFTWARE\Microsoft\Windows NT\CurrentVersion")
+                release_id, _ = winreg.QueryValueEx(key, "ReleaseId")
+                winreg.CloseKey(key)
+                return str(release_id)
+            except:
+                return ""

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

@@ -25,7 +25,7 @@ def getOS():
 def getArch():
     """
     Get the machine architecture.
-    :return: str, value in [x86_64, x86, aarch64, arm32].
+    :return: str, value in [x86_64, x86, aarch64, arm32, riscv64].
     """
     arch = platform.machine()
     if arch == "x86_64" or arch == "AMD64" or arch == "amd64":
@@ -36,6 +36,8 @@ def getArch():
         return "aarch64"
     elif arch.find("arm") != -1:
         return "arm32"
+    elif arch == "riscv64":
+        return "riscv64"
     else:
         return "unknown"
 
@@ -173,8 +175,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 +187,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.9.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: pyhw
-Version: 0.7.4
+Version: 0.9.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,24 @@ 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)
+![Static Badge](https://img.shields.io/badge/riscv64-%238A2BE2)
 
 
-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 🤔).
 
@@ -94,8 +97,9 @@ This is due to the fact that system python is not supposed to be managed by pip.
 
 ## Tested OS
 * macOS arm64, x86_64
-* Linux arm64, x86_64
+* Linux arm64, x86_64, riscv64
 * FreeBSD arm64
+* Windows 10 X86_64
 
 ## Add Logo
 1. Create a file named **\<os>.pyhw** in **logo/ascii** folder