Keep dependency installs responsive
This commit is contained in:
@@ -40,6 +40,9 @@ TEXT = {
|
||||
}
|
||||
|
||||
SIDEBAR_ITEMS = ("项目识别", "环境检测", "工具路径", "数据库", "部署任务", "运行日志")
|
||||
UI_QUEUE_BATCH_SIZE = 500
|
||||
MAX_LOG_LINES = 5000
|
||||
TRIM_LOG_LINES_TO = 4000
|
||||
|
||||
|
||||
def database_name_from_sql_files(sql_files: list[Path]) -> str:
|
||||
@@ -647,79 +650,107 @@ class DeployWorkbench(tk.Tk):
|
||||
self.result_text.insert(tk.END, value)
|
||||
|
||||
def _append_log(self, value: str) -> None:
|
||||
self._append_logs([value])
|
||||
|
||||
def _append_logs(self, values: list[str]) -> None:
|
||||
values = [value for value in values if value]
|
||||
if not values:
|
||||
return
|
||||
self.log_text.configure(state=tk.NORMAL)
|
||||
self.log_text.insert(tk.END, value + "\n")
|
||||
self.log_text.insert(tk.END, "\n".join(values) + "\n")
|
||||
try:
|
||||
line_count = int(self.log_text.index("end-1c").split(".", 1)[0])
|
||||
if line_count > MAX_LOG_LINES:
|
||||
delete_to = line_count - TRIM_LOG_LINES_TO + 1
|
||||
self.log_text.delete("1.0", f"{delete_to}.0")
|
||||
except (AttributeError, tk.TclError, ValueError):
|
||||
pass
|
||||
self.log_text.see(tk.END)
|
||||
|
||||
def _thread_log(self, value: str) -> None:
|
||||
self.ui_queue.put(("log", value))
|
||||
|
||||
def _drain_queue(self) -> None:
|
||||
while True:
|
||||
events: list[tuple[str, object]] = []
|
||||
for _ in range(UI_QUEUE_BATCH_SIZE):
|
||||
try:
|
||||
event, payload = self.ui_queue.get_nowait()
|
||||
events.append(self.ui_queue.get_nowait())
|
||||
except queue.Empty:
|
||||
break
|
||||
if event == "env":
|
||||
self._render_environment(payload) # type: ignore[arg-type]
|
||||
elif event == "log":
|
||||
self._append_log(str(payload))
|
||||
elif event == "deploy_done":
|
||||
self._set_deployment_running(False)
|
||||
self._append_log(f"部署任务结束,退出码: {payload}")
|
||||
elif event == "install_done":
|
||||
tool_name, exit_code = payload # type: ignore[misc]
|
||||
self._append_log(f"{tool_name} 安装命令结束,退出码: {exit_code}")
|
||||
self.check_environment_async()
|
||||
self.after(1800, lambda name=tool_name: self._prompt_add_tool_after_install(name))
|
||||
elif event == "maven_install_done":
|
||||
executable, error = payload # type: ignore[misc]
|
||||
if error:
|
||||
self._append_log(f"Maven 安装失败: {error}")
|
||||
messagebox.showerror("Maven 安装失败", str(error))
|
||||
continue
|
||||
self.tool_path_vars["Maven"].set(str(executable))
|
||||
self.save_tool_path_settings(silent=True)
|
||||
self._append_log(f"Maven 路径已保存: {executable}")
|
||||
self.check_environment_async()
|
||||
self.after(1800, lambda: self._prompt_add_tool_after_install("Maven"))
|
||||
elif event == "tomcat_install_done":
|
||||
executable, error = payload # type: ignore[misc]
|
||||
if error:
|
||||
self._append_log(f"Tomcat 安装失败: {error}")
|
||||
messagebox.showerror("Tomcat 安装失败", str(error))
|
||||
continue
|
||||
self.tool_path_vars["Tomcat"].set(str(executable))
|
||||
self.save_tool_path_settings(silent=True)
|
||||
self._append_log(f"Tomcat 路径已保存: {executable}")
|
||||
self.check_environment_async()
|
||||
self.after(1800, lambda: self._prompt_add_tool_after_install("Tomcat"))
|
||||
elif event == "mysql_install_done":
|
||||
executable, error = payload # type: ignore[misc]
|
||||
if error:
|
||||
self._append_log(f"MySQL 安装或配置失败: {error}")
|
||||
messagebox.showerror("MySQL 安装或配置失败", str(error))
|
||||
continue
|
||||
self.tool_path_vars["MySQL"].set(str(executable))
|
||||
self.save_tool_path_settings(silent=True)
|
||||
self.mysql_password.set(MYSQL_ROOT_PASSWORD)
|
||||
self._append_log(f"MySQL 路径已保存: {executable}")
|
||||
self.check_environment_async()
|
||||
self.after(1800, lambda: self._prompt_add_tool_after_install("MySQL"))
|
||||
elif event == "node_install_done":
|
||||
node, npm, version, error = payload # type: ignore[misc]
|
||||
if error:
|
||||
self._append_log(f"Node.js 安装失败: {error}")
|
||||
messagebox.showerror("Node.js 安装失败", str(error))
|
||||
continue
|
||||
self.tool_path_vars["Node.js"].set(str(node))
|
||||
self.tool_path_vars["npm"].set(str(npm))
|
||||
self.save_tool_path_settings(silent=True)
|
||||
self._append_log(f"Node.js {version} 路径已保存: {node}")
|
||||
self._append_log(f"npm 路径已保存: {npm}")
|
||||
self.check_environment_async()
|
||||
self.after(1800, lambda: self._prompt_add_tool_after_install("Node.js"))
|
||||
self.after(120, self._drain_queue)
|
||||
|
||||
pending_logs: list[str] = []
|
||||
for event, payload in events:
|
||||
if event == "log":
|
||||
pending_logs.append(str(payload))
|
||||
continue
|
||||
if pending_logs:
|
||||
self._append_logs(pending_logs)
|
||||
pending_logs.clear()
|
||||
self._handle_ui_event(event, payload)
|
||||
if pending_logs:
|
||||
self._append_logs(pending_logs)
|
||||
|
||||
delay = 20 if len(events) == UI_QUEUE_BATCH_SIZE else 120
|
||||
self.after(delay, self._drain_queue)
|
||||
|
||||
def _handle_ui_event(self, event: str, payload: object) -> None:
|
||||
if event == "env":
|
||||
self._render_environment(payload) # type: ignore[arg-type]
|
||||
elif event == "deploy_done":
|
||||
self._set_deployment_running(False)
|
||||
self._append_log(f"部署任务结束,退出码: {payload}")
|
||||
elif event == "install_done":
|
||||
tool_name, exit_code = payload # type: ignore[misc]
|
||||
self._append_log(f"{tool_name} 安装命令结束,退出码: {exit_code}")
|
||||
self.check_environment_async()
|
||||
self.after(1800, lambda name=tool_name: self._prompt_add_tool_after_install(name))
|
||||
elif event == "maven_install_done":
|
||||
executable, error = payload # type: ignore[misc]
|
||||
if error:
|
||||
self._append_log(f"Maven 安装失败: {error}")
|
||||
messagebox.showerror("Maven 安装失败", str(error))
|
||||
return
|
||||
self.tool_path_vars["Maven"].set(str(executable))
|
||||
self.save_tool_path_settings(silent=True)
|
||||
self._append_log(f"Maven 路径已保存: {executable}")
|
||||
self.check_environment_async()
|
||||
self.after(1800, lambda: self._prompt_add_tool_after_install("Maven"))
|
||||
elif event == "tomcat_install_done":
|
||||
executable, error = payload # type: ignore[misc]
|
||||
if error:
|
||||
self._append_log(f"Tomcat 安装失败: {error}")
|
||||
messagebox.showerror("Tomcat 安装失败", str(error))
|
||||
return
|
||||
self.tool_path_vars["Tomcat"].set(str(executable))
|
||||
self.save_tool_path_settings(silent=True)
|
||||
self._append_log(f"Tomcat 路径已保存: {executable}")
|
||||
self.check_environment_async()
|
||||
self.after(1800, lambda: self._prompt_add_tool_after_install("Tomcat"))
|
||||
elif event == "mysql_install_done":
|
||||
executable, error = payload # type: ignore[misc]
|
||||
if error:
|
||||
self._append_log(f"MySQL 安装或配置失败: {error}")
|
||||
messagebox.showerror("MySQL 安装或配置失败", str(error))
|
||||
return
|
||||
self.tool_path_vars["MySQL"].set(str(executable))
|
||||
self.save_tool_path_settings(silent=True)
|
||||
self.mysql_password.set(MYSQL_ROOT_PASSWORD)
|
||||
self._append_log(f"MySQL 路径已保存: {executable}")
|
||||
self.check_environment_async()
|
||||
self.after(1800, lambda: self._prompt_add_tool_after_install("MySQL"))
|
||||
elif event == "node_install_done":
|
||||
node, npm, version, error = payload # type: ignore[misc]
|
||||
if error:
|
||||
self._append_log(f"Node.js 安装失败: {error}")
|
||||
messagebox.showerror("Node.js 安装失败", str(error))
|
||||
return
|
||||
self.tool_path_vars["Node.js"].set(str(node))
|
||||
self.tool_path_vars["npm"].set(str(npm))
|
||||
self.save_tool_path_settings(silent=True)
|
||||
self._append_log(f"Node.js {version} 路径已保存: {node}")
|
||||
self._append_log(f"npm 路径已保存: {npm}")
|
||||
self.check_environment_async()
|
||||
self.after(1800, lambda: self._prompt_add_tool_after_install("Node.js"))
|
||||
|
||||
def _prompt_add_tool_after_install(self, tool_name: str) -> None:
|
||||
result = self._find_environment_result(tool_name)
|
||||
|
||||
Reference in New Issue
Block a user