pyhw 0.11.8__py3-none-any.whl → 0.11.10__py3-none-any.whl

pyhw/__init__.py

@@ -1 +1,2 @@
-__version__ = '0.11.8'
+__version__ = '0.11.10'
+__author__ = 'xiaoran007'

pyhw/backend/host/linux.py

@@ -32,7 +32,7 @@ class HostDetectLinux:
                             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."):
+                        if version.startswith("To be filled by O.E.M.") or product_name.startswith("Default string"):
                             self._hostInfo.version = ""
                         else:
                             self._hostInfo.version = version

pyhw/backend/shell/shellInfo.py

@@ -4,6 +4,9 @@ from dataclasses import dataclass
 @dataclass
 class ShellInfo:
     def __init__(self):
+        """
+        ShellInfo class. Attribute info is required.
+        """
         self.shell = ""
         self.version = ""
         self.path = ""

pyhw/backend/shell/windows.py

@@ -5,6 +5,7 @@ from ...pyhwException import BackendException
 from .shellInfo import ShellInfo
 import json
 import subprocess
+import os
 
 
 class ShellDetectWindows:
@@ -12,6 +13,27 @@ class ShellDetectWindows:
         self.__shellInfo = ShellInfo()
 
     def getShellInfo(self):
+        if not self.__getShellBash():
+            self.__getShellPowerShell()
+        self.__shellInfo.info = self.__shellInfo.shell + " " + self.__shellInfo.version
+        return self.__shellInfo
+
+    def __getShellBash(self) -> bool:
+        try:
+            shell_env = os.getenv("SHELL", "")
+            if "bash" in shell_env:
+                self.__shellInfo.shell = "bash"
+                self.__shellInfo.path = shell_env
+                result = subprocess.run(["bash", "-c", "echo $BASH_VERSION"], capture_output=True, text=True)
+                self.__shellInfo.version = result.stdout.strip().split("(")[0]
+                self.__shellInfo.info = self.__shellInfo.shell + " " + self.__shellInfo.version
+                return True
+            else:
+                return False
+        except:
+            return False
+
+    def __getShellPowerShell(self):
         COMMAND = "$PSVersionTable.PSVersion | ConvertTo-JSON"
 
         try:
@@ -25,5 +47,3 @@ class ShellDetectWindows:
 
         self.__shellInfo.shell = "PowerShell"
         self.__shellInfo.version = f"{major}.{minor}"
-        self.__shellInfo.info = f"PowerShell {major}.{minor}"
-        return self.__shellInfo

