pmonitor 1.4.3__tar.gz → 1.4.5__tar.gz

{pmonitor-1.4.3 → pmonitor-1.4.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.2
 Name: pmonitor
-Version: 1.4.3
+Version: 1.4.5
 Summary: pc monitor
 Home-page: UNKNOWN
 Author: cfr

{pmonitor-1.4.3 → pmonitor-1.4.5}/monitor/monitor_pids.py

@@ -7,6 +7,7 @@ import asyncio
 import platform
 import ctypes
 import os
+from PyLibreHardwareMonitor.computer import Computer
 
 if platform.system() != 'Windows':
     from monitor.mac_gpu import get_gpu_memory
@@ -103,7 +104,6 @@ class PidsPerf:
     def get_win_perf(self):
         from monitor.WinPidUtil import PidWinPerformance, FILETIME
         from ctypes import CDLL, c_int, c_char_p, byref
-        from PyLibreHardwareMonitor.computer import Computer
         pidWinPerf = PidWinPerformance()
         system_time_pre = pidWinPerf.filetime_to_100nano_seconds(FILETIME())
         p_pid = self.processUtil.find_main_process_pid(self.process_name)
@@ -250,9 +250,14 @@ class PidsPerf:
                           'gpu_System': round(minor_gpu_system_sum, 2),
                           'gpu_Committed': round(minor_gpu_committed_sum, 2),
                           'gpu_Usage': round(minor_gpu_percent_sum, 2)}
-            gpu_data = {'gpu memory usage': small_data['GPU Memory Used'],
-                        'gpu memory total': small_data['GPU Memory Total'],
-                        'gpu memory free': small_data['GPU Memory Free']}
+            if 'GPU Memory Used' in small_data:
+                gpu_data = {'gpu memory usage': round(small_data['GPU Memory Used'], 2),
+                            'gpu memory total': round(small_data['GPU Memory Total'], 2),
+                            'gpu memory free': round(small_data['GPU Memory Free'], 2)}
+            else:
+                gpu_data = {'gpu memory usage': round(small_data['D3D Shared Memory Used'], 2),
+                            'gpu memory total': round(small_data['D3D Shared Memory Total'], 2),
+                            'gpu memory free': round(small_data['D3D Shared Memory Free'], 2)}
             try:
                 data = {'main': main_data, 'other': other_data, 'disk': disk_data,
                         'gpu': gpu_data,

{pmonitor-1.4.3 → pmonitor-1.4.5}/pmonitor.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.2
 Name: pmonitor
-Version: 1.4.3
+Version: 1.4.5
 Summary: pc monitor
 Home-page: UNKNOWN
 Author: cfr

{pmonitor-1.4.3 → pmonitor-1.4.5}/pmonitor.egg-info/SOURCES.txt

@@ -31,4 +31,5 @@ pmonitor.egg-info/PKG-INFO
 pmonitor.egg-info/SOURCES.txt
 pmonitor.egg-info/dependency_links.txt
 pmonitor.egg-info/entry_points.txt
+pmonitor.egg-info/requires.txt
 pmonitor.egg-info/top_level.txt

pmonitor-1.4.5/pmonitor.egg-info/requires.txt

@@ -0,0 +1,2 @@
+PyLibreHardwareMonitor>=1.2.2
+psutil>=5.9.8

{pmonitor-1.4.3 → pmonitor-1.4.5}/setup.py

@@ -5,12 +5,15 @@ with open('README.md', 'r') as f:
     long_description = f.read()
 
 setup(name='pmonitor',
-      version='1.4.3',
+      version='1.4.5',
       description='pc monitor',
       long_description=long_description,
       author='cfr',
       author_email='1354592998@qq.com',
-      install_requires=[],
+      install_requires=[
+            'PyLibreHardwareMonitor>=1.2.2',
+            'psutil>=5.9.8'
+      ],
       license='MIT',
       packages=find_packages(),
       package_data={