pyhw 0.11.8__tar.gz → 0.11.10__tar.gz

{pyhw-0.11.8/src/pyhw.egg-info → pyhw-0.11.10}/PKG-INFO

@@ -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 → pyhw-0.11.10}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pyhw"
-version = "0.11.8"
+version = "0.11.10"
 description = "PyHw, a neofetch-like command line tool for fetching system information but written mostly in python."
 keywords = ["neofetch", "system information", "command line tool", "python", "hardware information", "fastfetch", "fetching"]
 authors = [
@@ -17,7 +17,7 @@ readme = "README.md"
 license = {text = "BSD-3-Clause"}
 requires-python = ">=3.9"
 dependencies = [
-    "pypci-ng>=0.2.0"
+    "pypci-ng>=0.2.1"
 ]
 classifiers = [
     "Development Status :: 4 - Beta",

pyhw-0.11.10/src/pyhw/__init__.py

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

{pyhw-0.11.8 → pyhw-0.11.10}/src/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-0.11.8 → pyhw-0.11.10}/src/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-0.11.10/src/pyhw/backend/shell/windows.py

@@ -0,0 +1,49 @@
+"""
+    In dev.
+"""
+from ...pyhwException import BackendException
+from .shellInfo import ShellInfo
+import json
+import subprocess
+import os
+
+
+class ShellDetectWindows:
+    def __init__(self):
+        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:
+            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}"

{pyhw-0.11.8 → pyhw-0.11.10/src/pyhw.egg-info}/PKG-INFO

@@ -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.10/src/pyhw.egg-info/requires.txt

@@ -0,0 +1 @@
+pypci-ng>=0.2.1

pyhw-0.11.8/src/pyhw/__init__.py

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

pyhw-0.11.8/src/pyhw/backend/shell/windows.py

@@ -1,29 +0,0 @@
-"""
-    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-0.11.8/src/pyhw.egg-info/requires.txt

@@ -1 +0,0 @@
-pypci-ng>=0.2.0