Skip to content

armgit / peach

Public Imported from GitHub
0

Peach: Local-first video metadata scraper and media manager.

test(desktop): 验证已发布制品的原位覆盖升级

longmeidao425fbdd8240b
diff --git a/.github/workflows/upgrade-smoke.yml b/.github/workflows/upgrade-smoke.yml
new file mode 100644
index 000000000..f0b7ee46a
--- /dev/null
+++ b/.github/workflows/upgrade-smoke.yml
@@ -0,0 +1,58 @@
+name: Windows 覆盖升级验收
+
+on:
+ workflow_dispatch:
+ inputs:
+ from_version:
+ description: 已发布的起始版本
+ required: true
+ default: '0.39.0'
+ to_version:
+ description: 已发布的目标版本
+ required: true
+ default: '0.40.1'
+ to_commit:
+ description: 目标制品的完整构建提交
+ required: true
+ default: '6e5e8b48d0bfe5203c9af998792ce9c31c02542b'
+
+permissions:
+ contents: read
+
+jobs:
+ overlay:
+ name: ${{ matrix.kind }} / ${{ matrix.data_location }} 原位覆盖
+ runs-on: windows-latest
+ strategy:
+ fail-fast: false
+ matrix:
+ kind: [zip, installer]
+ data_location: [default, explicit]
+ env:
+ PYTHONUTF8: '1'
+ PYTHONIOENCODING: utf-8
+ steps:
+ - uses: actions/checkout@v7
+ - uses: actions/setup-python@v7
+ with:
+ python-version: '3.14'
+ - name: 下载正式制品并验证覆盖升级
+ env:
+ GH_TOKEN: ${{ github.token }}
+ FROM_VERSION: ${{ inputs.from_version }}
+ TO_VERSION: ${{ inputs.to_version }}
+ TO_COMMIT: ${{ inputs.to_commit }}
+ PACKAGE_KIND: ${{ matrix.kind }}
+ DATA_LOCATION: ${{ matrix.data_location }}
+ shell: pwsh
+ run: |
+ python -X utf8 scripts/smoke_overlay_upgrade.py --from-version "$env:FROM_VERSION" --to-version "$env:TO_VERSION" --to-commit "$env:TO_COMMIT" --kind "$env:PACKAGE_KIND" --data-location "$env:DATA_LOCATION" --apply 2>&1 | Tee-Object -FilePath overlay.log
+ if ($LASTEXITCODE -ne 0) { throw '覆盖升级验收失败' }
+ - name: 保留验收结果与失败日志
+ if: always()
+ uses: actions/upload-artifact@v7
+ with:
+ name: overlay-${{ matrix.kind }}-${{ matrix.data_location }}
+ path: |
+ overlay.log
+ smoke-evidence/
diff --git a/docs/REUSE.md b/docs/REUSE.md
index bc26ad606..358c0018a 100644
--- a/docs/REUSE.md
+++ b/docs/REUSE.md
@@ -189,6 +189,7 @@ OneJAV、Free JAV Torrent 只给种子链接。这类条目经索引器同源的
- Web 复用 Fieldset、Progress、confirmModal;状态由 `standalone-update.json` 保存。下载按字节计量,解压按文件数计量,替换使用阶段进度;服务重启期间保留等待状态,恢复连接后核对版本。
- 新版有待应用迁移时,重启安装复用 `migrate upgrade --yes`,先保存 SQLite 备份;迁移或启动失败时恢复数据库与程序。数据库备份位于用户数据根的 `state/update-backups/`。
- 更新事务按当前配置读取 state 与账本路径,助手显式继承所选数据根。已有数据目录恢复复用严格配置解析与位置记录,只接受含配置和账本的目录。`scripts/smoke_desktop.py` 验证恢复及再次启动;`scripts/smoke_online_update.py` 使用真实 Release 包和临时馆藏验证在线更新,可注入无法启动的暂存 EXE 验证回滚。
+- 覆盖升级验收复用 `smoke_desktop` 的首启配置、临时数据根、登录和进程退出;`scripts/smoke_overlay_upgrade.py` 使用标准库下载并校验已发布制品,分别走 ZIP 原位解压和 Inno Setup 原位安装。安装包只在没有 Peach 安装登记的 Actions runner 上验收,覆盖安装器停止旧进程、目录记忆、配置与密码保留、账本哨兵、普通启动及卸载保留数据;不新增依赖。
JAV 默认封面(官方封面/预览图)与视频默认大小(大图/小图)独立保存,用 localStorage、共享 Switch 与既有 `/cover`、`/poster`。设置弹窗同步首页与 JAV 的版式,筛选条可单独调当前视图。`frontend/src/jav-artwork.ts` 管作品身份、偏好恢复与缺图回退,首页、接着看、实体作品、详情推荐、Mix 静止与翻图、播放队列共用封面选择。小图展示完整封套,竖版正封完整放入大图卡片;新作封面完成取景才显示,缓存图插入时重算取景。
diff --git a/docs/TESTING.md b/docs/TESTING.md
index 5a6c98957..ec01c825b 100644
--- a/docs/TESTING.md
+++ b/docs/TESTING.md
@@ -2,6 +2,8 @@
这份文档讲三件事:依赖怎么装、怎么升级;改完代码要跑哪些测试、CI 怎么分;新测试该写成什么样。
+Windows 发布制品的覆盖升级在 Actions 的「Windows 覆盖升级验收」手动执行:填写已发布的起始版本、目标版本及目标制品的完整构建提交。工作流分别验证 ZIP 原位解压和安装包原位安装,每种路径覆盖默认数据目录与 `PEACH_DATA_ROOT` 指定目录,并上传日志。它使用已发布制品,不重新构建或发布;在线更新和失败回滚仍由 `scripts/smoke_online_update.py` 单独验证。
+
## 环境与锁文件
依赖由 uv 按锁文件精确复现。源码安装用 `uv sync --locked`。开发、测试和构建在隔离工作树里建自己的 `.venv`,工作树不碰正在服务的环境;主检出的依赖同步与迁移由重启流程负责,见 [运行与配置](OPERATIONS.md) 的「刷新源码运行态」一节(ADR-0091)。
diff --git a/scripts/smoke_overlay_upgrade.py b/scripts/smoke_overlay_upgrade.py
new file mode 100644
index 000000000..519b5f48d
--- /dev/null
+++ b/scripts/smoke_overlay_upgrade.py
@@ -0,0 +1,201 @@
+"""用已发布 Windows 制品验证 ZIP 与安装包原位覆盖升级。"""
+from __future__ import annotations
+
+import argparse
+from contextlib import closing
+import hashlib
+import http.cookiejar
+import json
+import os
+from pathlib import Path
+import socket
+import sqlite3
+import subprocess
+import urllib.parse
+import urllib.request
+import zipfile
+
+from smoke_desktop import (artifact_processes, assert_requires_login, complete_first_run,
+ smoke_directory, smoke_environment, stop_tray, wait_for, wait_health)
+
+
+APP_KEY = r"Software\Microsoft\Windows\CurrentVersion\Uninstall\{02D9748A-78F6-4866-AC75-918177194DAB}_is1"
+
+
+def installation() -> dict | None:
+ import winreg
+ try:
+ with winreg.OpenKey(winreg.HKEY_CURRENT_USER, APP_KEY) as key:
+ return {name: winreg.QueryValueEx(key, name)[0]
+ for name in ("DisplayVersion", "Inno Setup: App Path")}
+ except FileNotFoundError:
+ return None
+
+
+def menu_path() -> Path:
+ return Path(os.environ["APPDATA"]) / "Microsoft/Windows/Start Menu/Programs/Peach.lnk"
+
+
+def download(opener, root: Path, version: str, kind: str) -> Path:
+ request = urllib.request.Request(
+ f"https://api.github.com/repos/peach-mitao/peach/releases/tags/v{version}")
+ if token := os.environ.get("GH_TOKEN"):
+ request.add_header("Authorization", f"Bearer {token}")
+ with opener.open(request, timeout=30) as response:
+ release = json.load(response)
+ suffix = ".zip" if kind == "zip" else "-setup.exe"
+ name = f"Peach-{version}-windows-x64{suffix}"
+ asset = next(asset for asset in release["assets"] if asset["name"] == name)
+ target = root / name
+ with opener.open(asset["browser_download_url"], timeout=60) as response, target.open("wb") as output:
+ while chunk := response.read(256 * 1024):
+ output.write(chunk)
+ with target.open("rb") as source:
+ digest = "sha256:" + hashlib.file_digest(source, "sha256").hexdigest()
+ assert digest == asset["digest"], f"制品 SHA-256 不符:{name}"
+ print(json.dumps({"phase": "download", "asset": name, "digest": digest}), flush=True)
+ return target
+
+
+def install(package: Path, destination: Path, environment: dict, log: Path, *, reuse: bool = False):
+ command = [str(package), "/VERYSILENT", "/SUPPRESSMSGBOXES", "/NORESTART", f"/LOG={log}"]
+ if not reuse:
+ command.append(f"/DIR={destination}")
+ subprocess.run(command, env=environment, timeout=300, check=True)
+
+
+def verify(opener, base: str, data: Path, media: Path, original: dict, password: str,
+ version: str, commit: str, log: Path):
+ health = wait_health(opener, base, None, log)
+ assert health["configured"] and health["version"] == version, health
+ if commit:
+ assert health["build_commit"] == commit, health
+ for relative, content in original.items():
+ assert (data / relative).read_bytes() == content, f"文件未保留:{relative}"
+ with closing(sqlite3.connect(data / "database/ledger.db")) as connection:
+ assert connection.execute("SELECT value FROM overlay_upgrade_fixture").fetchall() == [("retained",)]
+ assert (media / "retained.txt").read_text(encoding="utf-8") == "保留媒体目录"
+ assert_requires_login(opener, base)
+ login = urllib.request.Request(base + "/login",
+ data=urllib.parse.urlencode({"token": password, "days": "0"}).encode(), headers={"Origin": base})
+ with opener.open(login, timeout=10) as response:
+ assert response.status == 200
+ with opener.open(base + "/api/items", timeout=10) as response:
+ assert response.status == 200
+ with opener.open(base + "/healthz?ready=1", timeout=10) as response:
+ assert json.load(response)["ready"]
+ return health
+
+
+def uninstall_and_verify(application: Path, data: Path, media: Path, original: dict, environment: dict):
+ """卸载覆盖后的程序,核对程序登记清除且用户数据仍可读取。"""
+ subprocess.run([str(application / "unins000.exe"), "/VERYSILENT", "/SUPPRESSMSGBOXES", "/NORESTART"],
+ env=environment, timeout=120, check=True)
+ wait_for(lambda: not application.exists(), "卸载程序目录", timeout=120)
+ assert installation() is None and not menu_path().exists()
+ for relative, content in original.items():
+ assert (data / relative).read_bytes() == content
+ with closing(sqlite3.connect(data / "database/ledger.db")) as connection:
+ assert connection.execute("SELECT value FROM overlay_upgrade_fixture").fetchone() == ("retained",)
+ assert (media / "retained.txt").is_file()
+ print(json.dumps({"ok": True, "phase": "uninstall-keeps-data"}), flush=True)
+
+
+def main() -> int:
+ parser = argparse.ArgumentParser(description=__doc__)
+ parser.add_argument("--from-version", required=True)
+ parser.add_argument("--to-version", required=True)
+ parser.add_argument("--to-commit", required=True)
+ parser.add_argument("--kind", choices=("zip", "installer"), required=True)
+ parser.add_argument("--data-location", choices=("default", "explicit"), default="default")
+ parser.add_argument("--apply", action="store_true")
+ parser.add_argument("--evidence-dir", type=Path, default=Path("smoke-evidence"))
+ args = parser.parse_args()
+ if not args.apply:
+ print(json.dumps({"from": args.from_version, "to": args.to_version, "kind": args.kind, "apply": False}))
+ return 0
+ assert os.name == "nt", "覆盖升级验收需要 Windows"
+ if args.kind == "installer":
+ assert os.environ.get("GITHUB_ACTIONS") == "true", "安装包验收只允许在干净的 Actions runner 上运行"
+ assert installation() is None and not menu_path().exists(), "已有 Peach 安装登记或快捷方式,停止验收"
+ cookies = http.cookiejar.CookieJar()
+ opener = urllib.request.build_opener(urllib.request.ProxyHandler({}), urllib.request.HTTPCookieProcessor(cookies))
+ with smoke_directory(args.evidence_dir.resolve()) as root:
+ old = download(opener, root, args.from_version, args.kind)
+ new = download(opener, root, args.to_version, args.kind)
+ application = root / "中文 空格程序目录" / "Peach"
+ executable = application / "Peach.exe"
+ data = (root / "local-app-data/Peach/peach-data" if args.data_location == "default"
+ else root / "selected-data")
+ media = root / "media"
+ media.mkdir()
+ (media / "retained.txt").write_text("保留媒体目录", encoding="utf-8")
+ environment = smoke_environment(data)
+ environment["LOCALAPPDATA"] = str(root / "local-app-data")
+ installer_environment = dict(environment)
+ if args.data_location == "default":
+ environment.pop("PEACH_DATA_ROOT")
+ if args.kind == "zip":
+ with zipfile.ZipFile(old) as archive:
+ archive.extractall(application.parent)
+ else:
+ install(old, application, installer_environment, root / "install-old.log")
+ assert installation()["DisplayVersion"] == args.from_version
+ with socket.socket() as reservation:
+ reservation.bind(("127.0.0.1", 0))
+ port = reservation.getsockname()[1]
+ base, password = f"http://127.0.0.1:{port}", "overlay-smoke-password"
+ log_path = root / "runtime.log"
+ with log_path.open("wb") as log:
+ setup = subprocess.Popen([str(executable), "serve", "--setup", "--host", "127.0.0.1",
+ "--port", str(port), "--no-mdns", "--no-ledger-sync"], cwd=root, env=environment,
+ stdout=log, stderr=log)
+ try:
+ assert wait_health(opener, base, setup, log_path)["version"] == args.from_version
+ complete_first_run(opener, base, media, port, password)
+ finally:
+ setup.terminate()
+ setup.wait(timeout=15)
+ with closing(sqlite3.connect(data / "database/ledger.db")) as connection, connection:
+ connection.execute("CREATE TABLE overlay_upgrade_fixture(value TEXT)")
+ connection.execute("INSERT INTO overlay_upgrade_fixture VALUES ('retained')")
+ original = {relative: (data / relative).read_bytes()
+ for relative in ("config.toml", "secrets/access.json")}
+ launcher = subprocess.Popen([str(executable), "--silent"], cwd=root, env=environment,
+ stdout=log, stderr=log)
+ try:
+ verify(opener, base, data, media, original, password, args.from_version, "", log_path)
+ if args.kind == "installer":
+ # 让安装器停止正在运行的旧版,并通过登记记住的目录原位安装。
+ install(new, application, installer_environment, root / "install-new.log", reuse=True)
+ launcher.wait(timeout=15)
+ wait_for(lambda: not artifact_processes(executable), "安装器停止旧版全部进程", timeout=20)
+ registered = installation()
+ assert registered["DisplayVersion"] == args.to_version, registered
+ assert Path(registered["Inno Setup: App Path"]).resolve() == application, registered
+ assert menu_path().is_file()
+ else:
+ stop_tray(executable, root, environment, log, launcher)
+ # 模拟用户将完整 ZIP 解压到原程序目录,保留旧目录中的额外文件。
+ with zipfile.ZipFile(new) as archive:
+ archive.extractall(application.parent)
+ cookies.clear()
+ launcher = subprocess.Popen([str(executable), "--silent"], cwd=root, env=environment,
+ stdout=log, stderr=log)
+ health = verify(opener, base, data, media, original, password,
+ args.to_version, args.to_commit, log_path)
+ print(json.dumps({"ok": True, "phase": "overlay", "kind": args.kind,
+ "data_location": args.data_location,
+ "version": health["version"], "build_commit": health["build_commit"],
+ "checks": ["config", "password", "ledger", "media", "data-root", "login", "ready", "items"]}), flush=True)
+ finally:
+ stop_tray(executable, root, environment, log, launcher)
+ if args.kind == "installer":
+ uninstall_and_verify(application, data, media, original, installer_environment)
+ print(json.dumps({"ok": True, "phase": "complete", "kind": args.kind,
+ "data_location": args.data_location}), flush=True)
+ return 0
+
+
+if __name__ == "__main__":
+ raise SystemExit(main())