pyhw 0.15.2__tar.gz → 0.15.3__tar.gz

{pyhw-0.15.2/src/pyhw.egg-info → pyhw-0.15.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyhw
-Version: 0.15.2
+Version: 0.15.3
 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>
@@ -13,7 +13,7 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: pypci-ng>=0.2.7
+Requires-Dist: pypci-ng>=0.3.0
 Dynamic: license-file
 
 # PyHw, a neofetch-like system information fetching tool

{pyhw-0.15.2 → pyhw-0.15.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pyhw"
-version = "0.15.2"
+version = "0.15.3"
 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 = "BSD-3-Clause"
 requires-python = ">=3.9"
 dependencies = [
-    "pypci-ng>=0.2.7"
+    "pypci-ng>=0.3.0"
 ]
 classifiers = [
     "Development Status :: 4 - Beta",

{pyhw-0.15.2 → pyhw-0.15.3}/src/pyhw/__init__.py

@@ -1,2 +1,2 @@
-__version__ = '0.15.2'
+__version__ = '0.15.3'
 __author__ = 'xiaoran007'

{pyhw-0.15.2 → pyhw-0.15.3}/src/pyhw/backend/memory/bsd.py

@@ -12,9 +12,9 @@ class MemoryDetectBSD(MemoryDetectLinux):
 
     def getMemoryInfo(self):
         self.__getMemorySysctl()
-        self._memoryInfo.total = self.__physical_memory / 1024 / 1024  # Convert bytes to MiB
-        self._memoryInfo.used = (self.__physical_memory - self.__free_memory) / 1024 / 1024  # Convert bytes to MiB
-        self._memoryInfo.memory = f"{round(self._memoryInfo.used, 2)} MiB / {round(self._memoryInfo.total, 2)} MiB"
+        self._memoryInfo.total = self.__physical_memory / 1024 / 1024 / 1024  # Convert bytes to GiB
+        self._memoryInfo.used = (self.__physical_memory - self.__free_memory) / 1024 / 1024 / 1024  # Convert bytes to GiB
+        self._memoryInfo.memory = f"{round(self._memoryInfo.used, 2)} GiB / {round(self._memoryInfo.total, 2)} GiB"
         return self._memoryInfo
 
     def __getMemorySysctl(self):

{pyhw-0.15.2 → pyhw-0.15.3}/src/pyhw/backend/memory/linux.py

@@ -7,7 +7,7 @@ class MemoryDetectLinux:
 
     def getMemoryInfo(self):
         self._getMemory()
-        self._memoryInfo.memory = f"{self._memoryInfo.used} MiB / {self._memoryInfo.total} MiB"
+        self._memoryInfo.memory = f"{self._memoryInfo.used} GiB / {self._memoryInfo.total} GiB"
         return self._memoryInfo
 
     def _getMemory(self):
@@ -15,9 +15,9 @@ class MemoryDetectLinux:
             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 / 1024, 2)
                     elif line.startswith("MemAvailable:"):
-                        self._memoryInfo.available = round(float(line.split(":")[1].strip()[:-3]) / 1024, 2)
+                        self._memoryInfo.available = round(float(line.split(":")[1].strip()[:-3]) / 1024 / 1024, 2)
                 self._memoryInfo.used = round(self._memoryInfo.total - self._memoryInfo.available, 2)
         except FileNotFoundError:
             pass

{pyhw-0.15.2 → pyhw-0.15.3}/src/pyhw/backend/memory/macos.py

@@ -19,9 +19,9 @@ class MemoryDetectMacOS:
 
     def getMemoryInfo(self):
         self.__getMemory()
-        self.__memoryInfo.total = self.__mem_total / 1024 / 1024  # Convert bytes to MiB
-        self.__memoryInfo.used = self.__mem_used / 1024 / 1024  # Convert bytes to MiB
-        self.__memoryInfo.memory = f"{round(self.__memoryInfo.used, 2)} MiB / {round(self.__memoryInfo.total, 2)} MiB"
+        self.__memoryInfo.total = self.__mem_total / 1024 / 1024 / 1024  # Convert bytes to GiB
+        self.__memoryInfo.used = self.__mem_used / 1024 / 1024 / 1024  # Convert bytes to GiB
+        self.__memoryInfo.memory = f"{self.__memoryInfo.used:.2f} GiB / {self.__memoryInfo.total:.2f} GiB"
         return self.__memoryInfo
 
     def __getMemory(self):

{pyhw-0.15.2 → pyhw-0.15.3}/src/pyhw/backend/memory/windows.py

@@ -10,7 +10,7 @@ class MemoryDetectWindows:
 
     def getMemoryInfo(self):
         self._getMemory()
-        self._memoryInfo.memory = f"{self._memoryInfo.used} MiB / {self._memoryInfo.total} MiB"
+        self._memoryInfo.memory = f"{self._memoryInfo.used} GiB / {self._memoryInfo.total} GiB"
         return self._memoryInfo
 
     def _getMemory(self):
@@ -21,8 +21,8 @@ class MemoryDetectWindows:
             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
+        free_memory = int(res['FreePhysicalMemory']) / 1024 / 1024
+        total_memory = int(res['TotalVisibleMemorySize']) / 1024 / 1024
         used_memory = total_memory - free_memory
         self._memoryInfo.total = round(total_memory, 2)
         self._memoryInfo.available = round(free_memory, 2)

{pyhw-0.15.2 → pyhw-0.15.3/src/pyhw.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyhw
-Version: 0.15.2
+Version: 0.15.3
 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>
@@ -13,7 +13,7 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: pypci-ng>=0.2.7
+Requires-Dist: pypci-ng>=0.3.0
 Dynamic: license-file
 
 # PyHw, a neofetch-like system information fetching tool

pyhw-0.15.3/src/pyhw.egg-info/requires.txt

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

pyhw-0.15.2/src/pyhw.egg-info/requires.txt

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