pmonitor 1.5.0__py3-none-any.whl → 1.5.1__py3-none-any.whl

monitor/monitor_mac_vmmap.py

@@ -34,21 +34,21 @@ class VmMapMemory:
     def _convert_to_mb(self, mem_str):
         """
         将内存字符串转换为 MB
-        支持格式: 123, 123K, 123M, 123G
+        支持格式: 123, 123K, 123M, 123G, 12G+, 12G-
         """
         # 移除逗号（如果存在）
         mem_str = mem_str.replace(',', '')
 
         # 检查单位并转换
         if 'G' in mem_str:
-            return float(mem_str.replace('G', '')) * 1024
+            return float(mem_str.replace('G', '').rstrip('+-')) * 1024
         elif 'M' in mem_str:
-            return float(mem_str.replace('M', ''))
+            return float(mem_str.replace('M', '').rstrip('+-'))
         elif 'K' in mem_str:
-            return float(mem_str.replace('K', '')) / 1024
+            return float(mem_str.replace('K', '').rstrip('+-')) / 1024
         else:
             # 假设为字节
-            return float(mem_str) / (1024 * 1024)
+            return float(mem_str.rstrip('+-')) / (1024 * 1024)
 
     def _monitor_memory(self):
         """线程函数：实时监控内存使用"""
@@ -73,7 +73,7 @@ class VmMapMemory:
                     break
 
                 # 匹配 PID 和内存行 (例如: "12345  123.4M")
-                match = re.match(r'^\s*(\d+)\s+([\d,.]+[KMG]?)\s*$', line.strip())
+                match = re.match(r'^\s*(\d+)\s+([\d,.]+[KMG][+-]?)\s*$', line.strip())
                 if match:
                     pid = match.group(1)
                     mem_str = match.group(2)

{pmonitor-1.5.0.dist-info → pmonitor-1.5.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pmonitor
-Version: 1.5.0
+Version: 1.5.1
 Summary: pc monitor
 Home-page: UNKNOWN
 Author: cfr

{pmonitor-1.5.0.dist-info → pmonitor-1.5.1.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_mac_vmmap.py,sha256=j_4Gl6uTnOcjbrYVsYfd_TNhhYo0ewUZf-zCpGUeEgs,3751
+monitor/monitor_mac_vmmap.py,sha256=2ZLhig5ymY6XU7bZGnHM9VIK-d5DAqWOFItIfv7KDPE,3819
 monitor/monitor_pids.py,sha256=kIy8oHIN-OwSDqWHTEUlCFpqCdsvGWmX9gtU0cb0W40,17228
 monitor/monitor_win.py,sha256=xs5nzqqEPoDmJTegh3lQhVjjpPcOWnruWKK65ttqnTo,6161
 monitor/run_monitor.py,sha256=HDQXHIx47ZRN4Gp0PTr0yWKVM28n8A7-NaO--_pdgso,1577
@@ -24,8 +24,8 @@ monitor/DLL/sechost.dll,sha256=1mXCrgNDRBiZ2XZk7eTpDm4oPG-x9BW4uYUVkrfvBkk,69986
 monitor/DLL/ucrtbased.dll,sha256=vtmKFPEHyr2OXkrUOu3Qs1dlbKG1dxZ8ItKCkTTU5S4,2238056
 monitor/DLL/vcruntime140.dll,sha256=AsaqDm5iRBGp8ZsDYKeGWrFZCOJgJFEOXDipwINiw1o,119888
 monitor/DLL/vcruntime140_1.dll,sha256=fdmqAuJxxoym1fGNZR0joV1yWXFa9DMmV4993ifzdjc,49640
-pmonitor-1.5.0.dist-info/METADATA,sha256=BAZnw0kdkSDw4V3MrOBTuSW2Oc090dVpMWOLfNj2Xco,291
-pmonitor-1.5.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-pmonitor-1.5.0.dist-info/entry_points.txt,sha256=vmlLEANgf2fZar9BeXYiKdF6GMJbVXip-SIZx5yPXDo,55
-pmonitor-1.5.0.dist-info/top_level.txt,sha256=tGkQDkVeyKgP5Rr7acpp0df83NBAnI8up0sGwRxuuQ4,8
-pmonitor-1.5.0.dist-info/RECORD,,
+pmonitor-1.5.1.dist-info/METADATA,sha256=0rOJ_53nLLmDwB9iy9rttIwYzAtr_rgSHRgE-cyYkYA,291
+pmonitor-1.5.1.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+pmonitor-1.5.1.dist-info/entry_points.txt,sha256=vmlLEANgf2fZar9BeXYiKdF6GMJbVXip-SIZx5yPXDo,55
+pmonitor-1.5.1.dist-info/top_level.txt,sha256=tGkQDkVeyKgP5Rr7acpp0df83NBAnI8up0sGwRxuuQ4,8
+pmonitor-1.5.1.dist-info/RECORD,,