pmonitor 1.4.3__py3-none-any.whl → 1.4.5__py3-none-any.whl

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.dist-info → pmonitor-1.4.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pmonitor
-Version: 1.4.3
+Version: 1.4.5
 Summary: pc monitor
 Home-page: UNKNOWN
 Author: cfr
@@ -8,6 +8,8 @@ Author-email: 1354592998@qq.com
 License: MIT
 Platform: all
 Requires-Python: >=3.6
+Requires-Dist: PyLibreHardwareMonitor >=1.2.2
+Requires-Dist: psutil >=5.9.8
 
 pc application get monitor
 

{pmonitor-1.4.3.dist-info → pmonitor-1.4.5.dist-info}/RECORD

@@ -3,7 +3,7 @@ monitor/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 monitor/get_process_name.py,sha256=HxePo2gdrTo2Ukg4DTnYzUMdczVWywCeLCXQ-RRWyu8,3913
 monitor/mac_gpu.py,sha256=kQDPMW04lIYPBbJw772Jh1OQxj-D4JNmdjJlP6BuR4w,2320
 monitor/monitor_mac.py,sha256=OoptTTXTZQupzBwgGOfKNjyYAKBxDy-wI3l6T7XVE8s,4651
-monitor/monitor_pids.py,sha256=yvUOIuwMw5stDxOVSY2vu72CzxZzmL6qCYsF9vw3VY8,15580
+monitor/monitor_pids.py,sha256=DftMSexy87lHIiSJoVJDxNQLXcfHpZg4jNwsJRc4hjw,15968
 monitor/monitor_win.py,sha256=xs5nzqqEPoDmJTegh3lQhVjjpPcOWnruWKK65ttqnTo,6161
 monitor/run_monitor.py,sha256=s9JSFu5olh3VhrEqj_CZ5l25nvBtd2cN0NhU9R2KOKM,1581
 monitor/sys_info.py,sha256=aNultuRoQuRYPkYo397xAXVDXP07Qx5JOHtYzNmEvuc,3208
@@ -24,8 +24,8 @@ monitor/DLL/ucrtbased.dll,sha256=vtmKFPEHyr2OXkrUOu3Qs1dlbKG1dxZ8ItKCkTTU5S4,223
 monitor/DLL/vcruntime140.dll,sha256=AsaqDm5iRBGp8ZsDYKeGWrFZCOJgJFEOXDipwINiw1o,119888
 monitor/DLL/vcruntime140_1.dll,sha256=fdmqAuJxxoym1fGNZR0joV1yWXFa9DMmV4993ifzdjc,49640
 monitor/exec/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pmonitor-1.4.3.dist-info/METADATA,sha256=fqc-_49ex8Sv1XfkptmGPMP67m5BT0pt28YhTSV-fJI,215
-pmonitor-1.4.3.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-pmonitor-1.4.3.dist-info/entry_points.txt,sha256=vmlLEANgf2fZar9BeXYiKdF6GMJbVXip-SIZx5yPXDo,55
-pmonitor-1.4.3.dist-info/top_level.txt,sha256=tGkQDkVeyKgP5Rr7acpp0df83NBAnI8up0sGwRxuuQ4,8
-pmonitor-1.4.3.dist-info/RECORD,,
+pmonitor-1.4.5.dist-info/METADATA,sha256=UKe88ai-jAu5uTDtUv0cA4MBGidBlirSmRUdRIJ33Mk,291
+pmonitor-1.4.5.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+pmonitor-1.4.5.dist-info/entry_points.txt,sha256=vmlLEANgf2fZar9BeXYiKdF6GMJbVXip-SIZx5yPXDo,55
+pmonitor-1.4.5.dist-info/top_level.txt,sha256=tGkQDkVeyKgP5Rr7acpp0df83NBAnI8up0sGwRxuuQ4,8
+pmonitor-1.4.5.dist-info/RECORD,,