Update fun.py

fun.py

@@ -27,12 +27,24 @@ PROFILE_BASE = "/tmp/profiles"
 def get_system_usage():
     cpu = subprocess.check_output("top -bn1 | grep 'Cpu(s)'", shell=True).decode().strip()
     mem = subprocess.check_output("free -m | grep Mem", shell=True).decode().strip()
-    cpu = cpu.split(",")[0].split(":")[-1].strip()
+    # 解析CPU信息
+    cpu_parts = cpu.split(":")[1].split(",")
+    cpu_info = {}
+    for part in cpu_parts:
+        value, key = part.strip().split(" ", 1)
+        cpu_info[key.strip()] = value.strip() + "%"
+    # 解析内存信息
     mem_values = mem.split()[1:4]
     mem_total, mem_used, mem_free = mem_values
-    mem = f"Total: {mem_total}MB, Used: {mem_used}MB, Free: {mem_free}MB"
-    logger.info(f"CPU: {cpu}, Memory: {mem}")
-    info = {"CPU": {cpu}, "Memory": {mem}}
+    mem_available = int(mem_total) - int(mem_used)
+    mem_info = {
+        "Total": f"{mem_total}MB",
+        "Used": f"{mem_used}MB",
+        "Free": f"{mem_free}MB",
+        "Available": f"{mem_available}MB"
+    }
+    logger.info(f"CPU: {cpu_info}, Memory: {mem_info}")
+    info = {"CPU": cpu_info, "Memory": mem_info}
     return info