{pyhw-0.11.8.dist-info → pyhw-0.11.10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: pyhw
-Version: 0.11.8
+Version: 0.11.10
 Summary: PyHw, a neofetch-like command line tool for fetching system information but written mostly in python.
 Author: Xiao Ran
 Maintainer-email: Xiao Ran <xiaoran.007@icloud.com>
@@ -14,7 +14,7 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: pypci-ng>=0.2.0
+Requires-Dist: pypci-ng>=0.2.1
 
 # PyHw
 [![Downloads](https://static.pepy.tech/badge/pyhw)](https://pepy.tech/project/pyhw)

{pyhw-0.11.8.dist-info → pyhw-0.11.10.dist-info}/RECORD

@@ -1,4 +1,4 @@
-pyhw/__init__.py,sha256=jcnaRLOloebxPmJzoiCEcFULMJYe9S5i13qB67zUiC8,23
+pyhw/__init__.py,sha256=51EhxNmqRbY7RGnf2x4Cq6QrC2M2HrqJJRwsZUMmn8I,50
 pyhw/__main__.py,sha256=oZpFtvSyYTM8cMsulvi51zJV0gtmw3OCQVdgoaHbtxc,4977
 pyhw/backend/__init__.py,sha256=knn_3Yroow1h0dqdrozk3zyy3vz-kQyNBRjR6OLmVoY,50
 pyhw/backend/backendBase.py,sha256=mloo8mPEbgbIdmyQ3I4vdEXMSSjxWi_wnwACmzvHbEo,506
@@ -20,7 +20,7 @@ pyhw/backend/host/__init__.py,sha256=Efaj7-Oya7H8HdpZHQCLrwn-mcfPb-d6yfh4dzsE_7I
 pyhw/backend/host/bsd.py,sha256=9gKnM6yysHBKwS3EQvb0pCeylh3dzHvoEuPe14zo9wQ,382
 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=B7H8p37_BYvfhyq8g-zqKQbsIcO2kjeKBGwrJWY3tsY,2880
+pyhw/backend/host/linux.py,sha256=aU-tWTI2Wjg1HCx2lGFenoaiM94axutXmL7Auu8ilhM,2925
 pyhw/backend/host/macos.py,sha256=KW-EJK9g1xHNrFsVxJv5GPLpc_ZevX0Zv1WjZUzRkzo,15369
 pyhw/backend/host/windows.py,sha256=qn2QiTK2wIijyyw_QKdiSizY3teyS-9RNBu5RxEPRSw,1185
 pyhw/backend/kernel/__init__.py,sha256=fGjwjpOhwA_PnsWbwoq102hwhTay2ufYKaTqxjSV2-I,65
@@ -59,9 +59,9 @@ pyhw/backend/os/osInfo.py,sha256=NEr76aicI9N3SFrwi1skcpUEjzsyCryTjdE9X1nBjBM,536
 pyhw/backend/os/windows.py,sha256=xjU8NaQwcLusuRw6J7RwwwJiGSv5H_LRBvg2LYEyvNg,1514
 pyhw/backend/shell/__init__.py,sha256=SeQ7OLNSl_V1JCCWnJGjLilAWiSe9e5kgsMEt63TMS0,62
 pyhw/backend/shell/shellBase.py,sha256=829rchiqXfyA-oKT81mkGGoKBjZflM5NHIRs0_ZSwaY,531
-pyhw/backend/shell/shellInfo.py,sha256=pU32_Akg0TDVFprTfPYaOKWcFkijJkm0FOowfILNRKk,184
+pyhw/backend/shell/shellInfo.py,sha256=8Z2geV-2agtpKQl1OJ58cdiEiyVsCbC59AL3MgYnY_E,261
 pyhw/backend/shell/unix.py,sha256=qTP3Mk8prI2lnQmUJ41G1Fgu1l8nGn9PB3pyBoewtJg,2010
-pyhw/backend/shell/windows.py,sha256=_Ou4QFkS-_K8xMjxw9X3N0t5duZCa3LnMhft_aiPuE0,854
+pyhw/backend/shell/windows.py,sha256=FT8m7pijSw0vtAEtES25ulFCmEyziNor4B7o9q1E-Q8,1639
 pyhw/backend/title/__init__.py,sha256=l6_WqreSBeK7krapCrbrr4ndnydrXB1aZ50Ve-beV_w,62
 pyhw/backend/title/titleBase.py,sha256=RVWwtTea8G1MutrN3Ttkjky9wwVtRxnHIsOJKpBbvF8,519
 pyhw/backend/title/titleInfo.py,sha256=lUsbQNx80MLHuSCgMzWhc72mj0ykcRuWngn9wydYSos,166
@@ -111,9 +111,9 @@ pyhw/pyhwUtil/__init__.py,sha256=34ygvVBBqfJ_9OMzHToCcV_BVahixNsa_Z5yh6VsaPQ,304
 pyhw/pyhwUtil/cliUtil.py,sha256=42Gdi9wTg5XOYuEvGHEgOaZJ6dJk1qSuHIprR8pCA-g,2344
 pyhw/pyhwUtil/pyhwUtil.py,sha256=RokrE7X99pkS0LtN4wyJS_ZQmjtMwiNxA7MwXMoO96c,7664
 pyhw/pyhwUtil/sysctlUtil.py,sha256=S-rUvqi7ZrMyMouIhxlyHEQ4agM7sCT1Y7uzs3Hu5-o,841
-pyhw-0.11.8.dist-info/LICENSE,sha256=hJs6RBqSVCexbTsalkMLNFI5t06kekQEsSVaOt_-yLs,1497
-pyhw-0.11.8.dist-info/METADATA,sha256=EEeAejM_nQmGqONkUoDhJXCY1rD9OE4L3tbqOVv3cIE,6753
-pyhw-0.11.8.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-pyhw-0.11.8.dist-info/entry_points.txt,sha256=q-AB8im_QahpmNrmy4aPTJRGi0LlbNlnI3kF7s6pKss,44
-pyhw-0.11.8.dist-info/top_level.txt,sha256=7Inxvxt1TngEricKZEex9_WJZS3DbKYFUXDz4v5WHYU,5
-pyhw-0.11.8.dist-info/RECORD,,
+pyhw-0.11.10.dist-info/LICENSE,sha256=hJs6RBqSVCexbTsalkMLNFI5t06kekQEsSVaOt_-yLs,1497
+pyhw-0.11.10.dist-info/METADATA,sha256=nYeHe8DmO9ZjgNcUzearCGdJCDz_3xOEFoofWWzjXq8,6754
+pyhw-0.11.10.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
+pyhw-0.11.10.dist-info/entry_points.txt,sha256=q-AB8im_QahpmNrmy4aPTJRGi0LlbNlnI3kF7s6pKss,44
+pyhw-0.11.10.dist-info/top_level.txt,sha256=7Inxvxt1TngEricKZEex9_WJZS3DbKYFUXDz4v5WHYU,5
+pyhw-0.11.10.dist-info/RECORD,,

{pyhw-0.11.8.dist-info → pyhw-0.11.10.dist-info}/WHEEL

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