fix scan

server/app.py

@@ -1,11 +1,12 @@
 import os
+import threading
 from pathlib import Path
 
 from flask import Flask, Response, jsonify, request, send_from_directory
 from flask_cors import CORS
 
 from db_py import count_tests, del_config, get_all_tests, get_config, set_config
-from scanner import full_scan, scan_results_only
+from scanner import full_scan, is_scan_in_progress, resolve_runtime_path, scan_results_only
 from sse_py import broadcast, stream_events
 from watcher import start_watching
 
@@ -43,6 +44,39 @@ def _apply_smb_env_from_config():
             os.environ[env_key] = str(value)
 
 
+def _start_full_scan_background(target_dir, results_dir, results_dir_ref, source_label):
+    def _job():
+        try:
+            full_scan(target_dir, results_dir, results_dir_ref)
+            start_watching(target_dir, results_dir)
+            tests = get_all_tests()
+            completed = len([t for t in tests if t.get("completed")])
+            print(f"[{source_label}] Scan complete -> {len(tests)} tests, {completed} completed")
+        except Exception as exc:
+            print(f"[{source_label}] background fullScan error: {exc}")
+        finally:
+            broadcast({"type": "update"})
+
+    worker = threading.Thread(target=_job, daemon=True)
+    worker.start()
+
+
+def _start_results_scan_background(results_dir, results_dir_ref, source_label):
+    def _job():
+        try:
+            scan_results_only(results_dir, results_dir_ref)
+            tests = get_all_tests()
+            completed = len([t for t in tests if t.get("completed")])
+            print(f"[{source_label}] Results scan complete -> {len(tests)} tests, {completed} completed")
+        except Exception as exc:
+            print(f"[{source_label}] background rescan-results error: {exc}")
+        finally:
+            broadcast({"type": "update"})
+
+    worker = threading.Thread(target=_job, daemon=True)
+    worker.start()
+
+
 @app.get("/api/tests")
 def get_tests_route():
     completed = request.args.get("completed")
@@ -197,6 +231,11 @@ def get_stats_route():
     )
 
 
+@app.get("/api/scan-status")
+def get_scan_status_route():
+    return jsonify({"scanning": is_scan_in_progress()})
+
+
 @app.get("/api/config")
 def get_config_route():
     config = {}
@@ -227,21 +266,17 @@ def set_config_route():
 
     if dirs_changed:
         _apply_smb_env_from_config()
-        target_dir = get_config("target_dir")
-        results_dir = get_config("results_dir")
-        results_dir_ref = get_config("results_dir_ref")
-        try:
-            full_scan(target_dir, results_dir, results_dir_ref)
-            start_watching(target_dir, results_dir)
-        except Exception as exc:
-            print(f"[config] fullScan error: {exc}")
-            return jsonify({"error": f"Scan failed: {exc}"}), 500
+        target_dir = resolve_runtime_path(get_config("target_dir"))
+        results_dir = resolve_runtime_path(get_config("results_dir"))
+        results_dir_ref = resolve_runtime_path(get_config("results_dir_ref"))
+        if not target_dir or not results_dir:
+            return jsonify({"error": "Directories not configured"}), 400
 
-        tests = get_all_tests()
-        completed = len([t for t in tests if t.get("completed")])
-        print(f"[config] Scan complete -> {len(tests)} tests found, {completed} completed")
-        broadcast({"type": "update"})
-        return jsonify({"ok": True, "testCount": len(tests), "completedCount": completed})
+        if is_scan_in_progress():
+            return jsonify({"ok": True, "scanning": True, "testCount": None, "completedCount": None})
+
+        _start_full_scan_background(target_dir, results_dir, results_dir_ref, "config")
+        return jsonify({"ok": True, "scanning": True, "testCount": None, "completedCount": None})
 
     broadcast({"type": "update"})
     return jsonify({"ok": True, "testCount": None, "completedCount": None})
@@ -250,45 +285,32 @@ def set_config_route():
 @app.post("/api/config/rescan")
 def rescan_route():
     _apply_smb_env_from_config()
-    target_dir = get_config("target_dir")
-    results_dir = get_config("results_dir")
-    results_dir_ref = get_config("results_dir_ref")
+    target_dir = resolve_runtime_path(get_config("target_dir"))
+    results_dir = resolve_runtime_path(get_config("results_dir"))
+    results_dir_ref = resolve_runtime_path(get_config("results_dir_ref"))
     if not target_dir or not results_dir:
         return jsonify({"error": "Directories not configured"}), 400
 
-    try:
-        full_scan(target_dir, results_dir, results_dir_ref)
-        start_watching(target_dir, results_dir)
-    except Exception as exc:
-        print(f"[config] rescan error: {exc}")
-        return jsonify({"error": f"Scan failed: {exc}"}), 500
+    if is_scan_in_progress():
+        return jsonify({"ok": True, "scanning": True, "testCount": None, "completedCount": None})
 
-    tests = get_all_tests()
-    completed = len([t for t in tests if t.get("completed")])
-    print(f"[config] Rescan complete -> {len(tests)} tests, {completed} completed")
-    broadcast({"type": "update"})
-    return jsonify({"ok": True, "testCount": len(tests), "completedCount": completed})
+    _start_full_scan_background(target_dir, results_dir, results_dir_ref, "config")
+    return jsonify({"ok": True, "scanning": True, "testCount": None, "completedCount": None})
 
 
 @app.post("/api/config/rescan-results")
 def rescan_results_route():
     _apply_smb_env_from_config()
-    results_dir = get_config("results_dir")
-    results_dir_ref = get_config("results_dir_ref")
+    results_dir = resolve_runtime_path(get_config("results_dir"))
+    results_dir_ref = resolve_runtime_path(get_config("results_dir_ref"))
     if not results_dir:
         return jsonify({"error": "Results directory not configured"}), 400
 
-    try:
-        scan_results_only(results_dir, results_dir_ref)
-    except Exception as exc:
-        print(f"[config] rescan-results error: {exc}")
-        return jsonify({"error": f"Scan failed: {exc}"}), 500
+    if is_scan_in_progress():
+        return jsonify({"ok": True, "scanning": True, "testCount": None, "completedCount": None})
 
-    tests = get_all_tests()
-    completed = len([t for t in tests if t.get("completed")])
-    print(f"[config] Results rescan complete -> {len(tests)} tests, {completed} completed")
-    broadcast({"type": "update"})
-    return jsonify({"ok": True, "testCount": len(tests), "completedCount": completed})
+    _start_results_scan_background(results_dir, results_dir_ref, "config")
+    return jsonify({"ok": True, "scanning": True, "testCount": None, "completedCount": None})
 
 
 @app.get("/api/events")
@@ -314,9 +336,9 @@ def static_or_spa(path=""):
 
 def bootstrap():
     _apply_smb_env_from_config()
-    target_dir = get_config("target_dir")
-    results_dir = get_config("results_dir")
-    results_dir_ref = get_config("results_dir_ref")
+    target_dir = resolve_runtime_path(get_config("target_dir"))
+    results_dir = resolve_runtime_path(get_config("results_dir"))
+    results_dir_ref = resolve_runtime_path(get_config("results_dir_ref"))
 
     if target_dir and results_dir:
         existing = count_tests()