fix:修复一些BUG
This commit is contained in:
@@ -1,3 +1,5 @@
|
||||
import os
|
||||
import time
|
||||
import tkinter as tk
|
||||
from tkinter import ttk, scrolledtext, messagebox, filedialog
|
||||
import threading
|
||||
@@ -6,6 +8,7 @@ import sys
|
||||
|
||||
from loguru import logger
|
||||
from config.config import load_config
|
||||
from utils.font_utils import install_fonts_from_directory
|
||||
from utils.log_handler import log_queue
|
||||
|
||||
# 导入业务逻辑
|
||||
@@ -20,6 +23,7 @@ from utils.file_utils import export_templates_folder, initialize_project, export
|
||||
|
||||
config = load_config("config.toml")
|
||||
|
||||
|
||||
class ReportApp:
|
||||
def __init__(self, root):
|
||||
self.root = root
|
||||
@@ -30,7 +34,24 @@ class ReportApp:
|
||||
self.stop_event = threading.Event()
|
||||
self.is_running = False
|
||||
|
||||
self._setup_ui()
|
||||
# 尝试初始化 UI
|
||||
try:
|
||||
self._setup_ui()
|
||||
except Exception as e:
|
||||
logger.critical(f"UI 初始化失败: {e}", exc_info=True)
|
||||
messagebox.showerror("致命错误", f"界面初始化失败,请检查日志。\n错误: {e}")
|
||||
self.root.destroy()
|
||||
sys.exit(1)
|
||||
|
||||
# 尝试初始化项目资源
|
||||
try:
|
||||
self.init_project()
|
||||
except Exception as e:
|
||||
logger.critical(f"项目资源初始化失败: {e}", exc_info=True)
|
||||
messagebox.showerror("致命错误", f"项目资源初始化失败,请检查日志。\n错误: {e}")
|
||||
self.root.destroy()
|
||||
sys.exit(1)
|
||||
|
||||
self._start_log_polling()
|
||||
|
||||
def _setup_ui(self):
|
||||
@@ -48,9 +69,21 @@ class ReportApp:
|
||||
ttk.Label(header, text="By 寒寒 | 这里的每一份评语都充满爱意", font=("微软雅黑", 9), foreground="gray").pack()
|
||||
|
||||
# 2. 功能区容器
|
||||
main_content = ttk.Frame(self.root, padding=10)
|
||||
main_content = ttk.Frame(self.root, padding="10 15 10 5")
|
||||
main_content.pack(fill=tk.X)
|
||||
|
||||
# === 进度条区域 ===
|
||||
progress_frame = ttk.Frame(self.root, padding="10 15 10 5")
|
||||
progress_frame.pack(fill=tk.X, pady=(0, 10))
|
||||
|
||||
# 进度条 Label
|
||||
self.progress_label = ttk.Label(progress_frame, text="⛳ 任务进度: 待命", font=("微软雅黑", 10))
|
||||
self.progress_label.pack(fill=tk.X, pady=(0, 2))
|
||||
|
||||
# 进度条
|
||||
self.progressbar = ttk.Progressbar(progress_frame, orient="horizontal", mode="determinate")
|
||||
self.progressbar.pack(fill=tk.X, expand=True)
|
||||
|
||||
# === A组: 核心功能 ===
|
||||
self._create_btn_group(main_content, "🛠️ 核心功能", [
|
||||
("📁 生成图片路径", lambda: self.run_task(generate_template)),
|
||||
@@ -74,9 +107,9 @@ class ReportApp:
|
||||
], columns=3, special_styles={"⛔ 停止当前任务": "Stop.TButton"})
|
||||
|
||||
# 3. 日志区
|
||||
log_frame = ttk.LabelFrame(self.root, text="📝 系统实时日志", padding=10)
|
||||
log_frame = ttk.LabelFrame(self.root, text="📝 系统实时日志", padding="10 15 10 5")
|
||||
log_frame.pack(fill=tk.BOTH, expand=True, padx=10, pady=(0, 10))
|
||||
|
||||
|
||||
self.log_text = scrolledtext.ScrolledText(log_frame, height=10, state="disabled", font=("Consolas", 9))
|
||||
self.log_text.pack(fill=tk.BOTH, expand=True)
|
||||
|
||||
@@ -90,7 +123,7 @@ class ReportApp:
|
||||
btn = ttk.Button(frame, text=text, command=func, style=style)
|
||||
r, c = divmod(i, columns)
|
||||
btn.grid(row=r, column=c, padx=5, pady=5, sticky="ew")
|
||||
|
||||
|
||||
for i in range(columns):
|
||||
frame.columnconfigure(i, weight=1)
|
||||
|
||||
@@ -106,6 +139,15 @@ class ReportApp:
|
||||
break
|
||||
self.root.after(100, self._start_log_polling)
|
||||
|
||||
def init_project(self):
|
||||
# 1. 资源准备
|
||||
if install_fonts_from_directory(config["fonts_dir"]):
|
||||
logger.info("等待系统识别新安装的字体...")
|
||||
time.sleep(2)
|
||||
# 2. 创建输出文件夹
|
||||
os.makedirs(config["output_folder"], exist_ok=True)
|
||||
logger.success("项目初始化完成.....")
|
||||
|
||||
# --- 任务运行核心逻辑 ---
|
||||
def run_task(self, target_func, *args, **kwargs):
|
||||
if self.is_running:
|
||||
@@ -115,6 +157,9 @@ class ReportApp:
|
||||
self.stop_event.clear()
|
||||
self.is_running = True
|
||||
|
||||
# 将进度更新方法作为参数传入
|
||||
kwargs['progress_callback'] = self.update_progress
|
||||
|
||||
def thread_worker():
|
||||
try:
|
||||
# 尝试传入 stop_event
|
||||
@@ -129,7 +174,8 @@ class ReportApp:
|
||||
logger.error(traceback.format_exc())
|
||||
finally:
|
||||
self.is_running = False
|
||||
logger.info("--- 就绪 ---")
|
||||
logger.info("系统准备就绪.....")
|
||||
self.reset_progress() # 重置进度条
|
||||
|
||||
threading.Thread(target=thread_worker, daemon=True).start()
|
||||
|
||||
@@ -158,4 +204,33 @@ class ReportApp:
|
||||
messagebox.showwarning("提示", "请先停止任务")
|
||||
return
|
||||
self.root.destroy()
|
||||
sys.exit()
|
||||
sys.exit()
|
||||
|
||||
# --- 进度条更新(实现线程安全更新) ---
|
||||
def update_progress(self, current, total, task_name="任务"):
|
||||
"""
|
||||
线程安全地更新进度条和标签
|
||||
:param current: 当前完成的项目数
|
||||
:param total: 总项目数
|
||||
:param task_name: 当前任务名称
|
||||
"""
|
||||
if total <= 0:
|
||||
# 重置进度条
|
||||
self.progressbar['value'] = 0
|
||||
self.progress_label.config(text=f"任务进度: {task_name} 完成或待命")
|
||||
return
|
||||
|
||||
percentage = int((current / total) * 100)
|
||||
display_text = f"{task_name}: {current}/{total} ({percentage}%)"
|
||||
|
||||
# 使用 after 确保在主线程中更新 UI
|
||||
self.root.after(0, self._set_progress_ui, percentage, display_text)
|
||||
|
||||
def _set_progress_ui(self, percentage, display_text):
|
||||
"""实际更新 UI 的私有方法"""
|
||||
self.progressbar['value'] = percentage
|
||||
self.progress_label.config(text=display_text)
|
||||
|
||||
def reset_progress(self):
|
||||
"""任务结束后重置进度条"""
|
||||
self.root.after(0, self._set_progress_ui, 0, "任务进度: 就绪")
|
||||
|
||||
Reference in New Issue
Block a user