修复了扫描时进度条未结束 时 开始按钮已恢复

Author: hite4044

main_gui.py

@@ -582,6 +582,7 @@ def update_now(self, value: float):
         self.last_update = time()
 
     def finish(self):
+        self.update_now(self._max)
         self.update_progress_text(0)
 
 
@@ -802,6 +803,7 @@ def __init__(self, master: Misc, logger: Logger, server_list: ServerList):
         self.scan_obj = ServerScanner()
         self.callback_lock = Lock()
         self.progress_var = 0
+        self.callback_workers = 0
 
         # 进度条
         self.progress_bar = InfoProgressBar(self, interval=0.05, text="扫描进度: ")

scanner.py

@@ -23,6 +23,8 @@ def __init__(self):
         self.timeout = None
         self.work_queue = Queue()
         self.in_scan = False
+        self.callback_count = 0
+        self.callback_count_lock = Lock()
         self.pause_lock = Lock()  # 暂停锁
         self.worker_count: int = 0  # 线程数
         self.working_worker: int = 0  # 工作中的线程数
@@ -78,7 +80,14 @@ def scan_a_port(self, port: int, callback: Any):
         if raw_info["status"] == "online":
             Thread(target=callback, args=(ServerInfo(raw_info["info"]),)).start()
             return
-        Thread(target=callback, args=(raw_info,)).start()
+        Thread(target=self._callback, args=(raw_info, callback)).start()
+
+    def _callback(self, raw_info, callback: Any):
+        with self.callback_count_lock:
+            self.callback_count += 1
+        callback(raw_info)
+        with self.callback_count_lock:
+            self.callback_count -= 1
 
     def scan_worker(self):
         with self.thread_num_lock:
@@ -108,7 +117,12 @@ def scan_worker(self):
             self.worker_count -= 1
             self.working_worker -= 1
         if self.worker_count <= 0:
-            self.in_scan = False
+            Thread(target=self.check_callback_over_thread, daemon=True).start()
+
+    def check_callback_over_thread(self):
+        while self.callback_count > 0:
+            sleep(0.05)
+        self.in_scan = False
 
 
 class Port: