feat: 一键优化旁加停止按钮可中断+取消标记 v1.3.6

app.py

@@ -600,8 +600,8 @@ def api_cpu_advise():
                     "level": level, "verdict": verdict, "tips": tips,
                     "top_cpu": [{"name": t.get("name"), "cpu": t.get("cpu"), "pid": t.get("pid")} for t in tops]})
 
-_OPT_JOB = {"running": False, "done": False, "steps": [], "freed": 0,
-            "available": 0, "started": 0}
+_OPT_JOB = {"running": False, "done": False, "cancelled": False, "cancel": False,
+            "steps": [], "freed": 0, "available": 0, "started": 0}
 
 def _optimize_worker():
     job = _OPT_JOB
@@ -615,6 +615,17 @@ def _optimize_worker():
         steps.append("数据落盘(sync)完成")
     except Exception as e:
         steps.append("数据落盘跳过: %s" % e)
+    if job.get("cancel"):
+        job["steps"] = steps + ["已手动停止,后续步骤取消"]
+        job["cancelled"] = True
+        job["done"] = False
+        job["running"] = False
+        job["cancel"] = False
+        try:
+            job["available"] = psutil.virtual_memory().available
+        except Exception:
+            pass
+        return
     try:
         p = os.environ.get("PROCFS_PATH", "/proc")
         with open(os.path.join(p, "sys", "vm", "drop_caches"), "w") as f:
@@ -630,6 +641,7 @@ def _optimize_worker():
     job["freed"] = max(0, after_mem - before_mem)
     job["available"] = after_mem
     job["done"] = True
+    job["cancelled"] = False
     job["running"] = False
 
 @app.route("/api/sys/optimize", methods=["POST"])
@@ -639,11 +651,19 @@ def api_sys_optimize():
     if _OPT_JOB.get("running"):
         return jsonify({"ok": False, "running": True,
                         "msg": "优化正在进行中,请稍候"}), 409
-    _OPT_JOB.update({"running": True, "done": False, "steps": [],
-                     "freed": 0, "available": 0, "started": time.time()})
+    _OPT_JOB.update({"running": True, "done": False, "cancelled": False, "cancel": False,
+                     "steps": [], "freed": 0, "available": 0, "started": time.time()})
     threading.Thread(target=_optimize_worker, daemon=True).start()
     return jsonify({"ok": True, "started": True, "eta": 20})
 
+@app.route("/api/sys/optimize/cancel", methods=["POST"])
+def api_sys_optimize_cancel():
+    """停止优化: 置取消标记,worker 在步骤间隙退出,不阻塞"""
+    if not _OPT_JOB.get("running"):
+        return jsonify({"ok": False, "msg": "当前没有正在进行的优化"})
+    _OPT_JOB["cancel"] = True
+    return jsonify({"ok": True, "msg": "已发送停止信号"})
+
 @app.route("/api/sys/optimize/status")
 def api_sys_optimize_status():
     job = _OPT_JOB
@@ -653,6 +673,7 @@ def api_sys_optimize_status():
         elapsed = 0
     return jsonify({"running": job.get("running", False),
                     "done": job.get("done", False),
+                    "cancelled": job.get("cancelled", False),
                     "steps": job.get("steps", []),
                     "freed": job.get("freed", 0),
                     "available": job.get("available", 0),