feat: add manual update check button

This commit is contained in:
Your Name committed 2026-06-28 14:22:35 +08:00
1 parent f010853b97
commit 13aa60c06a
5 files changed
+111 -8

No files matched your search

+8
View File
@@ -15,6 +15,14 @@
## [Unreleased]
### Added
- Dashboard 顶部新增“检查更新”按钮,可手动触发在线更新检查。
### Changed
- 自动更新默认启用;未配置更新地址时默认使用官方更新服务器,仍可通过配置或环境变量关闭。
## [V3.3.8] — 2026-06-28
### Fixed
+13 -5
View File
@@ -9,7 +9,7 @@ import shlex
import subprocess
import sys
import zipfile
from dataclasses import dataclass
from dataclasses import dataclass, replace
from pathlib import Path
from typing import Any, Callable
from urllib.parse import urljoin, urlparse
@@ -168,15 +168,13 @@ def load_update_settings() -> UpdateSettings:
).strip()
env_enabled = os.environ.get("DOUYIN_AUTO_UPDATE_ENABLED")
using_default_manifest = False
if not manifest_url and getattr(sys, "frozen", False):
if not manifest_url:
manifest_url = DEFAULT_UPDATE_MANIFEST_URL
using_default_manifest = True
enabled_default = True if using_default_manifest else _to_bool(section.get("enabled"), False)
enabled_default = _to_bool(section.get("enabled"), True)
enabled = _to_bool(env_enabled, default=enabled_default)
if os.environ.get("DOUYIN_DISABLE_AUTO_UPDATE", "").strip() == "1":
enabled = False
if not manifest_url:
enabled = False
default_download_dir = Path(path_config.get_state_dir()) / "updates"
timeout_raw = section.get("timeout_seconds", 20.0)
@@ -199,6 +197,16 @@ def load_update_settings() -> UpdateSettings:
)
def load_manual_update_settings() -> UpdateSettings:
"""Load settings for an explicit user-triggered update check.
The manual button should report errors in the UI instead of exiting the
process through the startup fail-closed path.
"""
settings = load_update_settings()
return replace(settings, enabled=True, fail_closed=False)
def _origin(value: str) -> tuple[str, str, int]:
parsed = urlparse(value)
scheme = (parsed.scheme or "").lower()
+48
View File
@@ -1,6 +1,7 @@
from __future__ import annotations
import os
import threading
import tkinter as tk
from tkinter import messagebox, ttk
@@ -13,6 +14,11 @@ from douyin.license.license_manager import (
require_online_license_or_exit,
start_online_license_monitor,
)
from douyin.updater.force_update import (
UpdateError,
load_manual_update_settings,
perform_forced_update,
)
from gui.components.config_io import save_ui_to_config
from gui.components.config_vars import build_config_vars
from gui.components.mousewheel_guard import disable_spinbox_mousewheel
@@ -113,6 +119,12 @@ class DashboardApp:
tk.Label(title_box, text="轻量数据看板入口", bg=theme.SURFACE, fg=theme.SUBTLE, font=theme.FONT_SMALL).pack(anchor="w")
quick_state = tk.Frame(brand, bg=theme.SURFACE)
quick_state.grid(row=0, column=2, sticky="e")
button(
quick_state,
"检查更新",
self.check_update,
width=124,
).pack(side="right", padx=(8, 0))
tk.Label(
quick_state,
textvariable=self.status_var,
@@ -276,6 +288,7 @@ class DashboardApp:
"wifi_adb": self.open_wifi_adb,
"verify_license": self.verify_license,
"upload_logs": self.upload_logs,
"check_update": self.check_update,
"show_run_log": lambda: self.show_page("运行日志"),
"show_actions_log": lambda: self.show_page("行为日志"),
}
@@ -519,6 +532,41 @@ class DashboardApp:
parent=self.root,
)
def check_update(self) -> None:
if not self._ensure_license_ready():
return
self.status_var.set("正在检查更新")
def worker() -> None:
try:
result = perform_forced_update(settings=load_manual_update_settings())
self.root.after(0, lambda: self._show_update_result(result))
except UpdateError as exc:
self.root.after(0, lambda: self._show_update_error(str(exc)))
except Exception as exc:
self.root.after(0, lambda: self._show_update_error(f"检查更新异常:{exc}"))
threading.Thread(target=worker, daemon=True).start()
def _show_update_result(self, result) -> None:
self.status_var.set(result.message or "更新检查完成")
if result.exit_required:
messagebox.showinfo(
"检查更新",
f"{result.message}\n\n程序会交给更新器处理,请按提示完成更新。",
parent=self.root,
)
try:
self.root.after(300, self.root.destroy)
except Exception:
pass
return
messagebox.showinfo("检查更新", result.message or "已是最新版本。", parent=self.root)
def _show_update_error(self, message: str) -> None:
self.status_var.set(f"检查更新失败:{message}")
messagebox.showerror("检查更新失败", message, parent=self.root)
def refresh_data(self) -> None:
self.data = load_dashboard_data()
self.status_var.set("已刷新")
+1
View File
@@ -28,6 +28,7 @@ BUTTON_ICONS = {
"打开目录": "□",
"验证卡密": "✓",
"上传诊断日志": "⇧",
"检查更新": "↻",
"刷新状态": "⟳",
"保存日志配置": "✓",
"查看大图": "▢",
+41 -3
View File
@@ -18,19 +18,57 @@ def test_compare_versions_handles_v_prefix_and_patch_order():
assert compare_versions("3.3.2", "3.3.3") < 0
def test_load_settings_is_disabled_without_manifest_url(tmp_path, monkeypatch):
def test_load_settings_uses_default_server_without_manifest_url(tmp_path, monkeypatch):
from douyin.core import path_config
from douyin.updater import force_update
from douyin.updater.force_update import load_update_settings
cfg = tmp_path / "config.json"
cfg.write_text(json.dumps({}), encoding="utf-8")
monkeypatch.setattr(path_config, "get_config_path", lambda: str(cfg))
monkeypatch.delenv("DOUYIN_UPDATE_MANIFEST_URL", raising=False)
monkeypatch.delenv("DOUYIN_AUTO_UPDATE_ENABLED", raising=False)
monkeypatch.delenv("DOUYIN_DISABLE_AUTO_UPDATE", raising=False)
settings = load_update_settings()
assert settings.enabled is True
assert settings.manifest_url == force_update.DEFAULT_UPDATE_MANIFEST_URL
assert settings.require_signed_manifest is True
def test_load_settings_can_disable_default_auto_update(tmp_path, monkeypatch):
from douyin.core import path_config
from douyin.updater.force_update import load_update_settings
cfg = tmp_path / "config.json"
cfg.write_text(json.dumps({"auto_update": {"enabled": True}}), encoding="utf-8")
cfg.write_text(json.dumps({"auto_update": {"enabled": False}}), encoding="utf-8")
monkeypatch.setattr(path_config, "get_config_path", lambda: str(cfg))
monkeypatch.delenv("DOUYIN_UPDATE_MANIFEST_URL", raising=False)
monkeypatch.delenv("DOUYIN_AUTO_UPDATE_ENABLED", raising=False)
monkeypatch.delenv("DOUYIN_DISABLE_AUTO_UPDATE", raising=False)
settings = load_update_settings()
assert settings.enabled is False
assert settings.manifest_url == ""
assert settings.manifest_url
def test_manual_update_settings_enable_check_without_fail_closed(tmp_path, monkeypatch):
from douyin.core import path_config
from douyin.updater.force_update import load_manual_update_settings
cfg = tmp_path / "config.json"
cfg.write_text(json.dumps({"auto_update": {"enabled": False}}), encoding="utf-8")
monkeypatch.setattr(path_config, "get_config_path", lambda: str(cfg))
monkeypatch.delenv("DOUYIN_UPDATE_MANIFEST_URL", raising=False)
monkeypatch.delenv("DOUYIN_DISABLE_AUTO_UPDATE", raising=False)
settings = load_manual_update_settings()
assert settings.enabled is True
assert settings.fail_closed is False
assert settings.manifest_url
def test_load_settings_uses_default_server_for_frozen_exe(tmp_path, monkeypatch):