Compare commits

...
17 Commits
Author SHA1 Message Date
Morris 3c74effb4c release: 1.1.1 发布清单与签名(Windows 双架构) 2026-11-19 18:22:05 +08:00
Morris f03046bffd release: 1.1.1 版本号 2026-11-19 18:19:35 +08:00
Morris 2cd18b4e5f Merge pull request 'fix: 修复模型检测/自动下载与启动器更新' (#25) from fix/model-source-and-updater into main
Reviewed-on: Morris/GC#25
2026-11-19 05:48:49 +00:00
Morris 023e9468db fix: 修复模型检测/自动下载与启动器更新
- ModelSourceClient: 自托管 Gitea 源(git.xhmcl.com)ArchiveCandidates 之前
  直接 yield break,只能靠系统 git clone。没装 git 的机器「检测模型/下载/
  自动更新」全部失效。补上 archive/<branch>.zip 归档地址(已实测可用),
  下载经 ResumableDownloader 完成,无需系统 git。fake-git 实测 5/5 模型可检测。
- LauncherUpdater.HashZipPayloadAsync: 只找 GC.dll/GC/GC*.dll,但产物自 1.0.10
  起是 GCL-<版本>-<平台> 单文件,找不到主程序 -> sha256 无法比对 -> 不提示更新。
  改为优先匹配 GCL- 主程序(排除 GC-UI/GC-SAVEDOG/.GC),兼容旧 GC 命名。
  实测已从「无法比对 sha256」变为能算出远端包 sha256。
- version.json / model/version.json: 5 个模型的 manifestSha256 与仓库实际模型
  json 不符(发布时 updatedAt 漂移导致),使模型自动更新每次因校验失败被丢弃
  (「没有自动下载」)。按当前模型 json 实际 sha256 修正并重新签名(gc-2026-12),
  两份清单保持一致;launcher 包 sha256/size 与版本号不动。
2026-11-19 13:17:22 +08:00
Morris 5e5d84856a Merge pull request 'perf: 前端页面拆分 + 模型下载断点续传' (#24) from fix/build-consistency-and-tests into main
Reviewed-on: Morris/GC#24
2026-11-19 04:37:16 +00:00
Morris b4724d7ca0 perf: 前端页面拆分 + 模型下载断点续传
- pages.dart 按职责拆成 pages/{home,download,settings,about}.dart 四个文件,
  pages.dart 保留为聚合 export,调用方 import 路径不变;flutter analyze
  No issues,flutter test 8+3 项全过
- 新增 ResumableDownloader:HTTP Range 断点续传,.part 文件用 URL 哈希做
  稳定命名,服务器不支持 Range 时自动退化为整段下载
- ModelSourceClient 源码 zip 下载改走断点续传,中断后重试从断点接着下
- 下载并发槽 2 -> 4(更新服务已是 6)
2026-11-19 06:59:06 +08:00
Morris 9a911089bf Merge pull request 'fix: 发布一致性校验、日志轮转与构建脚本对齐' (#23) from fix/build-consistency-and-tests into main
Reviewed-on: Morris/GC#23
2026-11-18 22:46:00 +00:00
Morris 4bdfb49600 refactor(build): 末次签名去重、删死代码、zip 可复现
构建脚本对齐与清理(追加到发布校验 PR):
- 完整 build 只在打包末尾签一次清单(stamp_versions --no-sign +
  pack_launcher 末尾 stamp_launcher_only),去掉中间冗余签名。
  ECDSA 随机 nonce + signedAt 时间戳会让每次签名字节都不同,
  两次签名既浪费又让中间产物反复抖动;单独 stamp/models 工具签名行为不变。
- 删除死代码 publish_backend()(后端已进程内托管,无调用者)。
- 所有 zip 命令加 -X(去掉 extra fields),让相同内容的包字节一致。
- 修复 tools.sh 的 dist 命令文件名过滤 GC-*.zip -> GCL-*.zip。
- PowerShell 版同步上述末次签名改动。
2026-11-19 00:19:27 +08:00
Morris 59a66c8fa8 fix: 发布一致性校验、日志轮转与构建脚本对齐
- 新增发布校验脚本(buildsh/lib/verify_release.py + release.sh),核对 tag/清单/资产
  三者的 sha256 与体积,并复验清单签名;接入 ./build.sh release-verify 与
  .gitea/workflows/release-verify.yml(手动触发)
- GcLog 改为常驻 StreamWriter + 按天轮转 + 14 天/64MB 保留策略,避免高峰期反复
  开关文件句柄;只清理本模块生成的 gc-*.log,不碰用户文件
- 修复 Applier 验签逻辑:无效签名永远拒绝,仅「未签名」在调用方不强制时放行
- 新增应用器测试(GC.Savedog.Tests):整目录替换、.GC/bin 合并、启动失败回滚、
  路径穿越防护、验签;接入 pr-check.yml
- GC.Tests 增加日志用例(写入/轮转/清理/用户文件保护)
- 同步 PowerShell 打包脚本与 buildsh 一致:GCL 命名、单顶层目录、守护进程收进
  .GC/bin、启动器与守护进程压缩单文件、不预置 .GC、prune/strip 对齐、签名
  keyId 改为 gc-2026-12、新增 release-verify 与应用器测试任务
2026-11-19 00:05:16 +08:00
xhgit a5fcaeb658 Merge pull request '1.1.0:版本号同步,关于页补 Git 服务与感谢(itxiaohui)' (#19) from sync/1.1.0-about into main
Reviewed-on: Morris/GC#19
2026-11-18 15:13:00 +00:00
Morris fcaacf3b33 1.1.0:版本号同步,关于页补 Git 服务与感谢
- version.json / model/version.json 升到 1.1.0,写入新包 sha256 与体积并重签(gc-2026-12)
- pubspec.yaml 版本 1.0.0+1 -> 1.1.0+1,Windows 前端 exe 的版本资源跟着走
- 关于页新增「Git 服务」一行(itxiaohui)与「感谢」卡片:
  地理洪老师(学科内容)、itxiaohui(Git 服务与部署),中英双语文案
- 开发者列表把早期账号 xhgit 归并到 itxiaohui,避免同一个人的两个名字
- Avalonia 回退界面同步这两处(Git 服务行 + 感谢项)
2026-11-18 22:51:09 +08:00
xhgit 0997de514e Merge pull request 'release: 1.1.0 版本号' (#18) from release/1.1.0 into main 2026-11-18 14:33:45 +00:00
lead 192f2a63e9 1.1.0:界面重做与 DPI 修复的正式版本号
Directory.Build.props 的 Version 从 1.0.11 提到 1.1.0,启动器程序集版本 / 关于页 / version.json 的 launcher.version 都跟着走。
2026-11-18 22:33:24 +08:00
xhgit a1a14f106b Merge pull request 'feat(ui): 重做启动器界面并修复 DPI 发糊' (#17) from feat/ui-crisp-dpi into main
Reviewed-on: Morris/GC#17
2026-11-18 14:18:00 +00:00
lead e67cc63998 feat(ui): 重做启动器界面并修复 DPI 发糊
- 交叉编译补嵌 runner.exe.manifest:GNUn res 不再丢掉 DPI 声明,缩放屏不再位图拉伸
- main.cpp 建窗前自行声明 Per-Monitor V2 DPI 感知(三级回退)
- win32_window 初始窗口按显示器工作区上限收缩,避免 150% 缩放后超出屏幕
- 重做主题:中性石墨底 + 高对比正文、统一字号/间距/圆角令牌、Segoe UI + 雅黑字体栈
- 首页/下载/设置/关于四页重排,宽屏自适应、小窗不溢出
- 修复下拉框字体丢失、封面遮罩盖住占位、任务状态未翻译等问题
- 截图脚本:注入 CJK/图标字体、runAsync 取像素、补小窗回归用例
2026-11-18 22:15:54 +08:00
Morris 2ba4789c95 Merge pull request 'macOS:守护进程收进 .app/Contents/MacOS/.GC/bin' (#16) from release/1.0.11-singlefile into main
Reviewed-on: Morris/GC#16
2026-11-18 13:50:30 +00:00
Morris 22baa6fda9 macOS 的 .GC/bin 也随包分发:守护进程不再落在 .app 根
- pack_launcher 的 macOS 分支把包内 GC-SAVEDOG 移进 .app/Contents/MacOS/.GC/bin,
  与 Windows 布局一致;.GC 位置不变,仍在启动器同级
- package_mac_app 的注释同步:包里只保留 .GC/bin,模板类目录仍由首次启动创建
- README 补 macOS 的 .GC 位置与守护进程路径
2026-11-18 21:10:43 +08:00
49 changed files with 4973 additions and 2348 deletions

No files matched your search

+4 -1
View File
@@ -57,9 +57,12 @@ jobs:
with:
dotnet-version: '8.0.x'
- name: 运行 GC.Tests(含离屏渲染 / 清单校验)
- name: 运行 GC.Tests(含离屏渲染 / 清单校验 / 日志用例)
run: dotnet run --project GC/src/test/dotnet/GC.Tests/GC.Tests.csproj -c Release
- name: 运行应用器测试(整目录替换 / .GC/bin 合并 / 回滚)
run: dotnet run --project GC/src/test/dotnet/GC.Savedog.Tests/GC.Savedog.Tests.csproj -c Release
frontend:
name: 前端检查(Flutter)
runs-on: ubuntu-latest
+50
View File
@@ -0,0 +1,50 @@
# ---------------------------------------------------------------------------
# 发布一致性核对(Gitea Actions)
#
# 触发:仅手动。发布前跑一次确认「tag / 清单 / 资产」互相对得上,发布后再跑一次
# 确认线上资产就是清单里那两份。
#
# 为什么不用 pull_request 触发:这里要下载几百 MB 的发布包,PR 阶段跑太贵;
# 需要时点 Run workflow 即可,本地也有等价命令:./build.sh release-verify <tag>
# ---------------------------------------------------------------------------
name: 发布核对
on:
workflow_dispatch:
inputs:
tag:
description: '要核对的 tag(如 1.1.0)'
required: true
skip_download:
description: '只比对体积、不下载校验 sha256(快,输入 1 开启)'
required: false
default: ''
env:
DOTNET_NOLOGO: '1'
DOTNET_CLI_TELEMETRY_OPTOUT: '1'
jobs:
verify:
name: 核对 Release 与清单
runs-on: ubuntu-latest
steps:
- name: 检出代码
uses: actions/checkout@v4
- name: 安装 .NET 8
uses: actions/setup-dotnet@v4
with:
dotnet-version: '8.0.x'
- name: 核对
env:
GC_GITEA_TOKEN: ${{ secrets.GC_GITEA_TOKEN }}
run: |
set -eu
EXTRA=""
if [ -n "${{ github.event.inputs.skip_download }}" ]; then
EXTRA="--skip-download"
fi
chmod +x buildsh/lib/verify_release.py
./build.sh release-verify "${{ github.event.inputs.tag }}" $EXTRA
+1 -1
View File
@@ -22,7 +22,7 @@
-->
<AvaloniaVersion>11.3.9</AvaloniaVersion>
<MvvmVersion>8.2.2</MvvmVersion>
<Version>1.0.11</Version>
<Version>1.1.1</Version>
<Company>Morris</Company>
<Product>GC</Product>
<NeutralLanguage>zh-Hans</NeutralLanguage>
+4 -2
View File
@@ -56,12 +56,14 @@ public sealed partial class DownloadJob : ObservableObject, IDownloadJob
partial void OnErrorChanged(string? value) => RefreshText();
}
/// <summary>下载中心:最多 2 个并发,任务在「后台列表」里折叠展示。</summary>
/// <summary>下载中心:最多 4 个并发,任务在「后台列表」里折叠展示。</summary>
public sealed class DownloadCenter : IDownloadCenter
{
private readonly ModelRepository _repository;
private readonly AppPaths _paths;
private readonly SemaphoreSlim _slots = new(2);
// 断点续传后单任务失败重来的代价小了很多,可以适当提高并发;
// 更新服务那边已是 6,模型下载保持 4,兼顾弱网吞吐与源站压力。
private readonly SemaphoreSlim _slots = new(4);
public ObservableCollection<IDownloadJob> Jobs { get; } = new();
public event Action? Installed;
+20 -2
View File
@@ -194,8 +194,26 @@ public static class LauncherUpdater
{
using var ms = new MemoryStream(zip);
using var archive = new System.IO.Compression.ZipArchive(ms, System.IO.Compression.ZipArchiveMode.Read);
// 找主程序:app 内的可执行文件 / GC.dll / 单文件 exe
var entry = archive.Entries.FirstOrDefault(e =>
// 发布包从 1.0.10 起改为 GCL 命名 + 单文件 + 单顶层目录,主程序是
// <顶层>/GCL-<版本>-<平台>.exe (Windows)
// <顶层>/GCL-<版本>-<平台> (Linux,无扩展名)
// <顶层>/GCL-<版本>-mac-arm64.app/... (macOS)
// 旧布局则是 GC.dll / GC / GC*.dll。先找新名,再退回旧名,兼容老发布包。
// 注意排除 GC-UI / GC-SAVEDOG / .GC/bin 里的附属程序,它们不是启动器本体。
bool IsLauncher(System.IO.Compression.ZipArchiveEntry e)
{
var n = e.Name;
if (n.Length == 0) return false; // 目录条目
if (n.StartsWith("GC-UI", StringComparison.OrdinalIgnoreCase) ||
n.StartsWith("GC-SAVEDOG", StringComparison.OrdinalIgnoreCase)) return false;
if (e.FullName.Replace('\\', '/').Contains("/.GC/")) return false;
if (n.StartsWith("GCL-", StringComparison.OrdinalIgnoreCase)) return true;
return false;
}
var entry = archive.Entries.FirstOrDefault(IsLauncher)
?? archive.Entries.FirstOrDefault(e =>
e.Name.Equals("GC.dll", StringComparison.OrdinalIgnoreCase))
?? archive.Entries.FirstOrDefault(e =>
e.Name.Equals("GC", StringComparison.OrdinalIgnoreCase))
+19 -8
View File
@@ -5,6 +5,8 @@ using System.IO;
using System.IO.Compression;
using System.Linq;
using System.Net.Http;
using System.Security.Cryptography;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
using GC.Models;
@@ -152,24 +154,33 @@ public sealed class ModelSourceClient : IModelSourceClient
else if (host.Contains("gitee.com"))
yield return $"https://gitee.com/{owner}/{repo}/repository/archive/{b}.zip";
else
yield break;
{
// 自托管 Gitea(如 git.xhmcl.com):用 archive/<branch>.zip 拉源码归档。
// 关键:不能在这里 yield break —— 那样就只剩 git clone 一条路,
// 用户机器没装 git 时「检测模型 / 下载 / 自动更新」会全部失效。
// 归档下载走 ResumableDownloader,无需系统 git。
yield return $"{uri.GetLeftPart(UriPartial.Authority)}/{owner}/{repo}/archive/{b}.zip";
}
}
}
private async Task DownloadZipAsync(string url, string cacheDir, CancellationToken ct)
{
// .part 用 URL 哈希做稳定文件名:同一个源重试时命中同一份半成品,
// 断点续传才有意义(用 GUID 的话每次重试都是新文件,等于从零开始)。
// 解压目录仍用 GUID —— 它只是中间产物,成功后整块移走或失败即删。
var key = Convert.ToHexString(SHA256.HashData(Encoding.UTF8.GetBytes(url)))[..16].ToLowerInvariant();
var partPath = Path.Combine(_paths.CacheRoot, "tmp", "downloads", key + ".part");
var tmpRoot = Path.Combine(_paths.CacheRoot, "tmp", Guid.NewGuid().ToString("N"));
Directory.CreateDirectory(tmpRoot);
var zipPath = Path.Combine(tmpRoot, "source.zip");
try
{
using (var response = await Http.GetAsync(url, HttpCompletionOption.ResponseHeadersRead, ct))
{
response.EnsureSuccessStatusCode();
await using var input = await response.Content.ReadAsStreamAsync(ct);
await using var output = File.Create(zipPath);
await input.CopyToAsync(output, 81920, ct);
}
// 带断点续传的流式下载;网络中断时 .part 保留,下次从这里接上。
await ResumableDownloader.DownloadAsync(Http, url, partPath, null, ct)
.ConfigureAwait(false);
// 下载完整,.part 转正。转正成功即代表这份 zip 已完整,删掉 .part 避免重复下载。
File.Move(partPath, zipPath, overwrite: true);
var extractDir = Path.Combine(tmpRoot, "extract");
Directory.CreateDirectory(extractDir);
+100
View File
@@ -0,0 +1,100 @@
using System;
using System.IO;
using System.Net;
using System.Net.Http;
using System.Net.Http.Headers;
using System.Threading;
using System.Threading.Tasks;
namespace GC.Services;
/// <summary>
/// 带断点续传的流式下载器。已下载的部分写在 <c>*.part</c> 文件里,
/// 完整下载后由调用方把 .part 改成正式文件名。
///
/// 为什么需要它:模型源码 zip 可能有上百 MB,弱网中断后如果每次都从头下,
/// 用户会反复卡在同一个地方。这里用 HTTP Range 从已下载的字节接着下。
///
/// 兼容性:服务器不支持 Range(忽略请求、返回 200)时自动退化为整段下载,
/// 不会卡死或拿到半截文件。<see cref="Content-Range"/> 起始位置不符时也从头下。
///
/// .part 文件只有在"续传"场景才复用;一旦下载完整、调用方改名为正式文件,
/// 下次就是全新下载,不会把旧内容接在新内容后面。
/// </summary>
public static class ResumableDownloader
{
/// <summary>
/// 下载 <paramref name="url"/>,数据写入 <paramref name="partPath"/>。
/// 返回最终 .part 文件的字节数。下载完整后由调用方负责改名 / 校验。
/// </summary>
public static async Task<long> DownloadAsync(
HttpClient http,
string url,
string partPath,
IProgress<(long Done, long Total)>? progress,
CancellationToken ct)
{
// 已有 .part 就尝试从断点续传;没有则从头下
long resumeFrom = 0;
if (File.Exists(partPath))
{
try { resumeFrom = new FileInfo(partPath).Length; }
catch { resumeFrom = 0; }
}
using var req = new HttpRequestMessage(HttpMethod.Get, url);
if (resumeFrom > 0)
req.Headers.Range = new RangeHeaderValue(resumeFrom, null);
using var response = await http.SendAsync(req, HttpCompletionOption.ResponseHeadersRead, ct)
.ConfigureAwait(false);
response.EnsureSuccessStatusCode();
var canResume = response.StatusCode == HttpStatusCode.PartialContent && resumeFrom > 0;
long? total = response.Content.Headers.ContentLength;
if (canResume)
{
// 校验服务器确实从我们要的位置开始返回:Content-Range: bytes START-END/TOTAL
var range = response.Content.Headers.ContentRange;
if (range?.HasRange == true && range.From == resumeFrom && range.Length.HasValue)
{
total = range.Length.Value;
}
else
{
// 服务器忽略了 Range 或给出的范围对不上:从头覆盖,避免拼接出损坏的文件
canResume = false;
resumeFrom = 0;
}
}
var mode = canResume ? FileMode.Append : FileMode.Create;
var dir = Path.GetDirectoryName(partPath);
if (!string.IsNullOrEmpty(dir)) Directory.CreateDirectory(dir);
await using (var input = await response.Content.ReadAsStreamAsync(ct).ConfigureAwait(false))
await using (var output = new FileStream(partPath, mode, FileAccess.Write, FileShare.Read,
81920, useAsync: true))
{
var buffer = new byte[81920];
long done = resumeFrom;
int read;
while ((read = await input.ReadAsync(buffer.AsMemory(), ct).ConfigureAwait(false)) > 0)
{
await output.WriteAsync(buffer.AsMemory(0, read), ct).ConfigureAwait(false);
done += read;
// Total 未知时用已下载量当分母,进度条会停在 100% 之前但不报错
progress?.Report((done, total ?? done));
}
}
return SafeLength(partPath);
}
private static long SafeLength(string path)
{
try { return new FileInfo(path).Length; }
catch { return 0; }
}
}
+10 -1
View File
@@ -84,12 +84,21 @@ internal sealed class Applier
var manifestText = File.Exists(manifestPath) ? File.ReadAllText(manifestPath) : null;
var verification = ManifestSignature.Verify(manifestText, require);
if (verification.IsRejected)
// 签名不对(被改过 / 密钥不认识)永远拒绝;仅「没有签名」在明确不强制时放行。
// 之前这里不看 require:即使调用方声明 requireSignature=false(开发态、测试),
// 未签名清单也会被当成验签失败直接拒掉。
var hostile = verification.Trust == ManifestTrust.Invalid;
if (hostile || (verification.IsRejected && require))
{
_log.Error($"清单验签失败({verification.Trust}):{verification.Error}",
$"Manifest signature check failed ({verification.Trust}): {verification.Error}");
return Refuse(updateDir, request, verification);
}
if (verification.IsRejected)
{
_log.Warn($"清单未签名,按调用方要求放行:{verification.Error}",
$"Manifest is unsigned; continuing as requested: {verification.Error}");
}
_log.Info($"清单可信度:{verification.Trust}" +
(verification.KeyId != null ? $"({verification.KeyId})" : ""),
$"Manifest trust: {verification.Trust}" +
+5
View File
@@ -37,6 +37,11 @@
<DebugType>none</DebugType>
</PropertyGroup>
<ItemGroup>
<!-- 应用器测试要直接构造 Applier(internal):只对测试程序集放开可见性 -->
<InternalsVisibleTo Include="GC.Savedog.Tests" />
</ItemGroup>
<ItemGroup>
<!-- 与启动器共用同一份安全实现,避免两套逻辑各说各话。
ManifestLoader 依赖启动器的 RepoVersion 模型,守护进程不需要,排除。 -->
+19
View File
@@ -137,6 +137,25 @@ GC-UI.exe flutter_windows.dll data/{icudtl.dat, app.so, flutter_assets/}
- `Runner.rc` 在 windres 下有两处不兼容:图标用反斜杠相对路径、`VERSION_AS_STRING`
依赖命令行传 `-D` 的转义字符串。脚本生成一份路径与宏都已规整的 rc 副本再编译。
### 交叉编译必须自己嵌 DPI 清单
`windows/runner/CMakeLists.txt` 把 `runner.exe.manifest` 当**源文件**列进 target,
Visual Studio 生成器会把它交给链接器(`/MANIFESTINPUT`)自动嵌入 exe;
但 `buildsh/cross/CMakeLists.txt` 只用 windres 编 `Runner.rc`,CMake 不会做这一步。
结果就是交叉编出来的 `GC-UI.exe` **完全没有清单**:Windows 认为它「DPI 不感知」,
在 125% / 150% 缩放的屏幕上把整块窗口当位图拉伸 —— 界面整体发虚,中文小字最明显。
现在两处都已加固,改这块代码时不要拆掉任何一处:
| 位置 | 做法 |
|---|---|
| `buildsh/cross/CMakeLists.txt` | 往 `Runner.cross.rc` 追加 `1 24 "<abs>/runner.exe.manifest"`(id 1 = CREATEPROCESS_MANIFEST_RESOURCE_ID,type 24 = RT_MANIFEST) |
| `windows/runner/main.cpp` | 建窗之前调 `SetProcessDpiAwarenessContext(PER_MONITOR_AWARE_V2)`,失败依次退到 `SetProcessDpiAwareness` / `SetProcessDPIAware` |
`main.cpp` 那层是兜底:即使清单因为工具链原因没嵌进去,程序自己也会声明 DPI 感知。
验证办法(Windows):`GC-UI.exe` 属性 →「兼容性」里不该出现「替代高 DPI 缩放行为」,
或在 125% 缩放下截图,文字边缘应是锐利的 1.25 倍像素,而不是模糊的插值。
`.gitea/workflows` 里的 `windows` 任务仍然跑在 `windows-latest` 上;若手头只有 macOS/Linux
构建机,可以把该任务的 `runs-on` 换成对应标签,直接复用这套交叉编译脚本,
不再需要 VS Build Tools。
+26 -5
View File
@@ -149,14 +149,35 @@ flutter test
# 前后端联调(需要后端正在运行;后端没起时自动跳过)
flutter test test/backend_contract_test.dart
# 生成界面截图到 test/shots/(视觉检查用)
# 生成界面截图到 test/shots/(视觉检查用,不需要后端)
flutter test tool/render_shots_test.dart
```
截图脚本覆盖四个页面(首页 / 下载 / 设置 / 关于)再加一整套外壳:
`test/shots/home.png`、`download.png`、`settings.png`、`about.png`、`shell.png`。
需要先在本机 17890 端口跑起后端;脚本用 `runAsync` 给真实 HTTP 留出时间,
否则 `flutter_test` 的假时钟会让页面停在加载态。
截图脚本覆盖四个页面(首页 / 下载 / 设置 / 关于),再加一整套外壳与 1024×680 小窗回归:
`test/shots/home.png`、`download.png`、`settings.png`、`about.png`、`shell.png`、
`home-small.png`、`download-small.png`、`settings-small.png`,以及浅色主题的
`home-light.png`、`settings-light.png`。小窗用例会顺带抓布局溢出(RenderFlex overflow)。
四个页面都用预置数据(`initialModels` / `initialSources` / `initialAbout` 等)渲染,
所以**不需要先起后端**。测试环境的字体是 Ahem(所有字都是方块),脚本会显式加载
系统里的 Noto Sans SC / 微软雅黑 / 苹方,并顺带加载 Material 图标字体,中文和图标才正常。
截图必须放在 `runAsync` 里取像素(`toImage` / `toByteData` 走真实引擎管线),
否则 fake async 时钟不推进,每个用例会卡满 10 分钟才超时。
## 界面清晰度(DPI)
`GC-UI.exe` 必须在启动时就声明 DPI 感知,否则 Windows 在 125% / 150% 缩放下会把
整块窗口当位图拉伸,界面看起来「糊」—— 中文小字最先糊。两处保证:
- `windows/runner/runner.exe.manifest`:PerMonitorV2(原生 MSVC 构建由 CMake 自动嵌入)
- `windows/runner/main.cpp`:建窗前再声明一次,依次尝试
`SetProcessDpiAwarenessContext` → `SetProcessDpiAwareness` → `SetProcessDPIAware`
- `buildsh/cross/CMakeLists.txt`:交叉编译时把清单写进 `.rc`(windres 不会自动嵌入)
另外主题里做了两件跟「清晰」有关的事:字体族走
`Segoe UI + Microsoft YaHei UI`(macOS 走苹方)而不是让引擎随意回退;
正文最小 12px、行高固定,中文不再挤成一片。详见
[CI.md 的「交叉编译必须自己嵌 DPI 清单」](CI.md#交叉编译必须自己嵌-dpi-清单)。
## 「关于」页展示的技术栈
+10
View File
@@ -138,6 +138,11 @@ class I18n {
'about.architectureValue': 'Flutter 前端 + .NET 后端(本地 HTTP)',
'about.sourceLanguage': '源码语言',
'about.frontend': '前端',
'about.gitService': 'Git 服务',
'about.thanks': '感谢',
'about.thanksHint': '特别感谢以下朋友的支持',
'about.thanksGit': 'Git 服务与部署支持',
'about.thanksGeo': '地理学科内容指导',
},
'en': <String, String>{
'app.name': 'Morris GC',
@@ -268,6 +273,11 @@ class I18n {
'about.architectureValue': 'Flutter frontend + .NET backend (local HTTP)',
'about.sourceLanguage': 'Source language',
'about.frontend': 'Frontend',
'about.gitService': 'Git hosting',
'about.thanks': 'Thanks',
'about.thanksHint': 'Special thanks to',
'about.thanksGit': 'Git hosting and deployment',
'about.thanksGeo': 'Geography content guidance',
},
};
+2
View File
@@ -42,6 +42,8 @@ class _GcUiAppState extends State<GcUiApp> {
return MaterialApp(
title: 'Morris GC',
debugShowCheckedModeBanner: false,
// 桌面端不要移动端那套拉伸回弹和边缘光晕。
scrollBehavior: const GcScrollBehavior(),
theme: buildGcTheme(Brightness.light),
darkTheme: buildGcTheme(Brightness.dark),
themeMode: mode,
File diff suppressed because it is too large. Load diff
+405
View File
@@ -0,0 +1,405 @@
import 'dart:async';
import 'package:flutter/material.dart';
import '../api_client.dart';
import '../controller.dart';
import '../i18n.dart';
import '../theme.dart';
// ---------------------------------------------------------------------------
// 关于页(从原 pages.dart 拆出,公开类名不变)
// ---------------------------------------------------------------------------
// ---------------------------------------------------------------------------
// 关于页
// ---------------------------------------------------------------------------
class AboutPageView extends StatefulWidget {
const AboutPageView({super.key, required this.controller, this.initialAbout});
final ShellController controller;
/// 预置数据(仅用于测试 / 截图,正常运行时为 null,由后端提供)。
final AboutInfo? initialAbout;
@override
State<AboutPageView> createState() => _AboutPageViewState();
}
class _AboutPageViewState extends State<AboutPageView> {
AboutInfo? _about;
bool _loading = true;
String? _error;
@override
void initState() {
super.initState();
final preset = widget.initialAbout;
if (preset != null) {
_about = preset;
_loading = false;
return;
}
_load();
}
Future<void> _load() async {
setState(() {
_loading = true;
_error = null;
});
try {
final about = await widget.controller.api.about();
if (!mounted) return;
setState(() {
_about = about;
_loading = false;
});
} catch (error) {
if (!mounted) return;
setState(() {
_error = error.toString();
_loading = false;
});
}
}
@override
Widget build(BuildContext context) {
return ListView(
padding: const EdgeInsets.fromLTRB(
GcSpace.xxl,
GcSpace.xxl,
GcSpace.xxl,
GcSpace.xxxl,
),
children: <Widget>[
GcPageHeader(
title: T('nav.about'),
subtitle: T('app.tagline'),
),
const SizedBox(height: GcSpace.xxl),
if (_loading)
const Padding(
padding: EdgeInsets.symmetric(vertical: 48),
child: Center(
child: SizedBox(
width: 22,
height: 22,
child: CircularProgressIndicator(strokeWidth: 2),
),
),
)
else if (_error != null)
GcMessage(
title: T('common.error'),
message: _error,
icon: Icons.error_outline_rounded,
color: GcColors.danger,
action: OutlinedButton(
onPressed: _load,
child: Text(T('common.retry')),
),
)
else ...<Widget>[
_versionCard(),
const SizedBox(height: GcSpace.lg),
_contributorsCard(),
const SizedBox(height: GcSpace.lg),
_thanksCard(),
],
],
);
}
Widget _versionCard() {
final about = _about;
// 左边身份卡、右边信息表:宽屏两栏,窄屏自动堆叠。
final identity = Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min,
children: <Widget>[
Row(
children: <Widget>[
Container(
width: 44,
height: 44,
alignment: Alignment.center,
decoration: BoxDecoration(
color: GcColors.accentSoft,
borderRadius: BorderRadius.circular(GcRadius.card),
),
child: Text(
'◎',
style: TextStyle(
fontSize: 22, height: 1.1, color: GcColors.accent),
),
),
const SizedBox(width: GcSpace.lg),
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min,
children: <Widget>[
Text(
about?.appName ?? 'Morris GC',
style: TextStyle(
fontSize: 20,
height: 1.3,
fontWeight: FontWeight.w600,
color: GcColors.ink,
),
),
const SizedBox(height: 2),
Text(
T('app.tagline'),
style: TextStyle(
fontSize: 12.5,
height: 1.5,
color: GcColors.faint,
),
),
],
),
),
],
),
const SizedBox(height: GcSpace.lg),
Wrap(
spacing: GcSpace.sm,
runSpacing: GcSpace.sm,
children: <Widget>[
GcPill('v${about?.version ?? '—'}', color: GcColors.accent),
],
),
const SizedBox(height: GcSpace.lg),
OutlinedButton(
onPressed: () async {
final url = about?.repository;
if (url == null || url.isEmpty) return;
try {
await widget.controller.api.openUrl(url);
} catch (_) {
// 忽略
}
},
child: Text(T('about.openRepository')),
),
],
);
final details = Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
mainAxisSize: MainAxisSize.min,
children: <Widget>[
GcFieldRow(
label: T('set.platform'),
value: about?.platform ?? '—',
),
GcFieldRow(
label: T('about.architecture'),
value: T('about.architectureValue'),
),
GcFieldRow(
label: T('about.sourceLanguage'),
value: about?.sourceLanguage ?? 'C#',
),
GcFieldRow(
label: T('about.frontend'),
value: about?.frontend ?? 'Flutter',
),
GcFieldRow(
label: T('about.gitService'),
value: 'itxiaohui',
),
GcFieldRow(
label: T('set.license'),
value: T('set.licenseValue'),
),
],
);
return GcCard(
padding: const EdgeInsets.all(GcSpace.xxl),
child: LayoutBuilder(
builder: (context, constraints) {
if (constraints.maxWidth < 720) {
return Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
identity,
const GcDivider(verticalPadding: GcSpace.lg),
details,
],
);
}
return Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Expanded(flex: 4, child: identity),
const SizedBox(width: GcSpace.xxxl),
Expanded(flex: 5, child: details),
],
);
},
),
);
}
Widget _contributorsCard() {
final contributors = _about?.contributors ?? const <ContributorInfo>[];
return GcCard(
padding: const EdgeInsets.all(GcSpace.xxl),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
GcSectionTitle(
T('about.developers'),
subtitle: T('about.contributorsHint'),
),
const SizedBox(height: GcSpace.lg),
if (contributors.isEmpty)
GcHint(T('about.noContributors'))
else
Wrap(
spacing: GcSpace.xl,
runSpacing: GcSpace.md,
children: <Widget>[
for (final contributor in contributors)
SizedBox(
width: 220,
child: Row(
children: <Widget>[
CircleAvatar(
radius: 18,
backgroundColor: GcColors.surfaceAlt,
backgroundImage: contributor.avatarUrl == null
? null
: NetworkImage(contributor.avatarUrl!),
child: contributor.avatarUrl == null
? Text(
'◎',
style: TextStyle(
fontSize: 14,
color: GcColors.accent,
),
)
: null,
),
const SizedBox(width: GcSpace.md),
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min,
children: <Widget>[
Text(
contributor.name,
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: TextStyle(
fontSize: 13,
height: 1.4,
fontWeight: FontWeight.w600,
color: GcColors.ink,
),
),
Text(
T(
'about.contributions',
<Object?>[contributor.contributions],
),
style: TextStyle(
fontSize: 11.5,
height: 1.4,
color: GcColors.faint,
),
),
],
),
),
],
),
),
],
),
],
),
);
}
/// 特别感谢:与「开发者」分开列 —— 提供 Git 服务不等于往仓库提交代码,
/// 混进贡献者列表会让提交数失去意义。
Widget _thanksCard() {
return GcCard(
padding: const EdgeInsets.all(GcSpace.xxl),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
GcSectionTitle(
T('about.thanks'),
subtitle: T('about.thanksHint'),
),
const SizedBox(height: GcSpace.lg),
Wrap(
spacing: GcSpace.xl,
runSpacing: GcSpace.md,
children: <Widget>[
_creditTile('地理洪老师', 'about.thanksGeo'),
_creditTile('itxiaohui', 'about.thanksGit'),
],
),
],
),
);
}
Widget _creditTile(String name, String roleKey) {
return SizedBox(
width: 220,
child: Row(
children: <Widget>[
CircleAvatar(
radius: 18,
backgroundColor: GcColors.surfaceAlt,
child: Text(
'◎',
style: TextStyle(fontSize: 14, color: GcColors.accent),
),
),
const SizedBox(width: GcSpace.md),
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min,
children: <Widget>[
Text(
name,
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: TextStyle(
fontSize: 13,
height: 1.4,
fontWeight: FontWeight.w600,
color: GcColors.ink,
),
),
Text(
T(roleKey),
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: TextStyle(
fontSize: 11.5,
height: 1.4,
color: GcColors.faint,
),
),
],
),
),
],
),
);
}
}
+579
View File
@@ -0,0 +1,579 @@
import 'dart:async';
import 'package:flutter/material.dart';
import '../api_client.dart';
import '../controller.dart';
import '../i18n.dart';
import '../theme.dart';
// ---------------------------------------------------------------------------
// 下载页(从原 pages.dart 拆出,公开类名不变)
// ---------------------------------------------------------------------------
// ---------------------------------------------------------------------------
// 下载页
// ---------------------------------------------------------------------------
class DownloadPageView extends StatefulWidget {
const DownloadPageView({
super.key,
required this.controller,
this.initialSources,
this.initialIndex,
this.initialJobs,
});
final ShellController controller;
/// 预置数据(仅用于测试 / 截图,正常运行时为 null,由后端提供)。
final List<SourceInfo>? initialSources;
final SourceIndexInfo? initialIndex;
final List<JobInfo>? initialJobs;
@override
State<DownloadPageView> createState() => _DownloadPageViewState();
}
class _DownloadPageViewState extends State<DownloadPageView> {
List<SourceInfo> _sources = const <SourceInfo>[];
SourceIndexInfo? _index;
List<JobInfo> _jobs = const <JobInfo>[];
String? _selectedSourceId;
bool _loading = true;
String? _error;
Timer? _poll;
/// 页面是否可见(被切走后仍保活,但没必要继续请求后端)。
bool _visible = true;
/// 上一次轮询时是否有活跃任务,用来判断「刚刚全部结束」。
bool _hadActive = false;
@override
void initState() {
super.initState();
final presetSources = widget.initialSources;
if (presetSources != null) {
_sources = presetSources;
_index = widget.initialIndex;
_jobs = widget.initialJobs ?? const <JobInfo>[];
_selectedSourceId = presetSources.isEmpty ? null : presetSources.first.id;
_loading = false;
return;
}
_load();
_schedulePoll(const Duration(seconds: 2));
}
@override
void didChangeDependencies() {
super.didChangeDependencies();
// TickerMode 由外壳的 Offstage 控制:切到别的页时变 false。
_visible = TickerMode.of(context);
}
@override
void dispose() {
_poll?.cancel();
super.dispose();
}
/// 单次 Timer 链:有活跃任务时 1 秒一次,空闲时降到 5 秒,不可见时 10 秒。
///
/// 以前是 `Timer.periodic(1s)` 且永不停止 —— 只要进过下载页,之后每秒都
/// 在请求 `/api/download/jobs`,哪怕没有任何任务、页面也早就切走了。
void _schedulePoll(Duration delay) {
_poll?.cancel();
_poll = Timer(delay, _pollOnce);
}
Future<void> _pollOnce() async {
if (!mounted) return;
if (!_visible) {
_schedulePoll(const Duration(seconds: 10));
return;
}
_hadActive = _jobs.any((job) => job.isActive);
await _refreshJobs();
if (!mounted) return;
final active = _jobs.any((job) => job.isActive);
// 活跃 → 空闲:这一轮里下载结束了,首页的模型列表已经过期。
if (_hadActive && !active) widget.controller.modelsChanged();
_hadActive = active;
_schedulePoll(Duration(seconds: active ? 1 : 5));
}
Future<void> _load() async {
setState(() {
_loading = true;
_error = null;
});
try {
final sources = await widget.controller.api.sources();
final preferred = sources.where((s) => s.enabled).toList();
final selected = _selectedSourceId ??
(preferred.isNotEmpty
? preferred.first.id
: (sources.isNotEmpty ? sources.first.id : ''));
final index = selected.isEmpty
? null
: await widget.controller.api.remoteModels(sourceId: selected);
if (!mounted) return;
setState(() {
_sources = sources;
_selectedSourceId = selected;
_index = index;
_loading = false;
});
await _refreshJobs();
} catch (error) {
if (!mounted) return;
setState(() {
_error = error.toString();
_loading = false;
});
}
}
Future<void> _refreshJobs() async {
try {
final jobs = await widget.controller.api.jobs();
if (!mounted) return;
setState(() => _jobs = jobs);
} catch (_) {
// 轮询失败不打扰用户,下一次再试
}
}
Future<void> _selectSource(String id) async {
setState(() {
_selectedSourceId = id;
_loading = true;
_error = null;
});
try {
final index = await widget.controller.api.remoteModels(sourceId: id);
if (!mounted) return;
setState(() {
_index = index;
_loading = false;
});
} catch (error) {
if (!mounted) return;
setState(() {
_error = error.toString();
_loading = false;
});
}
}
Future<void> _download(RemoteModelInfo model) async {
final sourceId = _selectedSourceId;
if (sourceId == null) return;
try {
await widget.controller.api.startDownload(sourceId, model.id);
await _refreshJobs();
} catch (error) {
if (!mounted) return;
setState(() => _error = error.toString());
}
}
Future<void> _jobAction(
Future<JobInfo> Function(String id) action, String id) async {
try {
await action(id);
await _refreshJobs();
} catch (error) {
if (!mounted) return;
setState(() => _error = error.toString());
}
}
@override
Widget build(BuildContext context) {
return Padding(
padding: const EdgeInsets.fromLTRB(
GcSpace.xxl, GcSpace.xxl, GcSpace.xxl, GcSpace.xl),
child: Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
SizedBox(width: 268, child: _sourcePanel()),
const SizedBox(width: GcSpace.xl),
Expanded(child: _modelPanel()),
],
),
);
}
Widget _sourcePanel() {
return GcCard(
padding: const EdgeInsets.all(GcSpace.lg),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min,
children: <Widget>[
GcSectionTitle(T('dl.sources')),
const SizedBox(height: GcSpace.xs + 2),
GcHint(T('dl.subtitle')),
const SizedBox(height: GcSpace.md),
for (final source in _sources)
Padding(
padding: const EdgeInsets.only(bottom: GcSpace.xs + 2),
child: _sourceTile(source),
),
const SizedBox(height: GcSpace.sm),
SizedBox(
width: double.infinity,
child: OutlinedButton.icon(
onPressed: _load,
icon: const Icon(Icons.refresh_rounded, size: 18),
label: Text(T('dl.refresh')),
),
),
],
),
);
}
Widget _sourceTile(SourceInfo source) {
final selected = source.id == _selectedSourceId;
return Material(
color: selected ? GcColors.accentSoft : Colors.transparent,
borderRadius: BorderRadius.circular(GcRadius.control),
child: InkWell(
borderRadius: BorderRadius.circular(GcRadius.control),
hoverColor: GcColors.surfaceAlt,
onTap: () => _selectSource(source.id),
child: Container(
padding: const EdgeInsets.symmetric(
horizontal: GcSpace.md,
vertical: GcSpace.md - 2,
),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(GcRadius.control),
border: Border.all(
color: selected
? GcColors.accent.withOpacity(0.45)
: Colors.transparent,
),
),
child: Row(
children: <Widget>[
Icon(
selected
? Icons.radio_button_checked_rounded
: Icons.radio_button_unchecked_rounded,
size: 16,
color: selected ? GcColors.accent : GcColors.ghost,
),
const SizedBox(width: GcSpace.sm + 2),
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min,
children: <Widget>[
Text(
source.name,
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: TextStyle(
fontSize: 13,
height: 1.35,
fontWeight: FontWeight.w600,
color: selected ? GcColors.accent : GcColors.ink,
),
),
const SizedBox(height: 1),
Text(
source.host,
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: TextStyle(
fontSize: 11.5,
height: 1.35,
color: GcColors.faint,
),
),
],
),
),
if (!source.enabled) const GcPill('off', subtle: true),
],
),
),
),
);
}
Widget _modelPanel() {
final models = _index?.models ?? const <RemoteModelInfo>[];
return Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
GcPageHeader(
title: T('dl.available'),
subtitle: _index == null
? null
: (_index!.fromCache
? '${T('dl.ready', <Object?>[
models.length
])} · ${T('dl.fromCache')}'
: T('dl.ready', <Object?>[models.length])),
trailing: IconButton(
tooltip: T('common.refresh'),
onPressed: _load,
icon: const Icon(Icons.refresh_rounded, size: 18),
),
),
const SizedBox(height: GcSpace.lg),
Expanded(
child: ListView(
padding: const EdgeInsets.only(bottom: GcSpace.sm),
children: <Widget>[
if (_loading)
const Padding(
padding: EdgeInsets.symmetric(vertical: 48),
child: Center(
child: SizedBox(
width: 22,
height: 22,
child: CircularProgressIndicator(strokeWidth: 2),
),
),
)
else if (_error != null)
GcMessage(
title: T('common.error'),
message: _error,
icon: Icons.cloud_off_rounded,
color: GcColors.danger,
action: OutlinedButton(
onPressed: _load,
child: Text(T('common.retry')),
),
)
else if (models.isEmpty)
GcMessage(
title: T('dl.empty'),
message: T('dl.emptyHint'),
icon: Icons.inbox_rounded,
)
else
for (final model in models)
Padding(
padding: const EdgeInsets.only(bottom: GcSpace.md),
child: _remoteRow(model),
),
const SizedBox(height: GcSpace.sm),
_jobsPanel(),
],
),
),
],
);
}
Widget _remoteRow(RemoteModelInfo model) {
return GcCard(
padding: const EdgeInsets.fromLTRB(
GcSpace.lg,
GcSpace.md + 2,
GcSpace.lg,
GcSpace.md + 2,
),
child: Row(
children: <Widget>[
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Row(
children: <Widget>[
Flexible(
child: Text(
model.name,
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: TextStyle(
fontSize: 14,
height: 1.35,
fontWeight: FontWeight.w600,
color: GcColors.ink,
),
),
),
const SizedBox(width: GcSpace.sm),
Text(
'v${model.version} · ${model.sizeText}',
style: TextStyle(
fontSize: 12,
height: 1.35,
color: GcColors.faint,
),
),
if (model.installed) ...<Widget>[
const SizedBox(width: GcSpace.sm),
GcPill(T('dl.installed'), color: GcColors.ok),
],
],
),
const SizedBox(height: GcSpace.xs + 1),
Text(
model.description,
maxLines: 2,
overflow: TextOverflow.ellipsis,
style: TextStyle(
fontSize: 12.5,
height: 1.5,
color: GcColors.muted,
),
),
],
),
),
const SizedBox(width: GcSpace.lg),
if (model.installed)
OutlinedButton(
onPressed: () => _download(model),
child: Text(T('dl.reinstall')),
)
else
FilledButton(
onPressed: () => _download(model),
child: Text(T('dl.download')),
),
],
),
);
}
Widget _jobsPanel() {
return GcCard(
padding: const EdgeInsets.all(GcSpace.lg),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
GcSectionTitle(
T('dl.background'),
trailing: TextButton(
onPressed: () async {
try {
await widget.controller.api.clearFinished();
await _refreshJobs();
} catch (_) {
// 忽略
}
},
child: Text(T('dl.clearDone')),
),
),
const SizedBox(height: GcSpace.md),
if (_jobs.isEmpty)
GcHint(T('dl.bgEmpty'))
else
for (final job in _jobs)
Padding(
padding: const EdgeInsets.only(bottom: GcSpace.md),
child: _jobRow(job),
),
],
),
);
}
Widget _jobRow(JobInfo job) {
return Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Row(
children: <Widget>[
Expanded(
child: Text(
'${job.name} v${job.version}',
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: TextStyle(
fontSize: 13,
height: 1.35,
fontWeight: FontWeight.w600,
color: GcColors.ink,
),
),
),
GcPill(
_stateLabel(job.state),
color: job.state == 'Failed'
? GcColors.danger
: job.state == 'Completed'
? GcColors.ok
: GcColors.accent,
),
const SizedBox(width: GcSpace.sm),
if (job.isActive)
TextButton(
onPressed: () =>
_jobAction(widget.controller.api.cancelJob, job.id),
child: Text(T('dl.cancel')),
)
else if (job.canRetry)
TextButton(
onPressed: () =>
_jobAction(widget.controller.api.retryJob, job.id),
child: Text(T('dl.retry')),
)
else
TextButton(
onPressed: () =>
_jobAction(widget.controller.api.removeJob, job.id),
child: Text(T('dl.removeTask')),
),
],
),
const SizedBox(height: GcSpace.sm - 2),
ClipRRect(
borderRadius: BorderRadius.circular(2),
child: LinearProgressIndicator(
value: job.progress.clamp(0, 1).toDouble(),
minHeight: 4,
backgroundColor: GcColors.surfaceAlt,
),
),
const SizedBox(height: GcSpace.xs + 1),
Text(
job.error ?? job.detailText,
style: TextStyle(
fontSize: 11.5,
height: 1.4,
color: GcColors.faint,
),
),
],
);
}
String _stateLabel(String state) {
switch (state) {
case 'Queued':
return T('dl.status.queued');
case 'Running':
case 'Downloading':
return T('dl.status.downloading');
case 'Completed':
return T('dl.status.done');
case 'Failed':
return T('dl.status.failed');
case 'Canceled':
return T('dl.status.canceled');
default:
return state;
}
}
}
+690
View File
@@ -0,0 +1,690 @@
import 'dart:async';
import 'package:flutter/material.dart';
import '../api_client.dart';
import '../controller.dart';
import '../i18n.dart';
import '../theme.dart';
// ---------------------------------------------------------------------------
// 首页:模型库(从原 pages.dart 拆出,公开类名不变)
// ---------------------------------------------------------------------------
// ---------------------------------------------------------------------------
// 首页:模型库
// ---------------------------------------------------------------------------
class HomePageView extends StatefulWidget {
const HomePageView({super.key, required this.controller, this.initialModels});
final ShellController controller;
/// 预置模型列表(仅用于测试 / 截图,正常运行时为 null,由后端提供)。
final List<ModelInfo>? initialModels;
@override
State<HomePageView> createState() => _HomePageViewState();
}
class _HomePageViewState extends State<HomePageView> {
List<ModelInfo> _models = const <ModelInfo>[];
bool _loading = true;
String? _error;
String? _notice;
int _lastRevision = 0;
@override
void initState() {
super.initState();
widget.controller.addListener(_onControllerChanged);
_lastRevision = widget.controller.modelsRevision;
final preset = widget.initialModels;
if (preset != null) {
_models = preset;
_loading = false;
} else {
_load();
}
}
@override
void dispose() {
widget.controller.removeListener(_onControllerChanged);
super.dispose();
}
/// 下载完成 / 删除模型后重新拉列表:页面被 Offstage 保活,不会自己重建。
void _onControllerChanged() {
if (!mounted) return;
final revision = widget.controller.modelsRevision;
if (revision == _lastRevision) return;
_lastRevision = revision;
if (widget.initialModels != null) return; // 截图 / 测试用的预置数据
_load();
}
Future<void> _load() async {
setState(() {
_loading = true;
_error = null;
});
try {
final models = await widget.controller.api.models();
if (!mounted) return;
setState(() {
_models = models;
_loading = false;
});
} catch (error) {
if (!mounted) return;
setState(() {
_error = error.toString();
_loading = false;
});
}
}
Future<void> _launch(ModelInfo model) async {
setState(() => _notice = null);
try {
final result = await widget.controller.api.launchModel(model.id);
if (!mounted) return;
setState(() => _notice = result.message);
} catch (error) {
if (!mounted) return;
setState(() => _notice = error.toString());
}
}
Future<void> _delete(ModelInfo model) async {
final confirmed = await showDialog<bool>(
context: context,
builder: (context) => AlertDialog(
backgroundColor: GcColors.surface,
title: Text(T('common.confirmTitle')),
content: Text(T('home.deleteConfirm', <Object?>[model.name])),
actions: <Widget>[
TextButton(
onPressed: () => Navigator.of(context).pop(false),
child: Text(T('common.cancel')),
),
FilledButton(
onPressed: () => Navigator.of(context).pop(true),
child: Text(T('common.delete')),
),
],
),
);
if (confirmed != true) return;
try {
await widget.controller.api.deleteModel(model.id);
await _load();
} catch (error) {
if (!mounted) return;
setState(() => _notice = error.toString());
}
}
Future<void> _openFolder(String path) async {
try {
await widget.controller.api.openFolder(path);
} catch (error) {
if (!mounted) return;
setState(() => _notice = error.toString());
}
}
@override
Widget build(BuildContext context) {
final settings = widget.controller.settings;
return RefreshIndicator(
onRefresh: _load,
color: GcColors.accent,
backgroundColor: GcColors.surface,
child: ListView(
physics: const AlwaysScrollableScrollPhysics(),
padding: const EdgeInsets.fromLTRB(
GcSpace.xxl, GcSpace.xxl, GcSpace.xxl, GcSpace.xxxl),
children: <Widget>[
_hero(settings),
const SizedBox(height: GcSpace.xxl),
_sectionHeader(),
if (_notice != null) ...<Widget>[
const SizedBox(height: GcSpace.md),
GcMessage(
title: _notice!,
icon: Icons.info_outline_rounded,
color: GcColors.warn,
),
],
const SizedBox(height: GcSpace.lg),
if (_loading)
const Padding(
padding: EdgeInsets.symmetric(vertical: 48),
child: Center(
child: SizedBox(
width: 22,
height: 22,
child: CircularProgressIndicator(strokeWidth: 2),
),
),
)
else if (_error != null)
GcMessage(
title: T('common.error'),
message: _error,
icon: Icons.cloud_off_rounded,
color: GcColors.danger,
action: OutlinedButton(
onPressed: _load,
child: Text(T('common.retry')),
),
)
else if (_models.isEmpty)
_emptyState()
else
LayoutBuilder(
builder: (context, constraints) {
const spacing = GcSpace.lg;
final columns =
(constraints.maxWidth / 320).floor().clamp(1, 4);
final cardWidth =
(constraints.maxWidth - spacing * (columns - 1)) / columns;
return Wrap(
spacing: spacing,
runSpacing: spacing,
children: <Widget>[
for (final model in _models)
SizedBox(
width: cardWidth,
child: _ModelCard(
model: model,
previewUrl: widget.controller.api.previewUrl(model),
onLaunch: () => _launch(model),
onOpenFolder: () => _openFolder(model.directory),
onDelete: () => _delete(model),
),
),
],
);
},
),
],
),
);
}
/// 顶部横幅:产品定位 + 主操作 + 关键指标。
///
/// 不用渐变:深色主题下的低对比渐变会让整块区域发灰,看起来就是「糊」。
Widget _hero(SettingsInfo? settings) {
final enabledSources =
settings?.sources.where((s) => s.enabled).length ?? 0;
return GcCard(
padding: const EdgeInsets.all(GcSpace.xxl + 2),
child: Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Text(
'MODEL LIBRARY',
style: TextStyle(
fontSize: 11,
height: 1.2,
letterSpacing: 1.4,
fontWeight: FontWeight.w600,
color: GcColors.accent,
),
),
const SizedBox(height: GcSpace.md),
Text(
T('home.title'),
style: TextStyle(
fontSize: 26,
height: 1.25,
fontWeight: FontWeight.w600,
letterSpacing: -0.2,
color: GcColors.ink,
),
),
const SizedBox(height: GcSpace.sm),
ConstrainedBox(
constraints: const BoxConstraints(maxWidth: 460),
child: Text(
T('home.subtitle'),
style: TextStyle(
fontSize: 13,
height: 1.65,
color: GcColors.muted,
),
),
),
const SizedBox(height: GcSpace.xl),
Row(
children: <Widget>[
FilledButton.icon(
onPressed:
_models.isEmpty ? null : () => _launch(_models.first),
icon: const Icon(Icons.play_arrow_rounded, size: 18),
label: Text(T('home.launch')),
),
const SizedBox(width: GcSpace.md),
OutlinedButton(
onPressed: () => widget.controller.goTo(1),
child: Text(T('home.download')),
),
const SizedBox(width: GcSpace.xs),
TextButton(
onPressed: () => widget.controller.goTo(2),
child: Text(T('home.settings')),
),
],
),
const SizedBox(height: GcSpace.md),
Text(
T('home.launchHint'),
style: TextStyle(
fontSize: 12,
height: 1.55,
color: GcColors.faint,
),
),
],
),
),
const SizedBox(width: GcSpace.xxl),
Container(
padding: const EdgeInsets.symmetric(
horizontal: GcSpace.xl,
vertical: GcSpace.lg,
),
decoration: BoxDecoration(
color: GcColors.surfaceAlt,
borderRadius: BorderRadius.circular(GcRadius.control),
border: Border.all(color: GcColors.line),
),
child: Row(
mainAxisSize: MainAxisSize.min,
children: <Widget>[
GcMetric(
value: '${_models.length}',
label: T('home.stats.models'),
),
_metricDivider(),
GcMetric(
value: '$enabledSources',
label: T('home.stats.sources'),
),
_metricDivider(),
GcMetric(
value: '${settings?.memoryBudgetMb ?? 0}',
label: T('home.stats.memory'),
),
],
),
),
],
),
);
}
Widget _metricDivider() {
return Container(
width: 1,
height: 34,
margin: const EdgeInsets.symmetric(horizontal: GcSpace.xl),
color: GcColors.line,
);
}
Widget _sectionHeader() {
return Row(
children: <Widget>[
Text(
T('home.installed'),
style: TextStyle(
fontSize: 16,
height: 1.4,
fontWeight: FontWeight.w600,
color: GcColors.ink,
),
),
const SizedBox(width: GcSpace.sm),
GcPill(T('home.count', <Object?>[_models.length]), subtle: true),
const Spacer(),
IconButton(
tooltip: T('common.refresh'),
onPressed: _load,
icon: const Icon(Icons.refresh_rounded, size: 18),
),
],
);
}
Widget _emptyState() {
return GcCard(
padding: const EdgeInsets.symmetric(
horizontal: GcSpace.xxxl,
vertical: 40,
),
child: Column(
children: <Widget>[
Container(
width: 52,
height: 52,
alignment: Alignment.center,
decoration: BoxDecoration(
color: GcColors.accentSoft,
borderRadius: BorderRadius.circular(GcRadius.panel),
),
child: Icon(
Icons.travel_explore_rounded,
size: 26,
color: GcColors.accent,
),
),
const SizedBox(height: GcSpace.lg),
Text(
T('home.empty'),
style: TextStyle(
fontSize: 16,
height: 1.4,
fontWeight: FontWeight.w600,
color: GcColors.ink,
),
),
const SizedBox(height: GcSpace.sm),
ConstrainedBox(
constraints: const BoxConstraints(maxWidth: 420),
child: Text(
T('home.emptyHint'),
textAlign: TextAlign.center,
style: TextStyle(
fontSize: 12.5,
height: 1.7,
color: GcColors.muted,
),
),
),
const SizedBox(height: GcSpace.xl),
FilledButton(
onPressed: () => widget.controller.goTo(1),
child: Text(T('home.emptyAction')),
),
],
),
);
}
}
class _ModelCard extends StatefulWidget {
const _ModelCard({
required this.model,
required this.previewUrl,
required this.onLaunch,
required this.onOpenFolder,
required this.onDelete,
});
final ModelInfo model;
final String previewUrl;
final VoidCallback onLaunch;
final VoidCallback onOpenFolder;
final VoidCallback onDelete;
@override
State<_ModelCard> createState() => _ModelCardState();
}
class _ModelCardState extends State<_ModelCard> {
bool _hover = false;
@override
Widget build(BuildContext context) {
final model = widget.model;
return MouseRegion(
onEnter: (_) => setState(() => _hover = true),
onExit: (_) => setState(() => _hover = false),
cursor: SystemMouseCursors.click,
child: GcCard(
padding: EdgeInsets.zero,
clip: true,
borderColor: _hover ? GcColors.lineStrong : GcColors.line,
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
_cover(model),
Padding(
padding: const EdgeInsets.fromLTRB(
GcSpace.lg,
GcSpace.md + 2,
GcSpace.lg,
GcSpace.md,
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Row(
children: <Widget>[
Expanded(
child: Text(
model.name,
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: TextStyle(
fontSize: 14.5,
height: 1.35,
fontWeight: FontWeight.w600,
color: GcColors.ink,
),
),
),
const SizedBox(width: GcSpace.sm),
Text(
model.sizeText,
style: TextStyle(
fontSize: 12,
height: 1.35,
color: GcColors.faint,
),
),
],
),
const SizedBox(height: GcSpace.sm - 2),
SizedBox(
height: 36,
child: Text(
model.description.isEmpty
? T('home.noDescription')
: model.description,
maxLines: 2,
overflow: TextOverflow.ellipsis,
style: TextStyle(
fontSize: 12.5,
height: 1.45,
color: model.description.isEmpty
? GcColors.faint
: GcColors.muted,
),
),
),
if (model.tags.isNotEmpty) ...<Widget>[
const SizedBox(height: GcSpace.sm + 2),
SizedBox(
height: 20,
child: Wrap(
spacing: 6,
runSpacing: 6,
children: <Widget>[
for (final tag in model.tags.take(3))
GcPill(tag, subtle: true),
],
),
),
],
const SizedBox(height: GcSpace.md + 2),
Row(
children: <Widget>[
FilledButton.icon(
onPressed: widget.onLaunch,
icon: const Icon(Icons.play_arrow_rounded, size: 18),
label: Text(T('home.launch')),
),
const Spacer(),
IconButton(
tooltip: T('home.open'),
onPressed: widget.onOpenFolder,
icon: const Icon(Icons.folder_open_rounded, size: 18),
),
IconButton(
tooltip: T('home.delete'),
onPressed: widget.onDelete,
icon:
const Icon(Icons.delete_outline_rounded, size: 18),
),
],
),
],
),
),
],
),
),
);
}
/// 封面:按卡片宽度和屏幕像素比解码,避免被放大后发虚。
Widget _cover(ModelInfo model) {
final dpr = MediaQuery.devicePixelRatioOf(context);
final decodeWidth =
(MediaQuery.sizeOf(context).width * dpr).clamp(320, 900).round();
return SizedBox(
height: 156,
width: double.infinity,
child: Stack(
fit: StackFit.expand,
children: <Widget>[
_PreviewFallback(model: model),
if (model.hasPreview)
Image.network(
widget.previewUrl,
fit: BoxFit.cover,
cacheWidth: decodeWidth,
filterQuality: FilterQuality.medium,
gaplessPlayback: true,
errorBuilder: (context, error, stack) => const SizedBox.shrink(),
),
DecoratedBox(
decoration: BoxDecoration(
// 只用「透明 → 深色」的遮罩,别用 alphaBlend:叠加不透明底色
// 会把整张封面盖平,占位字母也跟着消失。
gradient: LinearGradient(
begin: Alignment.topCenter,
end: Alignment.bottomCenter,
colors: <Color>[
GcColors.appBg.withOpacity(0.0),
GcColors.appBg.withOpacity(0.32),
GcColors.appBg.withOpacity(0.88),
],
stops: const <double>[0.42, 0.72, 1.0],
),
),
),
Positioned(
left: GcSpace.md,
right: GcSpace.sm,
bottom: GcSpace.sm,
child: Row(
children: <Widget>[
if (model.version.isNotEmpty)
GcPill('v${model.version}', color: GcColors.accent),
if (model.author.isNotEmpty) ...<Widget>[
const SizedBox(width: GcSpace.sm),
Flexible(
child: Text(
model.author,
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: TextStyle(
fontSize: 11.5,
height: 1.3,
color: GcColors.muted,
),
),
),
],
const Spacer(),
AnimatedOpacity(
opacity: _hover ? 1 : 0,
duration: const Duration(milliseconds: 140),
child: Container(
width: 26,
height: 26,
decoration: BoxDecoration(
color: GcColors.accentFill,
shape: BoxShape.circle,
),
child: Icon(
Icons.play_arrow_rounded,
size: 18,
color: GcColors.onAccent,
),
),
),
],
),
),
],
),
);
}
}
/// 没有封面时的占位:型号首字 + 淡淡的网格感,比一个大「◎」更像封面。
class _PreviewFallback extends StatelessWidget {
const _PreviewFallback({this.model});
final ModelInfo? model;
@override
Widget build(BuildContext context) {
final label = (model?.name ?? '').characters.isEmpty
? '◎'
: model!.name.characters.first;
return DecoratedBox(
decoration: BoxDecoration(
gradient: LinearGradient(
begin: Alignment.topLeft,
end: Alignment.bottomRight,
colors: <Color>[
Color.alphaBlend(
GcColors.accent.withOpacity(0.22),
GcColors.surfaceAlt,
),
GcColors.surfaceAlt,
],
),
),
child: Center(
child: Text(
label,
style: TextStyle(
fontSize: 46,
height: 1.0,
fontWeight: FontWeight.w600,
color: Color.alphaBlend(
GcColors.accent.withOpacity(0.55),
GcColors.surfaceAlt,
),
),
),
),
);
}
}
+699
View File
@@ -0,0 +1,699 @@
import 'dart:async';
import 'package:flutter/material.dart';
import '../api_client.dart';
import '../controller.dart';
import '../i18n.dart';
import '../theme.dart';
// ---------------------------------------------------------------------------
// 设置页(从原 pages.dart 拆出,公开类名不变)
// ---------------------------------------------------------------------------
// ---------------------------------------------------------------------------
// 设置页
// ---------------------------------------------------------------------------
class SettingsPageView extends StatefulWidget {
const SettingsPageView({super.key, required this.controller});
final ShellController controller;
@override
State<SettingsPageView> createState() => _SettingsPageViewState();
}
class _SettingsPageViewState extends State<SettingsPageView> {
double _memory = 2048;
bool _memoryAuto = true;
int _fps = 120;
bool _autoUpdate = true;
String _language = 'auto';
ThemeMode _themeMode = ThemeMode.dark;
/// 上一次同步所用的设置对象。以前用的是 `bool _synced` —— 只同步一次,
/// 之后外部(更新状态条、其它页面)改了设置,本页仍显示旧值。
SettingsInfo? _syncedFrom;
String? _status;
@override
void initState() {
super.initState();
widget.controller.reloadSettings();
}
void _syncFrom(SettingsInfo settings) {
if (identical(_syncedFrom, settings)) return;
_syncedFrom = settings;
_memory = settings.memoryMb.toDouble();
_memoryAuto = settings.memoryAuto;
_fps = settings.renderFps;
_autoUpdate = settings.autoUpdateOnStartup;
_language = settings.language;
_themeMode = GcPalette.parseMode(settings.theme);
}
@override
Widget build(BuildContext context) {
final settings = widget.controller.settings;
if (settings == null) {
return const Center(
child: SizedBox(
width: 22,
height: 22,
child: CircularProgressIndicator(strokeWidth: 2),
),
);
}
_syncFrom(settings);
return LayoutBuilder(
builder: (context, constraints) {
final twoColumns = constraints.maxWidth >= 960;
final cards = <Widget>[
_generalCard(settings),
_appearanceCard(settings),
_memoryCard(settings),
_sourcesCard(settings),
_storageCard(settings),
_updateCard(settings),
_backendCard(settings),
];
Widget column(List<Widget> items) => Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: <Widget>[
for (var i = 0; i < items.length; i++) ...<Widget>[
if (i > 0) const SizedBox(height: GcSpace.lg),
items[i],
],
],
);
final left = <Widget>[];
final right = <Widget>[];
for (var i = 0; i < cards.length; i++) {
if (twoColumns && i.isOdd) {
right.add(cards[i]);
} else {
left.add(cards[i]);
}
}
return SingleChildScrollView(
padding: const EdgeInsets.fromLTRB(
GcSpace.xxl,
GcSpace.xxl,
GcSpace.xxl,
GcSpace.xxxl,
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: <Widget>[
GcPageHeader(
title: T('set.title'),
subtitle: T('set.subtitle'),
trailing: _status == null
? null
: GcPill(
_status!,
color: GcColors.ok,
icon: Icons.check_rounded,
),
),
const SizedBox(height: GcSpace.xxl),
if (twoColumns)
Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Expanded(child: column(left)),
const SizedBox(width: GcSpace.lg),
Expanded(child: column(right)),
],
)
else
column(cards),
],
),
);
},
);
}
Widget _label(String text) {
return Text(
text,
style: TextStyle(fontSize: 13, height: 1.5, color: GcColors.muted),
);
}
Widget _cardRow(String label, Widget control) {
return Padding(
padding: const EdgeInsets.symmetric(vertical: GcSpace.sm),
child: Row(
children: <Widget>[
SizedBox(width: 124, child: _label(label)),
Expanded(child: control),
],
),
);
}
Widget _generalCard(SettingsInfo settings) {
return GcCard(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
GcSectionTitle(T('set.general')),
const SizedBox(height: GcSpace.lg),
_cardRow(
T('set.language'),
Align(
alignment: Alignment.centerLeft,
child: DropdownButton<String>(
value: _language,
dropdownColor: GcColors.surfaceAlt,
underline: const SizedBox.shrink(),
borderRadius: BorderRadius.circular(GcRadius.control),
// 从主题样式派生,才能继承字体族(自建 TextStyle 会丢掉
// fontFamily,中文就回退成系统兜底字体)。
style: Theme.of(context).textTheme.bodyLarge!.copyWith(
fontSize: 13,
height: 1.4,
fontWeight: FontWeight.w400,
color: GcColors.ink,
),
items: <DropdownMenuItem<String>>[
DropdownMenuItem<String>(
value: 'auto',
child: Text(T('set.language.auto')),
),
for (final language in settings.languages)
DropdownMenuItem<String>(
value: language.code,
child: Text(language.label),
),
],
onChanged: (value) async {
if (value == null) return;
setState(() => _language = value);
await widget.controller
.saveSettings(SettingsPatch(language: value));
},
),
),
),
_cardRow(
T('set.fps'),
Row(
children: <Widget>[
Expanded(
child: Slider(
value: _fps.toDouble(),
min: 24,
max: 120,
divisions: 4,
label: '$_fps',
onChanged: (value) => setState(() => _fps = value.round()),
onChangeEnd: (value) async {
await widget.controller.saveSettings(
SettingsPatch(renderFps: value.round()));
if (mounted) {
setState(() => _status = T('common.applied'));
}
},
),
),
SizedBox(
width: 48,
child: Text(
'$_fps',
textAlign: TextAlign.end,
style: TextStyle(
fontSize: 13,
height: 1.4,
fontWeight: FontWeight.w600,
color: GcColors.ink,
),
),
),
],
),
),
GcHint(T('set.fps.desc')),
],
),
);
}
Widget _appearanceCard(SettingsInfo settings) {
final current =
GcPalette.parseHex(settings.accentColor) ?? GcPalette.defaultAccent;
return GcCard(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
GcSectionTitle(T('set.appearance')),
const SizedBox(height: GcSpace.md),
GcHint(T('set.theme.desc')),
const SizedBox(height: GcSpace.md),
SegmentedButton<ThemeMode>(
segments: <ButtonSegment<ThemeMode>>[
ButtonSegment<ThemeMode>(
value: ThemeMode.dark,
label: Text(T('set.theme.dark')),
icon: const Icon(Icons.dark_mode_outlined, size: 16),
),
ButtonSegment<ThemeMode>(
value: ThemeMode.light,
label: Text(T('set.theme.light')),
icon: const Icon(Icons.light_mode_outlined, size: 16),
),
ButtonSegment<ThemeMode>(
value: ThemeMode.system,
label: Text(T('set.theme.system')),
icon: const Icon(Icons.brightness_auto_outlined, size: 16),
),
],
selected: <ThemeMode>{_themeMode},
showSelectedIcon: false,
onSelectionChanged: (selection) async {
final mode = selection.first;
setState(() => _themeMode = mode);
GcPalette.mode.value = mode; // 立即预览
await widget.controller.saveSettings(
SettingsPatch(theme: GcPalette.modeToName(mode)));
if (mounted) setState(() => _status = T('common.applied'));
},
),
const SizedBox(height: GcSpace.xl),
GcHint(T('set.accent.desc')),
const SizedBox(height: GcSpace.md + 2),
Wrap(
spacing: GcSpace.sm + 2,
runSpacing: GcSpace.sm + 2,
children: <Widget>[
for (final color in GcPalette.presets)
_accentSwatch(color, current),
_customAccentChip(),
],
),
const SizedBox(height: GcSpace.md),
Text(
'${T('set.accent')}: ${GcPalette.toHex(current)}',
style: TextStyle(
fontSize: 11.5,
height: 1.4,
color: GcColors.faint,
),
),
],
),
);
}
Widget _accentSwatch(Color color, Color current) {
final selected = color.value == current.value;
return Tooltip(
message: GcPalette.toHex(color),
child: GestureDetector(
onTap: () => _applyAccent(GcPalette.toHex(color)),
child: Container(
width: 34,
height: 34,
decoration: BoxDecoration(
color: color,
borderRadius: BorderRadius.circular(GcRadius.control),
border: Border.all(
color: selected ? GcColors.ink : Colors.transparent,
width: 2,
),
),
child: selected
? Icon(
Icons.check_rounded,
size: 18,
color: color.computeLuminance() > 0.42
? const Color(0xFF0A1226)
: Colors.white,
)
: null,
),
),
);
}
Widget _customAccentChip() {
return MouseRegion(
cursor: SystemMouseCursors.click,
child: GestureDetector(
onTap: _pickCustomAccent,
child: Container(
height: 34,
padding: const EdgeInsets.symmetric(horizontal: GcSpace.md),
decoration: BoxDecoration(
color: GcColors.surfaceAlt,
borderRadius: BorderRadius.circular(GcRadius.control),
border: Border.all(color: GcColors.line),
),
child: Row(
mainAxisSize: MainAxisSize.min,
children: <Widget>[
Icon(Icons.colorize_rounded, size: 16, color: GcColors.faint),
const SizedBox(width: GcSpace.xs + 2),
Text(
T('set.accent.custom'),
style: TextStyle(
fontSize: 12,
height: 1.3,
color: GcColors.muted,
),
),
],
),
),
),
);
}
Future<void> _pickCustomAccent() async {
final controller = TextEditingController(
text: GcPalette.toHex(GcPalette.accent.value),
);
final hex = await showDialog<String>(
context: context,
builder: (context) => AlertDialog(
backgroundColor: GcColors.surface,
title: Text(T('set.accent.custom')),
content: TextField(
controller: controller,
autofocus: true,
style: Theme.of(context).textTheme.bodyLarge!.copyWith(fontSize: 13),
decoration: InputDecoration(
hintText: '#8FB6FF',
helperText: T('set.accent.hexHint'),
),
onSubmitted: (value) => Navigator.of(context).pop(value),
),
actions: <Widget>[
TextButton(
onPressed: () => Navigator.of(context).pop(),
child: Text(T('common.cancel')),
),
FilledButton(
onPressed: () => Navigator.of(context).pop(controller.text),
child: Text(T('common.confirm')),
),
],
),
);
controller.dispose();
if (hex != null) await _applyAccent(hex);
}
Future<void> _applyAccent(String hex) async {
final parsed = GcPalette.parseHex(hex);
if (parsed == null) {
if (mounted) setState(() => _status = T('set.accent.invalid'));
return;
}
final normalized = GcPalette.toHex(parsed);
GcPalette.apply(normalized); // 立即预览
await widget.controller
.saveSettings(SettingsPatch(accentColor: normalized));
if (mounted) setState(() => _status = T('common.applied'));
}
Widget _memoryCard(SettingsInfo settings) {
return GcCard(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
GcSectionTitle(T('set.memory')),
const SizedBox(height: GcSpace.md),
GcHint(T('set.memory.desc')),
const SizedBox(height: GcSpace.lg),
Row(
children: <Widget>[
Switch(
value: _memoryAuto,
onChanged: (value) async {
setState(() => _memoryAuto = value);
await widget.controller
.saveSettings(SettingsPatch(memoryAuto: value));
},
),
const SizedBox(width: GcSpace.md),
Expanded(
child: Text(
T('set.memory.auto'),
style: TextStyle(
fontSize: 13,
height: 1.5,
color: GcColors.muted,
),
),
),
],
),
const SizedBox(height: GcSpace.xs),
Row(
children: <Widget>[
Expanded(
child: Slider(
value: _memory,
min: 512,
max: 16384,
divisions: 62,
label: '${_memory.round()} MB',
onChanged: _memoryAuto
? null
: (value) => setState(() => _memory = value),
onChangeEnd: (value) async {
await widget.controller
.saveSettings(SettingsPatch(memoryMb: value.round()));
if (mounted) setState(() => _status = T('common.applied'));
},
),
),
SizedBox(
width: 104,
child: Text(
'${_memory.round()} MB',
textAlign: TextAlign.end,
style: TextStyle(
fontSize: 13,
height: 1.4,
fontWeight: FontWeight.w600,
color: GcColors.ink,
),
),
),
],
),
const SizedBox(height: GcSpace.xs),
GcHint('${T('set.memory.current')}: ${settings.memoryUsageText}'),
const SizedBox(height: GcSpace.xs),
GcHint(T('set.memory.hint')),
],
),
);
}
Widget _sourcesCard(SettingsInfo settings) {
return GcCard(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
GcSectionTitle(T('set.sources')),
const SizedBox(height: GcSpace.md),
GcHint(T('set.sources.desc')),
const SizedBox(height: GcSpace.md),
for (final source in settings.sources)
Padding(
padding: const EdgeInsets.only(bottom: GcSpace.md),
child: Row(
children: <Widget>[
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min,
children: <Widget>[
Text(
source.name,
style: TextStyle(
fontSize: 13,
height: 1.4,
fontWeight: FontWeight.w600,
color: GcColors.ink,
),
),
const SizedBox(height: 1),
Text(
source.url,
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: TextStyle(
fontSize: 11.5,
height: 1.4,
color: GcColors.faint,
),
),
],
),
),
const SizedBox(width: GcSpace.sm),
if (source.enabled)
GcPill(T('set.sourceEnabled'), color: GcColors.ok)
else
const GcPill('—', subtle: true),
],
),
),
],
),
);
}
Widget _storageCard(SettingsInfo settings) {
return GcCard(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
GcSectionTitle(T('set.storage')),
const SizedBox(height: GcSpace.md),
GcFieldRow(
label: T('set.modelDir'),
value: settings.modelRoot,
selectable: true,
valueColor: GcColors.muted,
),
GcFieldRow(
label: T('set.dataDir'),
value: settings.dataRoot,
selectable: true,
valueColor: GcColors.muted,
),
const SizedBox(height: GcSpace.md),
Wrap(
spacing: GcSpace.sm + 2,
runSpacing: GcSpace.sm + 2,
children: <Widget>[
OutlinedButton(
onPressed: () async {
try {
await widget.controller.api.openFolder(settings.modelRoot);
} catch (error) {
if (mounted) setState(() => _status = error.toString());
}
},
child: Text(T('set.openFolder')),
),
OutlinedButton(
onPressed: () async {
await widget.controller.checkUpdate(force: true);
if (mounted) setState(() => _status = T('set.cacheCleared'));
},
child: Text(T('set.clearCache')),
),
],
),
],
),
);
}
Widget _updateCard(SettingsInfo settings) {
return GcCard(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
GcSectionTitle(T('update.title')),
const SizedBox(height: GcSpace.md),
GcHint(T('set.checkUpdate.desc')),
const SizedBox(height: GcSpace.md),
Row(
children: <Widget>[
Switch(
value: _autoUpdate,
onChanged: (value) async {
setState(() => _autoUpdate = value);
await widget.controller
.saveSettings(SettingsPatch(autoUpdateOnStartup: value));
},
),
const SizedBox(width: GcSpace.md),
Expanded(
child: Text(
T('update.auto'),
style: TextStyle(
fontSize: 13,
height: 1.5,
color: GcColors.muted,
),
),
),
],
),
const SizedBox(height: GcSpace.sm),
GcFieldRow(
label: T('update.source'),
value: settings.updateRepository,
selectable: true,
valueColor: GcColors.muted,
),
const SizedBox(height: GcSpace.md),
FilledButton(
onPressed: () => widget.controller.checkUpdate(force: true),
child: Text(T('update.checkNow')),
),
],
),
);
}
Widget _backendCard(SettingsInfo settings) {
final health = widget.controller.health;
return GcCard(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
GcSectionTitle(T('set.backend')),
const SizedBox(height: GcSpace.md),
GcHint(T('set.backend.desc')),
const SizedBox(height: GcSpace.md),
GcFieldRow(
label: 'API',
value: widget.controller.api.baseUrl,
selectable: true,
valueColor: GcColors.muted,
),
GcFieldRow(
label: T('set.version'),
value: settings.version,
valueColor: GcColors.muted,
),
GcFieldRow(
label: T('set.platform'),
value: settings.platform,
valueColor: GcColors.muted,
),
GcFieldRow(
label: T('set.backend.ui'),
value: health == null
? '—'
: health.uiAvailable
? T('set.backend.uiOk')
: '${T('set.backend.uiBad')}${health.uiError == null ? '' : ' · ${health.uiError}'}',
valueColor: health == null
? GcColors.muted
: health.uiAvailable
? GcColors.ok
: GcColors.danger,
),
],
),
);
}
}
+184 -86
View File
@@ -14,12 +14,31 @@ class _NavItem {
}
const List<_NavItem> _navItems = <_NavItem>[
_NavItem(Icons.grid_view_rounded, 'nav.home'),
_NavItem(Icons.dashboard_rounded, 'nav.home'),
_NavItem(Icons.download_rounded, 'nav.download'),
_NavItem(Icons.tune_rounded, 'nav.settings'),
_NavItem(Icons.info_outline_rounded, 'nav.about'),
];
/// 桌面端滚动行为:去掉移动端的拉伸回弹和边缘光晕,滚轮更跟手。
class GcScrollBehavior extends MaterialScrollBehavior {
const GcScrollBehavior();
@override
Widget buildOverscrollIndicator(
BuildContext context,
Widget child,
ScrollableDetails details,
) {
return child;
}
@override
ScrollPhysics getScrollPhysics(BuildContext context) {
return const ClampingScrollPhysics(parent: AlwaysScrollableScrollPhysics());
}
}
/// 应用外壳:左侧导航 + 右侧内容 + 底部更新状态条。
class ShellPage extends StatefulWidget {
const ShellPage({super.key, required this.controller});
@@ -52,6 +71,7 @@ class _ShellPageState extends State<ShellPage> {
body: Row(
children: <Widget>[
_Sidebar(controller: controller),
Container(width: 1, color: GcColors.line),
Expanded(
child: Column(
children: <Widget>[
@@ -75,9 +95,9 @@ class _ShellPageState extends State<ShellPage> {
}
return const Center(
child: SizedBox(
width: 26,
height: 26,
child: CircularProgressIndicator(strokeWidth: 2.4),
width: 22,
height: 22,
child: CircularProgressIndicator(strokeWidth: 2),
),
);
}
@@ -124,52 +144,25 @@ class _Sidebar extends StatelessWidget {
Widget build(BuildContext context) {
final settings = controller.settings;
return Container(
width: 236,
width: GcSize.sidebar,
color: GcColors.sideBg,
padding: const EdgeInsets.fromLTRB(16, 20, 16, 18),
padding: const EdgeInsets.fromLTRB(
GcSpace.xl, GcSpace.xxl, GcSpace.lg, GcSpace.lg),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Row(
children: <Widget>[
Container(
width: 26,
height: 26,
decoration: BoxDecoration(
color: GcColors.surfaceAlt,
borderRadius: BorderRadius.circular(8),
),
alignment: Alignment.center,
child: Text(
'◎',
style: TextStyle(fontSize: 14, color: GcColors.accent),
),
),
const SizedBox(width: 10),
Expanded(
child: Text(
'Morris GC',
style: TextStyle(
fontSize: 13,
fontWeight: FontWeight.w600,
color: GcColors.ink,
),
),
),
],
),
const SizedBox(height: 6),
GcHint(T('app.tagline')),
const SizedBox(height: 26),
_brand(),
const SizedBox(height: GcSpace.xxxl),
const Padding(
padding: EdgeInsets.only(left: 14, bottom: 6),
padding: EdgeInsets.only(left: 10, bottom: GcSpace.sm),
child: Text(
'MENU',
style: TextStyle(
fontSize: 9.5,
letterSpacing: 1.2,
fontSize: 11,
height: 1.2,
letterSpacing: 1.4,
fontWeight: FontWeight.w600,
color: Color(0xFF4C5F80),
color: Color(0xFF5C6A80),
),
),
),
@@ -181,25 +174,91 @@ class _Sidebar extends StatelessWidget {
),
const Spacer(),
Container(height: 1, color: GcColors.line),
const SizedBox(height: 10),
const SizedBox(height: GcSpace.md),
Padding(
padding: const EdgeInsets.only(left: 14),
child: Text(
'v${settings?.version ?? '—'}',
style: TextStyle(fontSize: 10.5, color: GcColors.faint),
),
),
Padding(
padding: const EdgeInsets.only(left: 14, top: 2),
child: Text(
settings?.platform ?? '—',
style: const TextStyle(fontSize: 10, color: Color(0xFF4F6080)),
padding: const EdgeInsets.only(left: 10),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Text(
'v${settings?.version ?? '—'}',
style: TextStyle(
fontSize: 12,
height: 1.4,
fontWeight: FontWeight.w600,
color: GcColors.muted,
),
),
const SizedBox(height: 2),
Text(
settings?.platform ?? '—',
style: TextStyle(
fontSize: 11.5,
height: 1.4,
color: GcColors.ghost,
),
),
],
),
),
],
),
);
}
/// 品牌区:一个渐变圆角标 + 名称 + 一句定位。
Widget _brand() {
return Row(
children: <Widget>[
Container(
width: 32,
height: 32,
alignment: Alignment.center,
decoration: BoxDecoration(
color: GcColors.accentSoft,
borderRadius: BorderRadius.circular(9),
border: Border.all(
color: Color.alphaBlend(
GcColors.accent.withOpacity(0.35), GcColors.sideBg),
),
),
child: Text(
'◎',
style: TextStyle(fontSize: 16, height: 1.1, color: GcColors.accent),
),
),
const SizedBox(width: GcSpace.md),
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min,
children: <Widget>[
Text(
'Morris GC',
style: TextStyle(
fontSize: 14,
height: 1.3,
fontWeight: FontWeight.w600,
color: GcColors.ink,
),
),
const SizedBox(height: 1),
Text(
'SCIENCE · CLASSROOM',
style: TextStyle(
fontSize: 10,
height: 1.3,
letterSpacing: 0.9,
fontWeight: FontWeight.w600,
color: GcColors.ghost,
),
),
],
),
),
],
);
}
}
class _NavButton extends StatelessWidget {
@@ -216,29 +275,34 @@ class _NavButton extends StatelessWidget {
@override
Widget build(BuildContext context) {
return Padding(
padding: const EdgeInsets.only(bottom: 4),
padding: const EdgeInsets.only(bottom: GcSpace.xs),
child: Material(
color: active ? GcColors.surfaceAlt : Colors.transparent,
borderRadius: BorderRadius.circular(9),
color: active ? GcColors.accentSoft : Colors.transparent,
borderRadius: BorderRadius.circular(GcRadius.control),
child: InkWell(
borderRadius: BorderRadius.circular(9),
borderRadius: BorderRadius.circular(GcRadius.control),
onTap: onTap,
hoverColor: GcColors.surfaceHover,
child: Padding(
padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 10),
padding: const EdgeInsets.symmetric(
horizontal: GcSpace.md,
vertical: 11,
),
child: Row(
children: <Widget>[
Icon(
item.icon,
size: 16,
size: 17,
color: active ? GcColors.accent : GcColors.faint,
),
const SizedBox(width: 10),
const SizedBox(width: GcSpace.md),
Text(
T(item.labelKey),
style: TextStyle(
fontSize: 12.5,
fontSize: 13.5,
height: 1.2,
fontWeight: active ? FontWeight.w600 : FontWeight.w400,
color: active ? GcColors.ink : GcColors.muted,
color: active ? GcColors.accent : GcColors.muted,
),
),
],
@@ -262,20 +326,28 @@ class _UpdateBar extends StatelessWidget {
color: GcColors.surface,
border: Border(top: BorderSide(color: GcColors.line)),
),
padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 9),
padding: const EdgeInsets.symmetric(
horizontal: GcSpace.xxl,
vertical: GcSpace.md,
),
child: Row(
children: <Widget>[
Text('⟳',
style: TextStyle(fontSize: 16, color: GcColors.accent)),
const SizedBox(width: 12),
Icon(
Icons.sync_rounded,
size: 18,
color: GcColors.accent,
),
const SizedBox(width: GcSpace.md),
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min,
children: <Widget>[
Text(
controller.updateStatus,
style: TextStyle(
fontSize: 12.5,
fontSize: 13,
height: 1.35,
fontWeight: FontWeight.w600,
color: GcColors.ink,
),
@@ -284,23 +356,41 @@ class _UpdateBar extends StatelessWidget {
if (controller.updateDetail.isNotEmpty)
Text(
controller.updateDetail,
style: TextStyle(fontSize: 11, color: GcColors.faint),
style: TextStyle(
fontSize: 12,
height: 1.4,
color: GcColors.faint,
),
overflow: TextOverflow.ellipsis,
),
if (controller.launcherNotice.isNotEmpty)
Text(
controller.launcherNotice,
style: TextStyle(fontSize: 11, color: GcColors.warn),
style: TextStyle(
fontSize: 12,
height: 1.4,
color: GcColors.warn,
),
),
],
),
),
if (controller.updateBusy)
const SizedBox(
width: 130,
child: LinearProgressIndicator(minHeight: 4),
if (controller.updateBusy) ...<Widget>[
const SizedBox(width: GcSpace.lg),
SizedBox(
width: 140,
child: ClipRRect(
borderRadius: BorderRadius.circular(3),
child: LinearProgressIndicator(
value: controller.updateProgress > 0
? controller.updateProgress.clamp(0, 1).toDouble()
: null,
minHeight: 4,
),
),
),
const SizedBox(width: 14),
],
const SizedBox(width: GcSpace.lg),
TextButton(
onPressed: controller.updateBusy
? null
@@ -324,24 +414,32 @@ class _BackendDown extends StatelessWidget {
child: ConstrainedBox(
constraints: const BoxConstraints(maxWidth: 520),
child: GcCard(
padding: const EdgeInsets.all(28),
padding: const EdgeInsets.all(GcSpace.xxl),
child: Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Text(
T('common.error'),
style: TextStyle(
fontSize: 17,
fontWeight: FontWeight.w600,
color: GcColors.ink,
),
Row(
children: <Widget>[
Icon(Icons.error_outline_rounded,
size: 20, color: GcColors.danger),
const SizedBox(width: GcSpace.sm),
Text(
T('common.error'),
style: TextStyle(
fontSize: 16,
height: 1.35,
fontWeight: FontWeight.w600,
color: GcColors.ink,
),
),
],
),
const SizedBox(height: 10),
const SizedBox(height: GcSpace.md),
GcHint(controller.loadError ?? ''),
const SizedBox(height: 6),
GcHint('后端地址:${controller.api.baseUrl}'),
const SizedBox(height: 16),
const SizedBox(height: GcSpace.xs),
GcHint('${T('set.backend')}: ${controller.api.baseUrl}'),
const SizedBox(height: GcSpace.lg),
FilledButton(
onPressed: controller.bootstrap,
child: Text(T('common.retry')),
File diff suppressed because it is too large. Load diff
+1 -1
View File
@@ -16,7 +16,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
# In Windows, build-name is used as the major, minor, and patch parts
# of the product and file versions while build-number is used as the build suffix.
version: 1.0.0+1
version: 1.1.1+1
environment:
sdk: ^3.5.4
+150 -24
View File
@@ -21,9 +21,18 @@ import 'package:gc_ui/theme.dart';
/// flutter test tool/render_shots_test.dart
void main() {
setUpAll(() async {
HttpOverrides.global = null;
// 不要设置 HttpOverrides.global = null:那会打开真实网络,
// flutter_test 的假时钟下 HTTP 定时器永远悬着,用例结束时
// 会撞上「!timersPending」断言。保持 flutter_test 默认的 FakeHttpClient
// (所有请求立即返回 400),页面本身都用预置数据渲染,不需要后端。
// 测试环境默认用 Ahem 占位字体(所有字都是方块),必须显式加载一套真字体:
// Linux CI 用 Noto CJK,Windows 本机用 Noto Sans SC / 微软雅黑,macOS 用苹方。
const candidates = <String>[
r'C:\Windows\Fonts\Deng.ttf',
r'C:\Windows\Fonts\NotoSansSC-VF.ttf',
r'C:\Windows\Fonts\msyh.ttc',
r'C:\Windows\Fonts\simhei.ttf',
'/System/Library/Fonts/PingFang.ttc',
'/usr/share/fonts/opentype/noto/NotoSansCJK-Regular.ttc',
'/usr/share/fonts/truetype/noto/NotoSansCJK-Regular.ttc',
];
@@ -36,6 +45,22 @@ void main() {
await loader.load();
break;
}
// Material 图标字体:flutter_test 不会自动加载,不加载的话所有 Icon
// 都是方框,截图就没法检查图标。SDK 缓存里那份由 flutter test 通过
// FLUTTER_ROOT 指过来。
final flutterRoot = Platform.environment['FLUTTER_ROOT'];
if (flutterRoot != null) {
final icons = File(
'$flutterRoot/bin/cache/artifacts/material_fonts/materialicons-regular.otf',
);
if (icons.existsSync()) {
final bytes = icons.readAsBytesSync();
final loader = FontLoader('MaterialIcons')
..addFont(Future<ByteData>.value(ByteData.view(bytes.buffer)));
await loader.load();
}
}
});
SettingsInfo sampleSettings() => SettingsInfo.fromJson(<String, dynamic>{
@@ -123,9 +148,26 @@ void main() {
'uiAvailable': true,
});
/// 外壳用的 controller:bootstrap 直接返回,不去连后端。
///
/// 真 ShellPage 会在 initState 里 bootstrap,后端不在时会挂重试定时器,
/// 用例结束时报「!timersPending」。这里只把 bootstrap 换成空实现,
/// 页面里的数据请求仍会走 flutter_test 的假 HTTP(立即 400)。
ShellController shellController() => _StubShellController()
..settings = sampleSettings()
..health = HealthInfo.fromJson(<String, dynamic>{
'ok': true,
'version': '1.0.7',
'platform': 'osx-arm64',
'uiAvailable': true,
});
Future<void> shoot(WidgetTester tester, String name, Widget page,
{Brightness brightness = Brightness.dark}) async {
tester.view.physicalSize = const Size(1280, 820);
{Brightness brightness = Brightness.dark,
Size size = const Size(1280, 860)}) async {
// 1280×860:与发布包窗口默认尺寸(1280×720)接近,再多留一点高度看得到
// 底部状态条。像素比 1.0,方便逐像素检查描边和文字。
tester.view.physicalSize = size;
tester.view.devicePixelRatio = 1.0;
addTearDown(tester.view.reset);
@@ -136,10 +178,13 @@ void main() {
await tester.pumpWidget(
MaterialApp(
debugShowCheckedModeBanner: false,
theme: buildGcTheme(brightness).copyWith(
textTheme: buildGcTheme(brightness).textTheme.apply(
fontFamily: 'Noto Sans CJK SC',
),
// 四个页面都用预置数据渲染,不需要后端;字体统一换成测试里加载的
// 那一套,并且清空 fallback —— 否则主题里的按钮 / 输入框样式会去
// 找系统字体(测试环境没有),缺字处就画成方块。
theme: buildGcTheme(
brightness,
fontFamily: 'Noto Sans CJK SC',
fontFamilyFallback: const <String>[],
),
home: RepaintBoundary(
key: key,
@@ -148,25 +193,27 @@ void main() {
),
);
await tester.pump(const Duration(milliseconds: 200));
// 页面里的数据来自真实后端(/api/about、/api/sources 等)。
// flutter_test 默认用假时钟,真实 HTTP 永远不会完成,所以这里用 runAsync
// 让出真实时间,等请求回来后再 pump 出最终画面。
await tester.runAsync(() async {
await Future<void>.delayed(const Duration(milliseconds: 1200));
});
await tester.pump(const Duration(milliseconds: 300));
await tester.runAsync(() async {
await Future<void>.delayed(const Duration(milliseconds: 600));
});
await tester.pump(const Duration(milliseconds: 300));
final boundary =
key.currentContext!.findRenderObject()! as RenderRepaintBoundary;
final image = await boundary.toImage(pixelRatio: 1.0);
final bytes = await image.toByteData(format: ui.ImageByteFormat.png);
// toImage / toByteData 要走真实引擎的异步管线,必须放在 runAsync 里,
// 否则 fake async 时钟不会推进,Future 一直不完成(表现为每个用例卡
// 满 10 分钟超时才返回)。
final stopwatch = Stopwatch()..start();
final image = await tester.runAsync(
() => boundary.toImage(pixelRatio: 1.0),
);
final bytes = await tester.runAsync(
() => image!.toByteData(format: ui.ImageByteFormat.png),
);
final dir = Directory('test/shots')..createSync(recursive: true);
File('${dir.path}/$name.png').writeAsBytesSync(bytes!.buffer.asUint8List());
stopwatch.stop();
// ignore: avoid_print
print(
'[shots] $name (${brightness.name}) 耗时 ${stopwatch.elapsedMilliseconds} ms');
}
testWidgets('home', (tester) async {
@@ -174,7 +221,8 @@ void main() {
await shoot(
tester,
'home',
HomePageView(controller: sampleController(), initialModels: sampleModels()),
HomePageView(
controller: sampleController(), initialModels: sampleModels()),
);
});
@@ -261,7 +309,8 @@ void main() {
testWidgets('settings', (tester) async {
I18n.language.value = 'zh-CN';
await shoot(tester, 'settings', SettingsPageView(controller: sampleController()));
await shoot(
tester, 'settings', SettingsPageView(controller: sampleController()));
});
testWidgets('about', (tester) async {
@@ -292,7 +341,77 @@ void main() {
testWidgets('shell', (tester) async {
I18n.language.value = 'zh-CN';
await shoot(tester, 'shell', ShellPage(controller: sampleController()));
final controller = shellController()
..setUpdateStatus(
visible: true,
busy: false,
progress: 1,
status: '已更新 2 个模型,立即生效',
detail: '模型与启动器均为最新版',
notice: '',
);
await shoot(tester, 'shell', ShellPage(controller: controller));
});
/// 小窗口回归:1024×680 下不应出现溢出条纹或卡片挤压。
testWidgets('home-small', (tester) async {
I18n.language.value = 'zh-CN';
await shoot(
tester,
'home-small',
HomePageView(
controller: sampleController(), initialModels: sampleModels()),
size: const Size(1024, 680),
);
});
testWidgets('download-small', (tester) async {
I18n.language.value = 'zh-CN';
await shoot(
tester,
'download-small',
DownloadPageView(
controller: sampleController(),
initialSources: <SourceInfo>[
SourceInfo.fromJson(<String, dynamic>{
'id': 'github',
'name': 'GitHub',
'url': 'https://github.com/Morris-GC/GC',
'enabled': true,
'builtIn': true,
'host': 'github.com',
}),
],
initialIndex: SourceIndexInfo.fromJson(<String, dynamic>{
'sourceId': 'github',
'root': 'https://github.com/Morris-GC/GC',
'fromCache': false,
'resolvedFrom': 'version.json',
'models': <dynamic>[
<String, dynamic>{
'id': 'sun',
'name': '太阳系',
'description': '观察八大行星的公转轨道与相对大小。',
'version': '1.2',
'sizeText': '2.3 MB',
'installed': true,
},
],
}),
initialJobs: const <JobInfo>[],
),
size: const Size(1024, 680),
);
});
testWidgets('settings-small', (tester) async {
I18n.language.value = 'zh-CN';
await shoot(
tester,
'settings-small',
SettingsPageView(controller: sampleController()),
size: const Size(1024, 680),
);
});
testWidgets('home-light', (tester) async {
@@ -300,7 +419,8 @@ void main() {
await shoot(
tester,
'home-light',
HomePageView(controller: sampleController(), initialModels: sampleModels()),
HomePageView(
controller: sampleController(), initialModels: sampleModels()),
brightness: Brightness.light,
);
});
@@ -315,3 +435,9 @@ void main() {
);
});
}
/// 只用于截图的 controller:不连后端,避免挂上重试定时器。
class _StubShellController extends ShellController {
@override
Future<void> bootstrap() async {}
}
+73
View File
@@ -5,8 +5,81 @@
#include "flutter_window.h"
#include "utils.h"
namespace {
// Enable DPI awareness (Per-Monitor V2 when available).
//
// The runner.exe.manifest normally declares this, but the mingw/windres cross
// build does not embed the manifest the way the Visual Studio generator does.
// A DPI-unaware process gets bitmap-stretched by Windows on a 125% / 150%
// scaled display, which makes the whole UI (especially small CJK text) look
// blurry. Declaring it again before any window exists costs nothing and does
// not depend on the manifest being present.
//
// Every API is resolved through GetProcAddress: it keeps the binary working on
// older systems and does not require the current SDK / mingw headers to declare
// DPI_AWARENESS_CONTEXT.
#if defined(_MSC_VER)
#pragma warning(push)
#pragma warning(disable : 4191) // FARPROC to typed function pointer, on purpose
#endif
BOOL TryPerMonitorV2() {
// DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2 == (HANDLE)-4
using Fn = BOOL(WINAPI*)(HANDLE);
HMODULE user32 = ::GetModuleHandleW(L"user32.dll");
if (user32 == nullptr) return FALSE;
auto set_context = reinterpret_cast<Fn>(
::GetProcAddress(user32, "SetProcessDpiAwarenessContext"));
if (set_context == nullptr) return FALSE;
// Cast through INT_PTR: plain -4 to pointer is C4312 at /W4.
return set_context(reinterpret_cast<HANDLE>(static_cast<INT_PTR>(-4)));
}
void TryPerMonitor() {
// Windows 8.1+: PROCESS_PER_MONITOR_DPI_AWARE == 2
using Fn = HRESULT(WINAPI*)(int);
HMODULE shcore = ::LoadLibraryW(L"shcore.dll");
if (shcore == nullptr) return;
auto set_awareness =
reinterpret_cast<Fn>(::GetProcAddress(shcore, "SetProcessDpiAwareness"));
if (set_awareness != nullptr) {
// E_ACCESSDENIED means the manifest already set awareness: still fine.
set_awareness(2);
}
::FreeLibrary(shcore);
}
void TrySystemDpiAware() {
// Windows Vista+: system DPI awareness, better than nothing.
using Fn = BOOL(WINAPI*)();
HMODULE user32 = ::GetModuleHandleW(L"user32.dll");
if (user32 == nullptr) return;
auto set_aware =
reinterpret_cast<Fn>(::GetProcAddress(user32, "SetProcessDPIAware"));
if (set_aware != nullptr) set_aware();
}
#if defined(_MSC_VER)
#pragma warning(pop)
#endif
void EnableDpiAwareness() {
// When the manifest already declared awareness, SetProcessDpiAwarenessContext
// returns FALSE; fall back to the 8.1 and Vista entry points. All three
// failing is harmless: the app still starts, it just scales blurrily.
if (TryPerMonitorV2()) return;
TryPerMonitor();
TrySystemDpiAware();
}
} // namespace
int APIENTRY wWinMain(_In_ HINSTANCE instance, _In_opt_ HINSTANCE prev,
_In_ wchar_t *command_line, _In_ int show_command) {
// Must run before the first window is created to take effect.
EnableDpiAwareness();
// Attach to console when present (e.g., 'flutter run') or create a
// new console when running with a debugger.
if (!::AttachConsole(ATTACH_PARENT_PROCESS) && ::IsDebuggerPresent()) {
+18 -2
View File
@@ -134,11 +134,27 @@ bool Win32Window::Create(const std::wstring& title,
UINT dpi = FlutterDesktopGetDpiForMonitor(monitor);
double scale_factor = dpi / 96.0;
// Cap the initial size to the monitor work area. 1280x720 logical is
// 1920x1080 physical at 150% scaling, which no longer fits on a 1080p
// screen; clamping keeps the window usable instead of hanging off-screen.
int physical_width = Scale(size.width, scale_factor);
int physical_height = Scale(size.height, scale_factor);
MONITORINFO monitor_info{};
monitor_info.cbSize = sizeof(MONITORINFO);
if (::GetMonitorInfoW(monitor, &monitor_info)) {
const int max_width =
(monitor_info.rcWork.right - monitor_info.rcWork.left) * 92 / 100;
const int max_height =
(monitor_info.rcWork.bottom - monitor_info.rcWork.top) * 92 / 100;
if (physical_width > max_width) physical_width = max_width;
if (physical_height > max_height) physical_height = max_height;
}
HWND window = CreateWindow(
window_class, title.c_str(), WS_OVERLAPPEDWINDOW,
Scale(origin.x, scale_factor), Scale(origin.y, scale_factor),
Scale(size.width, scale_factor), Scale(size.height, scale_factor),
nullptr, nullptr, GetModuleHandle(nullptr), this);
physical_width, physical_height, nullptr, nullptr,
GetModuleHandle(nullptr), this);
if (!window) {
return false;
+3
View File
@@ -61,6 +61,9 @@ public static class ContributorsService
["2509_92447106"] = "Morris",
["chenmoyuan1214@qq.com"] = "Morris",
["morris@xhmcl.com"] = "Morris",
// 早期提交用的是 xhgit 这个账号,展示名统一成 itxiaohui
["xhgit"] = "itxiaohui",
["itxiaohui"] = "itxiaohui",
};
/// <summary>自动化提交(CI / 助手账号),不计入开发者。</summary>
+124 -12
View File
@@ -1,4 +1,5 @@
using System;
using System.Globalization;
using System.IO;
using System.Text;
@@ -15,15 +16,30 @@ namespace GC.Services;
/// 中英分开而不是写在一个文件里:用户排查时不用在一行里找自己看得懂的那半句;
/// 也给反馈问题时直接发对应语言的文件即可。
///
/// 写入方式:常驻 <see cref="StreamWriter"/>(<c>AutoFlush</c> 打开,崩溃也不丢最后几行),
/// 不再每行 open/append/close 一遍 —— 那条路径每写一行要开两个文件句柄,
/// 在下载 / 启动高峰期会明显拖慢调用方。
///
/// 保留策略:<see cref="RetentionDays"/> 天之前的日志在初始化与跨天滚动时删除;
/// 总量超过 <see cref="MaxTotalBytes"/> 时从最旧的开始删。日志目录不会无限长。
///
/// 日志失败绝不影响主流程(磁盘满、只读目录都只是少一份日志)。
/// </summary>
public static class GcLog
{
/// <summary>日志保留天数。</summary>
public const int RetentionDays = 14;
/// <summary>日志目录总量上限(中英两份合计)。</summary>
public const long MaxTotalBytes = 64L * 1024 * 1024;
private static readonly object Gate = new();
private const string FilePrefix = "gc-";
private static string? _dir;
private static string _day = "";
private static string _zhPath = "";
private static string _enPath = "";
private static StreamWriter? _zh;
private static StreamWriter? _en;
public static bool Enabled
{
@@ -45,8 +61,10 @@ public static class GcLog
lock (Gate)
{
CloseWriters();
_dir = dir;
_day = "";
PruneOldFiles(dir);
}
}
@@ -58,10 +76,8 @@ public static class GcLog
{
var now = DateTime.Now;
var prefix = $"{now:yyyy-MM-dd HH:mm:ss} [{level}] ";
var lineZh = prefix + zh;
var lineEn = prefix + en;
try { Console.WriteLine(lineZh); } catch { /* 无控制台 */ }
try { Console.WriteLine(prefix + zh); } catch { /* 无控制台 */ }
lock (Gate)
{
@@ -70,25 +86,121 @@ public static class GcLog
var day = now.ToString("yyyyMMdd");
if (day != _day)
{
// 跨天换文件;顺便清一次旧日志,长时间挂机的进程也不会攒满磁盘
CloseWriters();
_day = day;
_zhPath = Path.Combine(_dir, $"gc-{day}.log");
_enPath = Path.Combine(_dir, $"gc-{day}.en.log");
PruneOldFiles(_dir);
}
Append(_zhPath, lineZh);
Append(_enPath, lineEn);
if (_zh == null)
{
_zh = OpenWriter(Path.Combine(_dir, $"{FilePrefix}{day}.log"));
_en = OpenWriter(Path.Combine(_dir, $"{FilePrefix}{day}.en.log"));
}
Append(_zh, prefix + zh);
Append(_en, prefix + en);
}
}
private static void Append(string path, string line)
private static StreamWriter? OpenWriter(string path)
{
try
{
File.AppendAllText(path, line + Environment.NewLine, new UTF8Encoding(false));
var stream = new FileStream(path, FileMode.Append, FileAccess.Write, FileShare.ReadWrite);
return new StreamWriter(stream, new UTF8Encoding(false)) { AutoFlush = true };
}
catch
{
// 日志失败不能影响程序
// 写不了就不写;下一次跨天会再试一次
return null;
}
}
private static void Append(StreamWriter? writer, string line)
{
if (writer == null) return;
try
{
writer.WriteLine(line);
}
catch
{
// 磁盘满 / 文件被删:关掉写入器,下次跨天重建
try { writer.Dispose(); } catch { }
if (ReferenceEquals(writer, _zh)) _zh = null; else _en = null;
}
}
private static void CloseWriters()
{
try { _zh?.Dispose(); } catch { }
try { _en?.Dispose(); } catch { }
_zh = null;
_en = null;
}
/// <summary>
/// 清理过期与超量日志。只动本模块自己写的 <c>gc-YYYYMMDD[.en].log</c>,
/// 目录里用户放的其他文件一概不碰。
/// </summary>
private static void PruneOldFiles(string dir)
{
try
{
var files = new DirectoryInfo(dir).GetFiles(FilePrefix + "*.log");
if (files.Length == 0) return;
var cutoff = DateTime.Now.Date.AddDays(-RetentionDays);
var alive = new System.Collections.Generic.List<FileInfo>(files.Length);
foreach (var file in files)
{
if (!TryReadDate(file.Name, out var date))
{
// 名字不是我们的格式,忽略(既不删也不计入配额)
continue;
}
if (date < cutoff)
{
try { file.Delete(); } catch { }
continue;
}
alive.Add(file);
}
long total = 0;
foreach (var file in alive) total += file.Length;
if (total <= MaxTotalBytes) return;
alive.Sort((a, b) => a.LastWriteTimeUtc.CompareTo(b.LastWriteTimeUtc));
foreach (var file in alive)
{
if (total <= MaxTotalBytes) break;
try
{
total -= file.Length;
file.Delete();
}
catch { }
}
}
catch
{
// 清理失败不影响写日志
}
}
private static bool TryReadDate(string name, out DateTime date)
{
date = default;
// gc-20261118.log / gc-20261118.en.log
if (!name.StartsWith(FilePrefix, StringComparison.Ordinal)) return false;
var rest = name.Substring(FilePrefix.Length);
var dot = rest.IndexOf('.');
if (dot != 8) return false;
return DateTime.TryParseExact(rest.Substring(0, 8), "yyyyMMdd",
CultureInfo.InvariantCulture, DateTimeStyles.None, out date);
}
}
+21 -1
View File
@@ -28,7 +28,7 @@
<TextBlock Classes="faint" Text="{Binding PlatformText}" />
</StackPanel>
<Grid ColumnDefinitions="96,*" RowDefinitions="Auto,Auto">
<Grid ColumnDefinitions="96,*" RowDefinitions="Auto,Auto,Auto">
<TextBlock Classes="h3" Text="版本" />
<TextBlock Grid.Column="1" Classes="muted" Text="{Binding VersionText}"
FontWeight="SemiBold" />
@@ -38,6 +38,10 @@
HorizontalAlignment="Left" Padding="0"
Command="{Binding OpenRepositoryCommand}"
Content="{Binding RepositoryText}" />
<TextBlock Grid.Row="2" Classes="h3" Text="Git 服务" Margin="0,8,0,0" />
<TextBlock Grid.Row="2" Grid.Column="1" Classes="muted" Text="itxiaohui"
FontWeight="SemiBold" Margin="0,8,0,0" />
</Grid>
</StackPanel>
</Grid>
@@ -76,6 +80,22 @@
</StackPanel>
</StackPanel>
</Border>
<Border Background="{DynamicResource SurfaceAlt}"
BorderBrush="{DynamicResource Line}" BorderThickness="1"
CornerRadius="12" Padding="12,10" MinWidth="190">
<StackPanel Orientation="Horizontal" Spacing="10">
<Border Width="34" Height="34" CornerRadius="17"
Background="{DynamicResource AccentSoft}">
<TextBlock Text="◉" FontSize="15" Foreground="{DynamicResource Accent}"
HorizontalAlignment="Center" VerticalAlignment="Center" />
</Border>
<StackPanel VerticalAlignment="Center" Spacing="1">
<TextBlock Text="itxiaohui" FontSize="12.5" FontWeight="SemiBold" />
<TextBlock Classes="faint" Text="Git 服务与部署支持" />
</StackPanel>
</StackPanel>
</Border>
</StackPanel>
</StackPanel>
</Border>
@@ -0,0 +1,293 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.IO.Compression;
using System.Linq;
using System.Security.Cryptography;
using System.Text;
using GC.Savedog;
namespace GC.Savedog.Tests;
/// <summary>
/// GC-SAVEDOG 的应用器测试:更新真正落盘的那一段(整目录替换 / .GC/bin 合并 / 失败回滚)。
///
/// 为什么单独一个工程:<c>GC.Tests</c> 引用的是启动器程序集,而 GC-SAVEDOG 为了保持
/// 「安全逻辑只有一份实现」把 <c>GC/src/Security</c> 与 <c>Json.cs</c> 以源码链接的方式
/// 编进了自己 —— 两个程序集里存在同名类型。同一个测试工程里同时引用两者会撞类型,
/// 所以应用器测试单独放这里,只引用守护进程。
///
/// 为什么需要这组用例:<c>--update-test</c> 覆盖的是「怎么判断该不该更新」,
/// <see cref="Applier"/> 才是会动用户安装目录的代码 —— 它出错就是用户目录被删空。
/// 全部在临时目录里跑,不碰真实安装、不联网。
/// </summary>
internal static class ApplierTests
{
private static int _failed;
private static string _root = "";
public static int Main()
{
_root = Path.Combine(Path.GetTempPath(), "gc-applier-" + Guid.NewGuid().ToString("N")[..8]);
Directory.CreateDirectory(_root);
Console.WriteLine("Applier 测试目录: " + _root);
try
{
CaseRefusesTraversalPackageName();
CaseRefusesShaMismatch();
CaseRefusesSourceTree();
CaseDryRunKeepsInstallUntouched();
CaseRollbackRestoresOldFiles();
CaseSuccessMergesGcBinAndKeepsUserData();
}
finally
{
try { Directory.Delete(_root, true); } catch { }
}
Console.WriteLine(_failed == 0
? "Applier 测试全部通过"
: $"Applier 测试失败 {_failed} 项");
return _failed == 0 ? 0 : 1;
}
// ------------------------------------------------------------------ 用例
/// <summary>包名带 ../ 时必须拒绝(路径穿越的第一道闸)。</summary>
private static void CaseRefusesTraversalPackageName()
{
var (install, update) = Sandbox("traversal");
WritePackage(update, new Dictionary<string, string>
{
["GCL-9.9.9-test-amd64.exe"] = "new"
});
WriteRequest(update, "../evil.exe", sha: null);
var code = Apply(update, install, dryRun: true);
Check("路径穿越的包名被拒绝", code == 3, $"exit={code}(期望 3)");
}
/// <summary>zip 内容与清单 sha256 不符时必须丢弃。</summary>
private static void CaseRefusesShaMismatch()
{
var (install, update) = Sandbox("sha");
WritePackage(update, new Dictionary<string, string>
{
["GCL-9.9.9-test-amd64.exe"] = "new"
});
WriteRequest(update, "GCL-9.9.9-test-amd64.exe", sha: new string('a', 64));
var code = Apply(update, install, dryRun: true);
Check("sha256 不符的包被丢弃", code == 5, $"exit={code}(期望 5)");
}
/// <summary>安装目录里有 GC.sln 时拒绝替换 —— 防止误在源码树里跑更新。</summary>
private static void CaseRefusesSourceTree()
{
var (install, update) = Sandbox("srctree");
File.WriteAllText(Path.Combine(install, "GC.sln"), "fake solution");
var zip = WritePackage(update, new Dictionary<string, string>
{
["GCL-9.9.9-test-amd64.exe"] = "new"
});
WriteRequest(update, "GCL-9.9.9-test-amd64.exe", Sha256File(zip));
var code = Apply(update, install, dryRun: false);
Check("源码目录被拒绝替换", code == 4, $"exit={code}(期望 4)");
Check("源码目录里的文件没被动过",
File.ReadAllText(Path.Combine(install, "GC.sln")) == "fake solution",
"GC.sln 内容变了");
}
/// <summary>dry-run 只校验不落盘:安装目录必须一个字节都不变。</summary>
private static void CaseDryRunKeepsInstallUntouched()
{
var (install, update) = Sandbox("dryrun");
File.WriteAllText(Path.Combine(install, "GCL-1.0.0-test-amd64.exe"), "old");
File.WriteAllText(Path.Combine(install, "only-in-old.txt"), "keep me");
var zip = WritePackage(update, new Dictionary<string, string>
{
["GCL-9.9.9-test-amd64.exe"] = "new",
["GC-UI.exe"] = "ui"
});
WriteRequest(update, "GCL-9.9.9-test-amd64.exe", Sha256File(zip));
var code = Apply(update, install, dryRun: true);
var names = Directory.GetFileSystemEntries(install).Select(Path.GetFileName).OrderBy(n => n).ToArray();
Check("dry-run 返回 0", code == 0, $"exit={code}");
Check("dry-run 不改安装目录",
names.SequenceEqual(new[] { "GCL-1.0.0-test-amd64.exe", "only-in-old.txt" }),
"安装目录变成: " + string.Join(", ", names));
}
/// <summary>
/// 新版本启动不健康 → 回滚:旧文件原样回来,新包独有的文件被删掉,zip 与申请被清理。
/// </summary>
private static void CaseRollbackRestoresOldFiles()
{
var (install, update) = Sandbox("rollback");
var oldExe = Path.Combine(install, "GCL-1.0.0-test-amd64.exe");
var oldOnly = Path.Combine(install, "only-in-old.txt");
File.WriteAllText(oldExe, "old-binary");
File.WriteAllText(oldOnly, "old-only");
// 新版什么都不做直接退出:健康标记不会出现,必然回滚
var zip = WritePackage(update, new Dictionary<string, string>
{
["GCL-9.9.9-test-amd64.exe"] = "#!/bin/sh\nexit 1\n",
["only-in-new.txt"] = "new-only"
});
WriteRequest(update, "GCL-9.9.9-test-amd64.exe", Sha256File(zip));
var code = Apply(update, install, dryRun: false, timeoutSeconds: 5);
Check("启动失败后回滚(exit=8)", code == 8, $"exit={code}(期望 8)");
Check("旧启动器被还原",
File.Exists(oldExe) && File.ReadAllText(oldExe) == "old-binary",
"旧启动器没回来");
Check("旧版独有文件被还原",
File.Exists(oldOnly) && File.ReadAllText(oldOnly) == "old-only",
"旧版独有文件没回来");
Check("新包独有文件被删除", !File.Exists(Path.Combine(install, "only-in-new.txt")),
"only-in-new.txt 残留");
Check("更新包与申请已清理",
!File.Exists(Path.Combine(update, "package.zip")) &&
!File.Exists(Path.Combine(update, "apply-request.json")),
"update 目录里还有残留");
}
/// <summary>正常路径:新文件就位、.GC/bin 被合并、.GC 下的用户数据原地不动。</summary>
private static void CaseSuccessMergesGcBinAndKeepsUserData()
{
var (install, update) = Sandbox("success");
var updateDirFull = Path.GetFullPath(update);
// 用户数据:设置、模型、守护进程源文件
Directory.CreateDirectory(Path.Combine(install, ".GC", "config"));
Directory.CreateDirectory(Path.Combine(install, ".GC", "model", "earth-rotation"));
Directory.CreateDirectory(Path.Combine(install, ".GC", "bin"));
File.WriteAllText(Path.Combine(install, ".GC", "config", "settings.json"), "{\"theme\":\"dark\"}");
File.WriteAllText(Path.Combine(install, ".GC", "model", "earth-rotation", "a.bin"), "model");
File.WriteAllText(Path.Combine(install, ".GC", "bin", "GC-SAVEDOG.exe"), "old-savedog");
// 假启动器:写健康标记后退出,模拟「新版本起来了」
var launcher =
"#!/bin/sh\n" +
"cat > '" + Path.Combine(updateDirFull, "health.json") + "' <<'JSON'\n" +
"{\"version\":\"9.9.9\",\"pid\":4242,\"at\":\"2026-01-01T00:00:00Z\",\"ok\":true}\n" +
"JSON\n" +
"exit 0\n";
var zip = WritePackage(update, new Dictionary<string, string>
{
["GCL-9.9.9-test-amd64.exe"] = launcher,
[".GC/bin/GC-SAVEDOG.exe"] = "new-savedog",
["GC-UI.exe"] = "ui"
});
WriteRequest(update, "GCL-9.9.9-test-amd64.exe", Sha256File(zip));
var code = Apply(update, install, dryRun: false, timeoutSeconds: 10);
Check("启动健康后更新成功(exit=0)", code == 0, $"exit={code}");
Check("新启动器就位",
File.Exists(Path.Combine(install, "GCL-9.9.9-test-amd64.exe")), "新启动器缺失");
Check("新前端就位", File.Exists(Path.Combine(install, "GC-UI.exe")), "GC-UI.exe 缺失");
Check(".GC/bin 被合并",
File.ReadAllText(Path.Combine(install, ".GC", "bin", "GC-SAVEDOG.exe")) == "new-savedog",
".GC/bin/GC-SAVEDOG.exe 没被替换");
Check("用户设置原样保留",
File.ReadAllText(Path.Combine(install, ".GC", "config", "settings.json")) == "{\"theme\":\"dark\"}",
"settings.json 被覆盖");
Check("模型目录原样保留",
File.Exists(Path.Combine(install, ".GC", "model", "earth-rotation", "a.bin")),
"模型文件被删除");
}
// ------------------------------------------------------------------ 辅助
private static int Apply(string updateDir, string installDir, bool dryRun, int timeoutSeconds = 10)
{
var log = new Log(Path.Combine(updateDir, "logs"));
var applier = new Applier(new ApplyOptions
{
UpdateDir = updateDir,
InstallDir = installDir,
DryRun = dryRun,
TimeoutSeconds = timeoutSeconds,
RequireSignature = false, // 用例不生成签名清单;验签本身由 --update-test 覆盖
Force = false
}, log);
return applier.Run();
}
private static (string Install, string Update) Sandbox(string name)
{
var baseDir = Path.Combine(_root, name);
var install = Path.Combine(baseDir, "app");
var update = Path.Combine(baseDir, "update");
Directory.CreateDirectory(install);
Directory.CreateDirectory(update);
File.WriteAllText(Path.Combine(update, "version.json"), "{\"launcher\":{\"version\":\"9.9.9\"}}");
return (install, update);
}
private static string WritePackage(string updateDir, IDictionary<string, string> files)
{
var zipPath = Path.Combine(updateDir, "package.zip");
try { File.Delete(zipPath); } catch { }
using (var archive = ZipFile.Open(zipPath, ZipArchiveMode.Create))
{
foreach (var (name, text) in files)
{
var entry = archive.CreateEntry(name.Replace('\\', '/'), CompressionLevel.Fastest);
using var stream = entry.Open();
var bytes = Encoding.UTF8.GetBytes(text);
stream.Write(bytes, 0, bytes.Length);
}
}
return zipPath;
}
/// <summary>手写申请文件:不引用 Json 序列化助手(同名类型在两个程序集里都有)。</summary>
private static void WriteRequest(string updateDir, string packageName, string? sha)
{
var zipPath = Path.Combine(updateDir, "package.zip");
var size = File.Exists(zipPath) ? new FileInfo(zipPath).Length : 0;
var json = new StringBuilder()
.Append("{\n")
.Append(" \"schema\": 1,\n")
.Append(" \"version\": \"9.9.9\",\n")
.Append(" \"rid\": \"test-amd64\",\n")
.Append(" \"platformLabel\": \"test-amd64\",\n")
.Append(" \"packageName\": ").Append(Quote(packageName)).Append(",\n")
.Append(" \"payloadDir\": \"payload\",\n")
.Append(" \"installRelative\": \"../app\",\n")
.Append(" \"manifestPath\": \"version.json\",\n")
.Append(" \"packageZip\": \"package.zip\",\n")
.Append(" \"packageSha256\": ").Append(sha == null ? "null" : Quote(sha)).Append(",\n")
.Append(" \"packageSize\": ").Append(size).Append(",\n")
.Append(" \"requireSignature\": false\n")
.Append("}\n")
.ToString();
File.WriteAllText(Path.Combine(updateDir, "apply-request.json"), json);
}
private static string Quote(string value) => "\"" + value.Replace("\\", "\\\\").Replace("\"", "\\\"") + "\"";
private static string Sha256File(string path)
{
using var stream = File.OpenRead(path);
return Convert.ToHexString(SHA256.HashData(stream)).ToLowerInvariant();
}
private static void Check(string label, bool ok, string detail)
{
if (ok)
{
Console.WriteLine(" ✓ " + label);
return;
}
_failed++;
Console.WriteLine($" ✗ {label} —— {detail}");
}
}
@@ -0,0 +1,21 @@
<Project Sdk="Microsoft.NET.Sdk">
<!--
应用器测试:只引用 GC-SAVEDOG。
不并入 GC.Tests 的原因见 ApplierTests.cs 顶部注释 —— 守护进程把 GC/src/Security
以源码链接编进了自己,与启动器程序集存在同名类型,同一工程内同时引用会撞类型。
-->
<PropertyGroup>
<OutputType>Exe</OutputType>
<Nullable>enable</Nullable>
<RootNamespace>GC.Savedog.Tests</RootNamespace>
<AssemblyName>GC.Savedog.Tests</AssemblyName>
<InvariantGlobalization>true</InvariantGlobalization>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="../../../../../GC-SAVEDOG/GC-SAVEDOG.csproj" />
</ItemGroup>
</Project>
+67
View File
@@ -0,0 +1,67 @@
using System;
using System.IO;
using System.Linq;
using GC.Services;
namespace GC.Tests;
/// <summary>
/// 日志模块的用例:双语写入、跨天文件命名、旧日志清理、不误删用户文件。
///
/// 这些看起来是小事,但 <c>.GC/logs</c> 会随程序跑很久:写入路径每行开两个文件句柄,
/// 或者完全不清理,都会在几个月后变成用户磁盘上的几 GB。用例锁住这两个行为。
/// </summary>
internal static class LogTests
{
private static int _failed;
public static int Run()
{
var dir = Path.Combine(Path.GetTempPath(), "gc-log-" + Guid.NewGuid().ToString("N")[..8]);
Directory.CreateDirectory(dir);
try
{
// 过期日志(2000 年)+ 用户自己的文件
var oldZh = Path.Combine(dir, "gc-20000101.log");
var oldEn = Path.Combine(dir, "gc-20000101.en.log");
var userFile = Path.Combine(dir, "keep-me.txt");
File.WriteAllText(oldZh, "old");
File.WriteAllText(oldEn, "old");
File.WriteAllText(userFile, "user data");
GcLog.Init(dir);
GcLog.Info("测试中文", "test english");
var day = DateTime.Now.ToString("yyyyMMdd");
var zhPath = Path.Combine(dir, $"gc-{day}.log");
var enPath = Path.Combine(dir, $"gc-{day}.en.log");
Check("中文日志写入", File.Exists(zhPath) && File.ReadAllText(zhPath).Contains("测试中文"), "中文日志缺失");
Check("英文日志写入", File.Exists(enPath) && File.ReadAllText(enPath).Contains("test english"), "英文日志缺失");
Check("过期日志被清理", !File.Exists(oldZh) && !File.Exists(oldEn), "2000 年的日志还在");
Check("目录里的用户文件不被误删", File.Exists(userFile), "keep-me.txt 被删了");
var names = Directory.GetFiles(dir).Select(Path.GetFileName).OrderBy(n => n).ToArray();
Check("日志目录只剩当天两份 + 用户文件",
names.Length == 3, "目录内容: " + string.Join(", ", names));
}
finally
{
try { Directory.Delete(dir, true); } catch { }
}
Console.WriteLine(_failed == 0 ? "日志测试全部通过" : $"日志测试失败 {_failed} 项");
return _failed;
}
private static void Check(string label, bool ok, string detail)
{
if (ok)
{
Console.WriteLine(" ✓ " + label);
return;
}
_failed++;
Console.WriteLine($" ✗ {label} —— {detail}");
}
}
+3 -1
View File
@@ -51,7 +51,9 @@ internal static class Program
RenderPages(services);
Console.WriteLine("截图输出: " + Path.GetFullPath(_outDir));
return 0;
// 日志模块的用例放在渲染之后:它会切换 GcLog 的输出目录
return LogTests.Run() == 0 ? 0 : 1;
}
/// <summary>
+2 -1
View File
@@ -69,7 +69,8 @@ Windows 用 `.\build.ps1`,参数相同(`build / check / models / stamp / run
就这些,没有一屏 dll。安装目录根只放 GC 本体,非本体文件(守护进程)一律收在 `.GC/bin`。
macOS 是同一个单文件启动器,只是被放进 `GCL-<版本>-mac-arm64.app/Contents/MacOS/`,
Flutter 前端作为 `GC-UI.app` 放在同一层。
Flutter 前端作为 `GC-UI.app` 放在同一层;`.GC` 位置不变,仍在启动器同级
(`.app/Contents/MacOS/`),守护进程同样收在 `.app/Contents/MacOS/.GC/bin/`。
首次启动后 `.GC` 补齐成:
+4 -2
View File
@@ -59,9 +59,11 @@ mkdir -p "$ROOT_DIR/build/logs"
. "$ROOT_DIR/buildsh/build.sh"
. "$ROOT_DIR/buildsh/check.sh"
. "$ROOT_DIR/buildsh/tools.sh"
. "$ROOT_DIR/buildsh/release.sh"
case "$TASK" in
build) bs_build "$ROOT_DIR" ;;
check) bs_check "$ROOT_DIR" ;;
build) bs_build "$ROOT_DIR" ;;
check) bs_check "$ROOT_DIR" ;;
release-verify) bs_verify_release "$ROOT_DIR" "$@" ;;
*) bs_tools "$ROOT_DIR" "$TASK" ;;
esac
+6 -1
View File
@@ -6,7 +6,12 @@ function Invoke-BuildTool {
'pack-models' { Build-Models; Pack-Models }
'pack-launcher'{ Pack-Launcher }
'run' { & dotnet run --project $script:AppProject -c Debug; if ($LASTEXITCODE -ne 0) { throw "dotnet run 失败,退出码 $LASTEXITCODE" } }
'test' { & dotnet run --project $script:TestProject -c Debug -- (Join-Path $script:BuildRoot 'build/screenshots'); if ($LASTEXITCODE -ne 0) { throw "测试失败,退出码 $LASTEXITCODE" } }
'test' {
& dotnet run --project $script:TestProject -c Debug -- (Join-Path $script:BuildRoot 'build/screenshots')
if ($LASTEXITCODE -ne 0) { throw "测试失败,退出码 $LASTEXITCODE" }
# 与 pr-check.yml 一致:应用器测试单独跑(它与启动器有同名类型,不能并入 GC.Tests)
Invoke-SavedogTests
}
'update-test' { & dotnet run --project $script:TestProject -c Debug -- --update-test $script:BuildRoot; if ($LASTEXITCODE -ne 0) { throw "更新测试失败,退出码 $LASTEXITCODE" } }
'clean' {
Remove-Item (Join-Path $script:BuildRoot 'build'), (Join-Path $script:BuildRoot 'dist') -Recurse -Force -ErrorAction SilentlyContinue
+7 -5
View File
@@ -1,7 +1,7 @@
param(
[Parameter(Position = 0)]
[ValidateSet('build','check','models','stamp','pack-models','pack-launcher',
'run','test','update-test','clean','doctor','dist')]
'release-verify','run','test','update-test','clean','doctor','dist')]
[string]$Task = 'build',
[string]$Version = ''
)
@@ -23,7 +23,8 @@ try {
if (-not $Version) { $Version = '1.0.0' }
$script:BuildVersion = $Version
if ($PSBoundParameters.ContainsKey('Version')) {
# release-verify 的 -Version 是「要核对的 tag」,不是改版本号:绝不能改写清单
if ($PSBoundParameters.ContainsKey('Version') -and $Task -ne 'release-verify') {
if ($null -eq $versionNode) { throw 'Directory.Build.props 中找不到 Version 节点。' }
$versionNode.InnerText = $Version
$props.Save((Join-Path $script:BuildRoot 'Directory.Build.props'))
@@ -37,9 +38,10 @@ try {
. (Join-Path $PSScriptRoot 'Build-Tools.ps1')
switch ($Task) {
'build' { Invoke-FullBuild }
'check' { Invoke-BuildCheck }
default { Invoke-BuildTool $Task }
'build' { Invoke-FullBuild }
'check' { Invoke-BuildCheck }
'release-verify' { Invoke-ReleaseVerify -Tag $Version }
default { Invoke-BuildTool $Task }
}
}
finally {
+145 -73
View File
@@ -18,7 +18,9 @@ function Invoke-ManifestSign {
Write-Host '!! 未找到签名私钥 .signing/gc-signing.pem,version.json 未签名(客户端会拒绝更新)'
return
}
$keyId = if ($env:GC_SIGNING_KEY_ID) { $env:GC_SIGNING_KEY_ID } else { 'gc-2026-11' }
# 与 buildsh/lib/build_funcs.sh 保持一致:当前生效的密钥是 gc-2026-12。
# gc-2026-11 的私钥没有留存,用它签出来的清单客户端永远验不过。
$keyId = if ($env:GC_SIGNING_KEY_ID) { $env:GC_SIGNING_KEY_ID } else { 'gc-2026-12' }
Write-Host "==> 签名 version.json ($keyId)"
Invoke-LoggedDotNet -Name 'sign' -Arguments @(
'run', '--project', (Join-Path $script:BuildRoot 'GC-SAVEDOG/GC-SAVEDOG.csproj'),
@@ -30,7 +32,7 @@ function Invoke-ManifestSign {
}
function Invoke-VersionStamp {
param([switch]$LauncherOnly)
param([switch]$LauncherOnly, [switch]$NoSign)
if ($LauncherOnly) {
Write-Host '==> 刷新启动器包信息(sha256 / 体积 / dist 路径)'
Invoke-LoggedDotNet -Name 'stamp' -Arguments @(
@@ -45,7 +47,14 @@ function Invoke-VersionStamp {
$script:BuildRoot, $script:BuildVersion
)
}
Invoke-ManifestSign
# 完整 build 末尾 Pack-Launcher 会统一签一次(末次签名);中间这次是浪费的。
# 单独的 stamp / models 工具没有后续打包,仍走默认签名。
if ($NoSign) {
Write-Host ' (跳过签名,打包结束后统一签一次)'
}
else {
Invoke-ManifestSign
}
}
function Build-Models {
@@ -78,44 +87,41 @@ function Prepare-RuntimeLayout {
$destination = Join-Path $script:BuildRoot $RelativePath
if (-not (Test-Path $destination)) { return }
Remove-Item (Join-Path $destination 'model'), (Join-Path $destination 'examples') -Recurse -Force -ErrorAction SilentlyContinue
New-Item -ItemType Directory -Force -Path (Join-Path $destination '.GC/model'), (Join-Path $destination '.GC/cache'), (Join-Path $destination '.GC/update'), (Join-Path $destination '.GC/config') | Out-Null
Set-Content -Path (Join-Path $destination '.GC/model/README.txt') -Encoding UTF8 -Value @'
模型库目录(.GC/model/)
启动时程序会读取 GitCode 仓库的 version.json,把最新版模型下载到这里。
离线使用也可以手动放入 <模型id>/<模型id>.json + <模型id>/<模型id>.model/。
运行目录:
<可执行文件>
GC-SAVEDOG 更新守护进程(验签 + 原子替换 + 失败回滚)
.GC/config/settings.json 用户设置(删 .GC/cache 不会丢配置)
.GC/model/ 本目录(下载的模型)
.GC/cache/ 下载暂存
.GC/update/ 待下次启动应用的启动器更新
'@
$settingsPath = Join-Path $destination '.GC/config/settings.json'
if (-not (Test-Path $settingsPath)) {
Set-Content -Path $settingsPath -Encoding UTF8 -Value @'
{
"language": "auto",
"theme": "light",
"renderFps": 30,
"memoryMb": 2048,
"autoUpdateOnStartup": true,
"requireSignedManifest": true,
"updateRepository": "https://gitcode.com/Morris_1/GC",
"updateManifestUrl": "",
"updateLocalRoot": "",
"installedModelVersions": {},
"launcherVersion": "",
"pendingLauncherVersion": "",
"lastUpdateCheck": "",
"sources": [],
"recentModels": []
# 与 buildsh/lib/build_funcs.sh 一致:发布目录只放程序本体,不预置 .GC。
# .GC(config / model / cache / update / safedog / logs)一律在首次启动时
# 由 AppPaths.EnsureCreated + RuntimeLayout 创建,压缩包里只有 GC 本体。
Remove-Item (Join-Path $destination 'model'), (Join-Path $destination 'examples'), (Join-Path $destination '.GC') -Recurse -Force -ErrorAction SilentlyContinue
Write-Host " 运行目录 -> $RelativePath(首次启动后生成 .GC/:config model cache update safedog logs)"
}
'@
function Prune-Package {
param(
[Parameter(Mandatory)][string]$Destination,
[Parameter(Mandatory)][ValidateSet('win', 'linux')][string]$Platform
)
if (-not (Test-Path $Destination)) { return }
$junk = @(
'mscordaccore.dll', 'mscordbi.dll', 'web.config',
'aspnetcorev2_inprocess.dll',
'Microsoft.AspNetCore.Server.IIS.dll',
'Microsoft.AspNetCore.Server.IISIntegration.dll',
'Microsoft.AspNetCore.Server.HttpSys.dll',
'Microsoft.DiaSymReader.Native.dll'
)
if ($Platform -eq 'win') {
# 后端已编入启动器,ProjectReference 残留的独立 exe / runtimeconfig 没有用
$junk += @('GC.UI.Server.exe', 'GC.UI.Server.dll', 'GC.UI.Server.deps.json', 'GC.UI.Server.runtimeconfig.json')
$junk += @('Avalonia.X11.dll', 'Avalonia.Native.dll', 'Avalonia.FreeDesktop.dll', 'Tmds.DBus.Protocol.dll')
}
Write-Host " 运行目录 -> $RelativePath/.GC"
else {
$junk += @('Avalonia.Win32.dll', 'Avalonia.Win32.Automation.dll')
}
foreach ($name in $junk) {
Get-ChildItem $Destination -Filter $name -File -ErrorAction SilentlyContinue | Remove-Item -Force -ErrorAction SilentlyContinue
}
# mscordaccore*.dll / Microsoft.DiaSymReader.Native*.dll 是带版本号通配的
Get-ChildItem $Destination -Filter 'mscordaccore*.dll' -File -ErrorAction SilentlyContinue | Remove-Item -Force -ErrorAction SilentlyContinue
Get-ChildItem $Destination -Filter 'Microsoft.DiaSymReader.Native*.dll' -File -ErrorAction SilentlyContinue | Remove-Item -Force -ErrorAction SilentlyContinue
}
function Publish-Rid {
@@ -132,18 +138,22 @@ function Publish-Rid {
'publish', $script:AppProject, '-c', 'Release', '-r', $Rid,
'--self-contained', 'true', "-p:Version=$script:BuildVersion", '-p:DebugType=none',
"-p:PublishSingleFile=$singleValue", "-p:IncludeNativeLibrariesForSelfExtract=$singleValue",
"-p:EnableCompressionInSingleFile=$singleValue",
'-p:PublishTrimmed=false', '-o', $outputPath
)
# 更新守护进程:与主程序同目录(裁剪单文件,70MB -> 14MB)
# 裁剪的前提是 JSON 全部走源生成上下文(GC-SAVEDOG/SavedogJson.cs)
# 更新守护进程:与主程序同目录(裁剪 + 压缩单文件,70MB -> 14MB)
# 裁剪的前提是 JSON 全部走源生成上下文(GC-SAVEDOG/SavedogJson.cs)。
# EnableCompressionInSingleFile:守护进程不常驻,只在更新时跑一次,
# 解压一次换来更小的包,对「只在更新时下载」的场景很划算。
$savedogProj = Join-Path $script:BuildRoot 'GC-SAVEDOG/GC-SAVEDOG.csproj'
if (Test-Path $savedogProj) {
Write-Host "==> 编译 GC-SAVEDOG ($Rid)(裁剪单文件)"
Write-Host "==> 编译 GC-SAVEDOG ($Rid)(裁剪 + 压缩单文件)"
Invoke-LoggedDotNet -Name "savedog-$($Rid -replace '-', '')" -Arguments @(
'publish', $savedogProj, '-c', 'Release', '-r', $Rid,
'--self-contained', 'true', "-p:Version=$script:BuildVersion", '-p:DebugType=none',
'-p:PublishSingleFile=true', '-p:IncludeNativeLibrariesForSelfExtract=true',
'-p:EnableCompressionInSingleFile=true',
'-p:PublishTrimmed=true', '-p:TrimMode=full',
'-p:JsonSerializerIsReflectionEnabledByDefault=false', '-o', $outputPath
)
@@ -178,35 +188,60 @@ function Pack-Models {
function Pack-Launcher {
$dist = Join-Path $script:BuildRoot 'dist'
Write-Host "==> 生成启动器产物(GC-$script:BuildVersion-<平台>)"
Write-Host "==> 生成启动器产物(GCL-$script:BuildVersion-<系统>-<架构>)"
# 与 buildsh/lib/build_funcs.sh 的 pack_launcher 对齐:
# 1) 包名统一 GCL- 前缀;
# 2) zip 内只有一个顶层目录(GCL-<版本>-<平台>),不散落一屏 dll;
# 3) 非本体文件(守护进程)收进 .GC/bin,安装目录根只留 GC 本体;
# 4) 剔除调试 / 无关平台的组件(prune)。
# --- Windows:启动器 + 守护进程 + 前端,整目录打进单顶层目录 ---
foreach ($platform in @(@{ Rid = 'win-x64'; Label = 'win-amd64' }, @{ Rid = 'win-arm64'; Label = 'win-arm64' })) {
# 产物落点 dist/<系统>-<架构>/,与 dist/mac-arm64 一致
$sourceDir = Join-Path $dist $platform.Label
if (-not (Test-Path $sourceDir)) { $sourceDir = Join-Path $dist $platform.Rid }
if (-not (Test-Path $sourceDir)) { continue }
# 注意排除守护进程:GC-SAVEDOG.exe 在字典序里排在 GC.exe 前面
$executable = Get-ChildItem $sourceDir -Filter '*.exe' |
Where-Object { $_.Name -notlike 'GC-SAVEDOG*' } | Select-Object -First 1
if ($null -eq $executable) { continue }
# 启动器固定是 GC.exe;后端与前端是可选的随包产物,不能当成启动器
$exe = Join-Path $sourceDir 'GC.exe'
if (-not (Test-Path $exe)) {
$exe = (Get-ChildItem $sourceDir -Filter '*.exe' | Where-Object {
$_.Name -notlike 'GC-SAVEDOG*' -and $_.Name -notlike 'GC.UI.Server*' -and $_.Name -notlike 'GC-UI*'
} | Select-Object -First 1).FullName
}
if (-not $exe) { continue }
$pkgName = "GCL-$script:BuildVersion-$($platform.Label)"
$temp = Join-Path $dist ".winpkg-$($platform.Label)"
$pkg = Join-Path $temp $pkgName
Remove-Item $temp -Recurse -Force -ErrorAction SilentlyContinue
New-Item -ItemType Directory -Force -Path $temp | Out-Null
Copy-Item $executable.FullName (Join-Path $temp "GC-$script:BuildVersion-$($platform.Label).exe") -Force
$savedogExe = Join-Path $sourceDir 'GC-SAVEDOG.exe'
if (Test-Path $savedogExe) { Copy-Item $savedogExe (Join-Path $temp 'GC-SAVEDOG.exe') -Force }
New-Item -ItemType Directory -Force -Path $pkg | Out-Null
Get-ChildItem $sourceDir -Force | Where-Object { $_.Extension -ne '.zip' } | Copy-Item -Destination $pkg -Recurse -Force
Prune-Package -Destination $pkg -Platform 'win'
Move-Item (Join-Path $pkg (Split-Path $exe -Leaf)) (Join-Path $pkg "$pkgName.exe") -Force
if (Get-Command chmod -ErrorAction SilentlyContinue) { & chmod +x (Join-Path $pkg "$pkgName.exe") 2>$null }
$zipPath = Join-Path $dist "$($platform.Label)/GC-$script:BuildVersion-$($platform.Label).zip"
$savedogExe = Join-Path $pkg 'GC-SAVEDOG.exe'
if (Test-Path $savedogExe) {
$binDir = Join-Path $pkg '.GC/bin'
New-Item -ItemType Directory -Force -Path $binDir | Out-Null
Move-Item $savedogExe (Join-Path $binDir 'GC-SAVEDOG.exe') -Force
}
else {
Write-Host " !! 缺少 GC-SAVEDOG.exe,该平台将退回旧脚本更新"
}
$zipPath = Join-Path $dist "$($platform.Label)/$pkgName.zip"
Remove-Item $zipPath -Force -ErrorAction SilentlyContinue
Compress-Archive -Path (Join-Path $temp '*') -DestinationPath $zipPath -CompressionLevel Optimal
Compress-Archive -Path $pkg -DestinationPath $zipPath -CompressionLevel Optimal
Remove-Item $temp -Recurse -Force -ErrorAction SilentlyContinue
Write-Host " -> dist/$($platform.Label)/GC-$script:BuildVersion-$($platform.Label).zip"
Write-Host " -> dist/$($platform.Label)/$pkgName.zip"
}
# --- macOS:先得到真实 .app 目录(改名 + 同步 Info.plist + 守护进程入 .GC/bin) ---
$macApp = Join-Path $dist 'mac-arm64/GC.app'
if (Test-Path $macApp) {
$finalApp = Join-Path $dist "GC-$script:BuildVersion-mac-arm64.app"
$finalApp = Join-Path $dist "GCL-$script:BuildVersion-mac-arm64.app"
Remove-Item $finalApp -Recurse -Force -ErrorAction SilentlyContinue
Move-Item $macApp $finalApp
$binary = Join-Path $finalApp 'Contents/MacOS/GC'
@@ -216,20 +251,25 @@ function Pack-Launcher {
& /usr/libexec/PlistBuddy -c 'Set :CFBundleName Morris GC' $plist 2>$null
& /usr/libexec/PlistBuddy -c 'Set :CFBundleDisplayName Morris GC' $plist 2>$null
}
# 非本体文件收进 .GC/bin(与 Windows 布局一致):.GC 位置不变,仍在 .app/Contents/MacOS/
$savedog = Join-Path $finalApp 'Contents/MacOS/GC-SAVEDOG'
if (Test-Path $savedog) {
$binDir = Join-Path $finalApp 'Contents/MacOS/.GC/bin'
New-Item -ItemType Directory -Force -Path $binDir | Out-Null
Move-Item $savedog (Join-Path $binDir 'GC-SAVEDOG') -Force
if (Get-Command chmod -ErrorAction SilentlyContinue) { & chmod +x (Join-Path $binDir 'GC-SAVEDOG') 2>$null }
}
if (Get-Command xattr -ErrorAction SilentlyContinue) { & xattr -cr $finalApp 2>$null }
}
# Windows 的 zip 已在上面的循环里生成(含 GC-SAVEDOG.exe),这里只处理 .app
Get-ChildItem $dist | Where-Object { $_.Name -like "GC-$script:BuildVersion-*.app" } | ForEach-Object {
$label = $_.BaseName -replace "^GC-$([regex]::Escape($script:BuildVersion))-", ''
# --- 统一压缩:.app -> 同名 .zip,放进平台目录 ---
Get-ChildItem $dist | Where-Object { $_.Name -like "GCL-$script:BuildVersion-*.app" } | ForEach-Object {
$label = $_.BaseName -replace "^GCL-$([regex]::Escape($script:BuildVersion))-", ''
$targetDir = Join-Path $dist $label
New-Item -ItemType Directory -Force -Path $targetDir | Out-Null
$zipPath = Join-Path $targetDir ($_.BaseName + '.zip')
Remove-Item $zipPath -Force -ErrorAction SilentlyContinue
if ($_.PSIsContainer) {
Remove-Item (Join-Path $_.FullName 'Contents/MacOS/.GC') -Recurse -Force -ErrorAction SilentlyContinue
}
if ($_.PSIsContainer -and (Get-Command ditto -ErrorAction SilentlyContinue)) {
if (Get-Command ditto -ErrorAction SilentlyContinue) {
& ditto -c -k --sequesterRsrc --keepParent $_.FullName $zipPath
if ($LASTEXITCODE -ne 0) { throw "ditto 压缩失败:$($_.Name)" }
}
@@ -239,26 +279,26 @@ function Pack-Launcher {
Write-Host " -> dist/$label/$($_.BaseName).zip"
}
# 原始产物(.exe / .app 目录)不再保留:只发布 zip
# 原始产物(.exe / .app 目录)不再保留:只发布 zip(移入暂存区,不做递归删除)
$trash = Join-Path $script:BuildRoot 'build/trash'
New-Item -ItemType Directory -Force -Path $trash | Out-Null
Get-ChildItem $dist -Force | Where-Object {
$_.Name -like "GC-$script:BuildVersion-*.exe" -or $_.Name -like "GC-$script:BuildVersion-*.app"
$_.Name -like "GCL-$script:BuildVersion-*.exe" -or $_.Name -like "GCL-$script:BuildVersion-*.app"
} | ForEach-Object {
Move-Item $_.FullName (Join-Path $trash "$($_.Name)-$([DateTime]::Now.Ticks)") -Force -ErrorAction SilentlyContinue
}
Remove-IntermediateDirectories
Invoke-VersionStamp -LauncherOnly
Write-Host '==> dist 可发布 zip:'
Get-ChildItem $dist -Recurse -Filter "GC-$script:BuildVersion-*.zip" | Select-Object FullName, Length
Get-ChildItem $dist -Recurse -Filter "GCL-$script:BuildVersion-*.zip" | Select-Object FullName, Length
}
function Remove-IntermediateDirectories {
# 平台目录里只留最终 zip(其它都是 publish 中间产物)
foreach ($name in @('win-amd64', 'win-x64', 'win-arm64', 'mac-arm64')) {
foreach ($name in @('win-amd64', 'win-x64', 'win-arm64', 'mac-arm64', 'linux-arm64', 'linux-x64')) {
$dir = Join-Path $script:BuildRoot "dist/$name"
if (-not (Test-Path $dir)) { continue }
Get-ChildItem $dir -Force | Where-Object { $_.Name -notlike "GC-$script:BuildVersion-*.zip" } |
Get-ChildItem $dir -Force | Where-Object { $_.Name -notlike "GCL-$script:BuildVersion-*.zip" } |
Remove-Item -Recurse -Force -ErrorAction SilentlyContinue
}
Get-ChildItem (Join-Path $script:BuildRoot 'dist') -Filter '.DS_Store' -Recurse -Force -ErrorAction SilentlyContinue | Remove-Item -Force
@@ -314,6 +354,36 @@ function New-MacAppBundle {
Write-Host "==> 已打包 $app"
}
function Invoke-SavedogTests {
$proj = Join-Path $script:BuildRoot 'GC/src/test/dotnet/GC.Savedog.Tests/GC.Savedog.Tests.csproj'
Write-Host '==> 运行应用器测试(整目录替换 / .GC/bin 合并 / 回滚)'
& dotnet run --project $proj -c Debug
if ($LASTEXITCODE -ne 0) { throw "应用器测试失败,退出码 $LASTEXITCODE" }
}
function Invoke-ReleaseVerify {
param([string]$Tag = '')
$root = $script:BuildRoot
$verifyTag = if ($Tag) { $Tag } else { $script:BuildVersion }
$work = Join-Path $root 'build/release-verify'
New-Item -ItemType Directory -Force -Path $work | Out-Null
Write-Host "==> 核对 Release $verifyTag"
$dump = Join-Path $work "$verifyTag.json"
& python3 (Join-Path $root 'buildsh/lib/verify_release.py') `
--tag $verifyTag `
--manifest (Join-Path $root 'version.json') `
--dump-manifest $dump
if ($LASTEXITCODE -ne 0) { throw "发布一致性核对未通过(tag $verifyTag)" }
Write-Host ''
Write-Host '==> 校验 tag 清单签名'
& dotnet run --project (Join-Path $root 'GC-SAVEDOG/GC-SAVEDOG.csproj') -c Release -- `
verify --manifest $dump
if ($LASTEXITCODE -ne 0) { throw '清单签名校验未通过,客户端会拒绝这次更新' }
Write-Host '结论: 签名可信,可以发布 / 已经发布正确'
}
function Invoke-FullBuild {
Initialize-BuildProgress @('清理旧产物', '版本戳', '编译 Mac', '编译 Win-x64', '编译 Win-arm64', '运行骨架', '打包 zip', '收尾')
try {
@@ -322,10 +392,12 @@ function Invoke-FullBuild {
New-Item -ItemType Directory -Force -Path (Join-Path $script:BuildRoot 'dist') | Out-Null
Complete-BuildStep
Start-BuildStep '版本戳'; Invoke-VersionStamp; Complete-BuildStep
Start-BuildStep '编译 Mac'; Publish-Rid 'osx-arm64' 'dist/mac-arm64' $false; Complete-BuildStep
Start-BuildStep '编译 Win-x64'; Publish-Rid 'win-x64' 'dist/win-amd64' $false; Complete-BuildStep
Start-BuildStep '编译 Win-arm64'; Publish-Rid 'win-arm64' 'dist/win-arm64' $false; Complete-BuildStep
# 末次签名:这里只生成清单不签名,Pack-Launcher 打完包后统一签一次
Start-BuildStep '版本戳'; Invoke-VersionStamp -NoSign; Complete-BuildStep
# 与 buildsh 一致:启动器与守护进程都发布为压缩单文件,非本体文件在打包时收进 .GC/bin
Start-BuildStep '编译 Mac'; Publish-Rid 'osx-arm64' 'dist/mac-arm64' $true; Complete-BuildStep
Start-BuildStep '编译 Win-x64'; Publish-Rid 'win-x64' 'dist/win-amd64' $true; Complete-BuildStep
Start-BuildStep '编译 Win-arm64'; Publish-Rid 'win-arm64' 'dist/win-arm64' $true; Complete-BuildStep
Start-BuildStep '运行骨架'
New-MacAppBundle
@@ -337,7 +409,7 @@ function Invoke-FullBuild {
Start-BuildStep '打包 zip'; Pack-Launcher; Complete-BuildStep
Start-BuildStep '收尾'; Complete-BuildStep
Write-Host '==> 完成,产物:'
Get-ChildItem (Join-Path $script:BuildRoot 'dist') -Recurse -Filter "GC-$script:BuildVersion-*.zip" | Select-Object FullName, Length
Get-ChildItem (Join-Path $script:BuildRoot 'dist') -Recurse -Filter "GCL-$script:BuildVersion-*.zip" | Select-Object FullName, Length
}
finally { Complete-BuildProgress }
}
+3 -1
View File
@@ -71,7 +71,9 @@ bs_build() {
fi
progress_step "版本戳"; progress_tick 100
stamp_versions
# 末次签名:这里只生成清单不签名,等 pack_launcher 打完 zip、刷新完包信息后统一签一次。
# 避免 ECDSA 随机签名 + 时间戳导致清单在中间反复变化。
stamp_versions --no-sign
# 每个 publish 用后台任务包裹,边跑边按「已用时/预估用时」推进当前步骤进度
_run_publish() {
+13
View File
@@ -44,6 +44,19 @@ string(REPLACE "#define VERSION_AS_STRING FLUTTER_VERSION"
_rc_text "${_rc_text}")
file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/Runner.cross.rc" "${_rc_text}")
# ★ DPI 清单必须自己嵌进去。
#
# windows/runner/CMakeLists.txt 把 runner.exe.manifest 当源文件列进 target,
# Visual Studio 生成器会把它交给链接器(/MANIFESTINPUT)自动嵌入;
# 但这里的交叉编译只用 windres 编 Runner.rc,CMake 不会做这一步,
# 编出来的 GC-UI.exe 就完全没有清单 —— Windows 当它「DPI 不感知」,
# 在 125% / 150% 缩放的屏幕上整体位图拉伸,界面全是糊的。
#
# 因此把清单直接写成资源条目:id 1 = CREATEPROCESS_MANIFEST_RESOURCE_ID,
# type 24 = RT_MANIFEST。windres 不按相对路径解析,这里给绝对路径。
file(APPEND "${CMAKE_CURRENT_BINARY_DIR}/Runner.cross.rc"
"\n1 24 \"${RUN_DIR}/runner.exe.manifest\"\n")
add_executable(${BINARY_NAME} WIN32
"${RUN_DIR}/main.cpp"
"${RUN_DIR}/flutter_window.cpp"
+22 -25
View File
@@ -6,10 +6,17 @@
if ! type step >/dev/null 2>&1; then step() { echo "==> $1"; }; fi
if ! type progress >/dev/null 2>&1; then progress() { :; }; fi
# $1=--no-sign 时只生成清单、不签名。
# 完整 build 会在 pack_launcher 末尾统一签一次(末次签名),中间这次签名是浪费的:
# ECDSA 用随机 nonce + signedAt 时间戳,每次签名字节都不同,白白多一次全量签名,
# 也让中间产物反复抖动。单独的 stamp / models 工具没有后续打包,仍走默认签名。
stamp_versions() {
echo "==> 自动计算模型版本并生成 version.json"
dotnet run --project "$STAMP_PROJ" -c Release -- "$ROOT_DIR" "$VERSION"
sign_manifest
case "${1:-}" in
--no-sign) echo " (跳过签名,打包结束后统一签一次)" ;;
*) sign_manifest ;;
esac
}
# 打完 zip 之后刷新 launcher.packages(写入 path / dir / name / sha256 / size)。
@@ -168,7 +175,7 @@ pack_models() {
ZIP="$ROOT_DIR/dist/models-$VERSION.zip"
rm -f "$ZIP"
echo "==> 打包模型数据 -> dist/models-$VERSION.zip"
( cd "$ROOT_DIR" && zip -qr "$ZIP" model \
( cd "$ROOT_DIR" && zip -qrX "$ZIP" model \
-x "*.DS_Store" "*/bin/*" "*/obj/*" "*.user" )
du -sh "$ZIP"
}
@@ -188,24 +195,6 @@ pack_models() {
# macOS: .app 必须打成 zip 才能作为单文件分发;文件名用 .app.zip,
# 这样 macOS 双击会用归档工具解压出可运行的 .app。
# 若直接命名 .app,系统会把 zip 当成应用包解析 => 报「已损坏/打不开」。
# 发布本地 UI 后端(GC.UI.Server)。启动器会拉起它并等待 /api/health,
# 模型窗口也由它承载,所以必须和启动器放在同一目录。
publish_backend() {
RID="$1"; OUT="$2"
echo "==> 编译 UI 后端 (${RID}) -> ${OUT}"
dotnet publish "$ROOT_DIR/GC-UI/backend/GC.UI.Server/GC.UI.Server.csproj" \
-c Release \
-r "$RID" \
--self-contained true \
-p:Version="$VERSION" \
-p:DebugType=none \
-p:PublishSingleFile=true \
-p:IncludeNativeLibrariesForSelfExtract=true \
-p:EnableCompressionInSingleFile=true \
-p:PublishTrimmed=false \
-o "$ROOT_DIR/$OUT" || return 1
}
# 当前主机原生构建 Flutter 前端(Windows 主机编 Windows,macOS 主机编 macOS,
# Linux 主机编 Linux)。跨平台的 Windows 版由 build_flutter_ui_cross 负责。
#
@@ -339,7 +328,7 @@ pack_launcher() {
ZIP="$ROOT_DIR/dist/$LABEL/$PKGNAME.zip"
rm -f "$ZIP"
( cd "$TMP" && zip -qr "$ZIP" "$PKGNAME" )
( cd "$TMP" && zip -qrX "$ZIP" "$PKGNAME" )
rm -rf "$TMP"
echo " -> dist/$LABEL/$PKGNAME.zip"
done
@@ -367,7 +356,7 @@ pack_launcher() {
fi
ZIP="$ROOT_DIR/dist/linux-arm64/$PKGNAME.zip"
rm -f "$ZIP"
( cd "$TMP" && zip -qry "$ZIP" "$PKGNAME" )
( cd "$TMP" && zip -qryX "$ZIP" "$PKGNAME" )
rm -rf "$TMP"
echo " -> dist/linux-arm64/$PKGNAME.zip"
fi
@@ -384,6 +373,13 @@ pack_launcher() {
/usr/libexec/PlistBuddy -c "Set :CFBundleName Morris GC" "$PLIST" 2>/dev/null || true
/usr/libexec/PlistBuddy -c "Set :CFBundleDisplayName Morris GC" "$PLIST" 2>/dev/null || true
fi
# 非本体文件收进 .GC/bin(与 Windows 布局一致):.GC 位置不变,仍在启动器同级
# (也就是 .app/Contents/MacOS/),首次启动复制到 .GC/safedog 再运行。
if [ -f "$FINAL/Contents/MacOS/GC-SAVEDOG" ]; then
mkdir -p "$FINAL/Contents/MacOS/.GC/bin"
mv "$FINAL/Contents/MacOS/GC-SAVEDOG" "$FINAL/Contents/MacOS/.GC/bin/"
chmod +x "$FINAL/Contents/MacOS/.GC/bin/GC-SAVEDOG" 2>/dev/null || true
fi
xattr -cr "$FINAL" 2>/dev/null || true
echo " -> $(basename "$FINAL")/"
fi
@@ -405,10 +401,10 @@ pack_launcher() {
if command -v ditto >/dev/null 2>&1; then
ditto -c -k --sequesterRsrc --keepParent "$art" "$ZIP"
else
( cd "$(dirname "$art")" && zip -qry "$ZIP" "$base" -x "*.DS_Store" )
( cd "$(dirname "$art")" && zip -qryX "$ZIP" "$base" -x "*.DS_Store" )
fi
else
( cd "$(dirname "$art")" && zip -q "$ZIP" "$base" )
( cd "$(dirname "$art")" && zip -qX "$ZIP" "$base" )
fi
echo " -> dist/${label}/${name}.zip"
done
@@ -489,7 +485,8 @@ PLIST
fi
fi
# 发布包不带 .GC 运行骨架(用户首次启动自行创建),避免覆盖用户数据
# 清掉模板类 .GC(config / model / cache / update / logs):首次启动自行创建,
# 包里只保留 .GC/bin 这一个由 pack_launcher 补上的非本体文件目录。
rm -rf "$APP/Contents/MacOS/.GC"
chmod +x "$APP/Contents/MacOS/GC"
echo "==> 已打包 $APP"
+211
View File
@@ -0,0 +1,211 @@
#!/usr/bin/env python3
"""核对「仓库清单 ↔ Release 资产」是否对得上。
为什么需要它:清单里的 sha256 是客户端验证下载包的唯一依据。一旦 Release 上的资产
和清单不是同一份(换过一次构建、上传了别的产物、tag 指到了旧提交),客户端会验签
失败或直接回滚 —— 用户看到的是「更新失败了」,而服务端一切正常。
检查项:
1. tag 指向的 version.json 里的 launcher.version 等于 tag 名;
2. 清单里带 sha256 的平台,Release 上有同名资产,且体积 / sha256 完全一致;
3. 清单里没有 sha256 的平台(本次没构建)不要求有资产,但会列出;
4. Release 上多出来的资产(清单里没有)单独提示;
5. 本地清单与 tag 上的清单是否字节一致。
只用标准库,Linux / macOS / Windows 上都能跑。
"""
from __future__ import annotations
import argparse
import hashlib
import json
import os
import sys
import urllib.error
import urllib.request
DEFAULT_BASE = os.environ.get("GC_GITEA_URL", "https://git.xhmcl.com")
DEFAULT_REPO = os.environ.get("GC_GITEA_REPO", "Morris/GC")
def log(msg: str = "") -> None:
print(msg, flush=True)
def http_json(url: str, token: str | None) -> dict:
req = urllib.request.Request(url)
req.add_header("Accept", "application/json")
if token:
req.add_header("Authorization", "token " + token)
with urllib.request.urlopen(req, timeout=60) as resp:
return json.loads(resp.read().decode("utf-8"))
def download_sha256(url: str, token: str | None, dest: str) -> tuple[int, str]:
req = urllib.request.Request(url)
if token:
req.add_header("Authorization", "token " + token)
digest = hashlib.sha256()
size = 0
with urllib.request.urlopen(req, timeout=600) as resp, open(dest, "wb") as out:
while True:
chunk = resp.read(1 << 20)
if not chunk:
break
size += len(chunk)
digest.update(chunk)
out.write(chunk)
return size, digest.hexdigest()
def main() -> int:
parser = argparse.ArgumentParser(description="核对清单与 Release 资产")
parser.add_argument("--tag", required=True, help="要核对的 tag,例如 1.1.0")
parser.add_argument("--manifest", default="version.json", help="本地清单路径(用于对比)")
parser.add_argument("--base-url", default=DEFAULT_BASE)
parser.add_argument("--repo", default=DEFAULT_REPO)
parser.add_argument("--token", default=os.environ.get("GC_GITEA_TOKEN"))
parser.add_argument("--workdir", default=None, help="下载临时目录(默认系统临时目录)")
parser.add_argument("--skip-download", action="store_true",
help="只核对清单体积与资产列表,不下载算哈希")
parser.add_argument("--dump-manifest", default=None,
help="把 tag 上的清单原样写到这个路径(供 GC-SAVEDOG verify 验签)")
args = parser.parse_args()
tag = args.tag.strip()
if tag.startswith("v"):
tag = tag[1:]
api = f"{args.base_url}/api/v1/repos/{args.repo}"
workdir = args.workdir or os.path.join(os.path.dirname(os.path.abspath(__file__)), "..", "..", "build", "release-verify")
workdir = os.path.abspath(workdir)
os.makedirs(workdir, exist_ok=True)
failures: list[str] = []
warnings: list[str] = []
# ---- 1. tag 上的清单 ----
try:
remote = http_json(f"{api}/raw/version.json?ref={tag}", args.token)
except urllib.error.HTTPError as exc:
log(f"!! 取不到 tag {tag} 的 version.json(HTTP {exc.code})")
return 1
if args.dump_manifest:
os.makedirs(os.path.dirname(os.path.abspath(args.dump_manifest)), exist_ok=True)
with open(args.dump_manifest, "w", encoding="utf-8") as fh:
json.dump(remote, fh, ensure_ascii=False, indent=2)
launcher = remote.get("launcher") or {}
remote_version = str(launcher.get("version") or "")
log(f"tag : {tag}")
log(f"清单版本 : {remote_version or '(空)'}")
if remote_version != tag:
failures.append(f"tag 指向的清单版本是 {remote_version!r},与 tag {tag} 不一致")
# 签名状态:交给 GC-SAVEDOG verify 判定(这里只提示有没有签名段)
if not remote.get("signature"):
failures.append("tag 上的清单没有签名段")
else:
log(f"清单签名 : {remote['signature'].get('keyId', '?')}")
# ---- 2. Release 与资产 ----
try:
release = http_json(f"{api}/releases/tags/{tag}", args.token)
except urllib.error.HTTPError as exc:
log(f"!! 取不到 Release {tag}(HTTP {exc.code})")
return 1
assets = {a["name"]: a for a in release.get("assets") or []}
log(f"Release : id={release.get('id')} prerelease={release.get('prerelease')}")
log(f"资产数量 : {len(assets)}")
packages = launcher.get("packages") or {}
declared: set[str] = set()
log("")
log(f"{'平台':<12} {'包':<32} {'结果'}")
log("-" * 78)
for rid, pkg in packages.items():
name = str(pkg.get("name") or "")
want_sha = str(pkg.get("sha256") or "")
want_size = int(pkg.get("size") or 0)
if not name:
warnings.append(f"{rid}: 清单条目没有 name")
continue
declared.add(name)
asset = assets.get(name)
if not want_sha:
log(f"{rid:<12} {name:<32} 未构建(清单无 sha256)")
if asset:
warnings.append(f"{rid}: 清单没记录哈希,但 Release 上有 {name}")
continue
if not asset:
log(f"{rid:<12} {name:<32} ✗ 资产缺失")
failures.append(f"{rid}: Release 上找不到 {name}")
continue
if int(asset.get("size") or 0) != want_size:
log(f"{rid:<12} {name:<32} ✗ 体积不符 {asset.get('size')} != {want_size}")
failures.append(f"{rid}: {name} 体积 {asset.get('size')},清单 {want_size}")
continue
if args.skip_download:
log(f"{rid:<12} {name:<32} ✓ 体积一致(未下载)")
continue
url = asset.get("browser_download_url") or f"{args.base_url}/{args.repo}/releases/download/{tag}/{name}"
dest = os.path.join(workdir, name)
try:
size, sha = download_sha256(url, args.token, dest)
os.remove(dest)
except Exception as exc: # noqa: BLE001 - 下载失败一律按失败上报
log(f"{rid:<12} {name:<32} ✗ 下载失败: {exc}")
failures.append(f"{rid}: 下载 {name} 失败: {exc}")
continue
if size != want_size or sha != want_sha:
log(f"{rid:<12} {name:<32} ✗ sha256 不符")
log(f" 期望 {want_sha}")
log(f" 实际 {sha}")
failures.append(f"{rid}: {name} sha256 与清单不符")
else:
log(f"{rid:<12} {name:<32} ✓ {size:,} B sha {sha[:16]}…")
extra = sorted(set(assets) - declared)
if extra:
warnings.append("Release 上有清单未声明的资产: " + ", ".join(extra))
# ---- 3. 本地清单对比 ----
if os.path.isfile(args.manifest):
with open(args.manifest, "rb") as fh:
local_raw = fh.read()
local = json.loads(local_raw.decode("utf-8"))
local_packages = (local.get("launcher") or {}).get("packages") or {}
if local_packages != packages:
warnings.append("本地清单的 packages 与 tag 上的不一致(本地可能是未发布的构建)")
else:
log("")
log("本地清单与 tag 上的 packages 一致")
# ---- 汇总 ----
log("")
for w in warnings:
log("警告: " + w)
if failures:
for f in failures:
log("失败: " + f)
log("")
log("结论: 不一致 —— 客户端会拒绝或回滚这次更新")
return 1
log("结论: 一致 —— 清单、tag、资产三者对得上")
return 0
if __name__ == "__main__":
sys.exit(main())
+42
View File
@@ -0,0 +1,42 @@
#!/bin/sh
# buildsh/release.sh —— 发布一致性核对
#
# ./build.sh release-verify # 核对当前版本号对应的 tag
# ./build.sh release-verify 1.1.0 # 核对指定 tag
# ./build.sh release-verify 1.1.0 --skip-download # 只看体积,不下载
#
# 检查的是「tag 指向的清单 / Release 上的资产 / 清单里的 sha256」三者是否互相对得上。
# 客户端的升级判断完全依赖这三者:任何一处错位,用户侧就是验签失败或安全回滚。
bs_verify_release() {
ROOT_DIR="$1"; shift
TAG="${1:-$VERSION}"
if [ "$#" -gt 0 ]; then shift; fi
WORK="$ROOT_DIR/build/release-verify"
mkdir -p "$WORK"
echo "==> 核对 Release ${TAG}"
rc=0
python3 "$ROOT_DIR/buildsh/lib/verify_release.py" \
--tag "$TAG" \
--manifest "$ROOT_DIR/version.json" \
--dump-manifest "$WORK/$TAG.json" \
"$@" || rc=$?
if [ "$rc" -ne 0 ]; then
return "$rc"
fi
# 资产对得上还不够:清单本身必须是我签的,否则客户端一样会拒
echo ""
echo "==> 校验 tag 清单签名"
if dotnet run --project "$ROOT_DIR/GC-SAVEDOG/GC-SAVEDOG.csproj" -c Release -- \
verify --manifest "$WORK/$TAG.json"; then
echo "结论: 签名可信,可以发布 / 已经发布正确"
return 0
fi
echo "!! 签名校验未通过,客户端会拒绝这次更新"
return 1
}
+1 -1
View File
@@ -26,7 +26,7 @@ bs_tools() {
dotnet --info | head -20 ;;
dist)
echo "==> dist 产物:"
ls -lh "$ROOT_DIR"/dist/*/GC-*.zip 2>/dev/null || ls -lh "$ROOT_DIR"/dist 2>/dev/null || true ;;
ls -lh "$ROOT_DIR"/dist/*/GCL-*.zip 2>/dev/null || ls -lh "$ROOT_DIR"/dist 2>/dev/null || true ;;
*)
echo "未知工具: $TASK"; return 1 ;;
esac
+1 -1
View File
@@ -26,5 +26,5 @@
"frame": "#0A1524"
},
"build": "773ab2161d",
"updatedAt": "2026-11-18T10:16:41Z"
"updatedAt": "2026-11-19T10:20:00Z"
}
+1 -1
View File
@@ -26,5 +26,5 @@
"frame": "#0A1524"
},
"build": "cc68b8863b",
"updatedAt": "2026-11-18T10:16:41Z"
"updatedAt": "2026-11-19T10:20:00Z"
}
+1 -1
View File
@@ -32,5 +32,5 @@
"frame": "#0A1524"
},
"build": "53b7a0fbc3",
"updatedAt": "2026-11-18T10:16:41Z"
"updatedAt": "2026-11-19T10:20:00Z"
}
+1 -1
View File
@@ -32,5 +32,5 @@
"frame": "#0A1524"
},
"build": "ecd52665f9",
"updatedAt": "2026-11-18T10:16:41Z"
"updatedAt": "2026-11-19T10:20:00Z"
}
+1 -1
View File
@@ -33,5 +33,5 @@
"frame": "#F4F6FB"
},
"build": "105653737d",
"updatedAt": "2026-11-18T10:16:41Z"
"updatedAt": "2026-11-19T10:20:00Z"
}
+29 -29
View File
@@ -1,46 +1,46 @@
{
"schema": 1,
"generated": "2026-11-18T13:05:57Z",
"generated": "2026-11-19T10:20:00Z",
"repository": "https://git.xhmcl.com/Morris/GC",
"branch": "main",
"modelDir": "model",
"launcher": {
"version": "1.0.11",
"version": "1.1.1",
"revision": "",
"packages": {
"win-x64": {
"path": "dist/win-amd64/GCL-1.0.11-win-amd64.zip",
"path": "dist/win-amd64/GCL-1.1.1-win-amd64.zip",
"dir": "dist/win-amd64",
"name": "GCL-1.0.11-win-amd64.zip",
"url": "https://git.xhmcl.com/Morris/GC/releases/download/1.0.11/GCL-1.0.11-win-amd64.zip",
"sha256": "55f1d5eb0dfdfc243656e6705c3d276dd83611561f913fe5ca9e6e5d2f2dd658",
"size": 74973271
"name": "GCL-1.1.1-win-amd64.zip",
"url": "https://git.xhmcl.com/Morris/GC/releases/download/1.1.1/GCL-1.1.1-win-amd64.zip",
"sha256": "a03532606121280a1553ea73e56d6f9e8cc6cd9eefaf49f8c62857733199c10f",
"size": 74993562
},
"win-arm64": {
"path": "dist/win-arm64/GCL-1.0.11-win-arm64.zip",
"path": "dist/win-arm64/GCL-1.1.1-win-arm64.zip",
"dir": "dist/win-arm64",
"name": "GCL-1.0.11-win-arm64.zip",
"url": "https://git.xhmcl.com/Morris/GC/releases/download/1.0.11/GCL-1.0.11-win-arm64.zip",
"sha256": "9ce48381fcca18e7d6789364e1c43f7e616ceae529c0c1167b099ed762f5808f",
"size": 72515856
"name": "GCL-1.1.1-win-arm64.zip",
"url": "https://git.xhmcl.com/Morris/GC/releases/download/1.1.1/GCL-1.1.1-win-arm64.zip",
"sha256": "0cd3e045fbc2415bb170e545bb720841eb4c5ebc01a98e03105618a2b7bace46",
"size": 72535103
},
"osx-arm64": {
"path": "dist/mac-arm64/GCL-1.0.11-mac-arm64.zip",
"path": "dist/mac-arm64/GCL-1.1.1-mac-arm64.zip",
"dir": "dist/mac-arm64",
"name": "GCL-1.0.11-mac-arm64.zip",
"url": "https://git.xhmcl.com/Morris/GC/releases/download/1.0.11/GCL-1.0.11-mac-arm64.zip"
"name": "GCL-1.1.1-mac-arm64.zip",
"url": "https://git.xhmcl.com/Morris/GC/releases/download/1.1.1/GCL-1.1.1-mac-arm64.zip"
},
"osx-x64": {
"path": "dist/mac-x64/GCL-1.0.11-mac-x64.zip",
"path": "dist/mac-x64/GCL-1.1.1-mac-x64.zip",
"dir": "dist/mac-x64",
"name": "GCL-1.0.11-mac-x64.zip",
"url": "https://git.xhmcl.com/Morris/GC/releases/download/1.0.11/GCL-1.0.11-mac-x64.zip"
"name": "GCL-1.1.1-mac-x64.zip",
"url": "https://git.xhmcl.com/Morris/GC/releases/download/1.1.1/GCL-1.1.1-mac-x64.zip"
},
"linux-arm64": {
"path": "dist/linux-arm64/GCL-1.0.11-linux-arm64.zip",
"path": "dist/linux-arm64/GCL-1.1.1-linux-arm64.zip",
"dir": "dist/linux-arm64",
"name": "GCL-1.0.11-linux-arm64.zip",
"url": "https://git.xhmcl.com/Morris/GC/releases/download/1.0.11/GCL-1.0.11-linux-arm64.zip"
"name": "GCL-1.1.1-linux-arm64.zip",
"url": "https://git.xhmcl.com/Morris/GC/releases/download/1.1.1/GCL-1.1.1-linux-arm64.zip"
}
}
},
@@ -49,7 +49,7 @@
"id": "contour-map",
"version": "1.1",
"build": "773ab2161d",
"manifestSha256": "f673521f7462324a2a461253ed975c9f89abc4df34b937cad70a2a134623456d",
"manifestSha256": "ac3231d55175757b4c477ad6a3c398c041db9511061f0c650d2c10efca881103",
"filesSha256": "a6bdf9b4273aabee50c3c94ceab4d0abee15f0df1af90c58bdbb796e0d2d5699",
"files": 5,
"dir": "model/contour-map"
@@ -58,7 +58,7 @@
"id": "earth-geography",
"version": "1.9",
"build": "cc68b8863b",
"manifestSha256": "89e3afa8843fb080c81e062967790cddba54665b182e4a0819c8c1fd737d5189",
"manifestSha256": "f69ceb758c643701480af441da26dfa64e190c9e583073deba211bac3e2a6e1a",
"filesSha256": "c018ba481831e23d3183a38ac47251f19754c7464baa5d85b47cea7a49fcfa95",
"files": 11,
"dir": "model/earth-geography"
@@ -67,7 +67,7 @@
"id": "earth-revolution",
"version": "1.7",
"build": "53b7a0fbc3",
"manifestSha256": "31f20837131573957101f7fba9a653c8785f6dbda5fd678862148a9f7f87e841",
"manifestSha256": "ab257669cd2bc57289d7e86b361064034d6040e85603b65069a93aec8d457b0b",
"filesSha256": "4cd45b0324a77574a0da3a939c2a6faebc785c5a24cb50136d62a78a6ea2e9b1",
"files": 7,
"dir": "model/earth-revolution"
@@ -76,7 +76,7 @@
"id": "earth-rotation",
"version": "1.7",
"build": "ecd52665f9",
"manifestSha256": "caa89497a70b29db87e67d35cd7d3e27a18306646209b2178cfb71b73cfca8ba",
"manifestSha256": "d463d85e08fd7f0525f8e08a5e9ec49c0005b3d8ca97a7f9497e95bdbb0697cb",
"filesSha256": "594b005a6a9f36cd0b5d4e4a7a0b1ab42d53c8032832545b71c3915493d56c8e",
"files": 7,
"dir": "model/earth-rotation"
@@ -85,7 +85,7 @@
"id": "scale-calculator",
"version": "1.6",
"build": "105653737d",
"manifestSha256": "952d2529f3b62f6703456ae9bc6f867edac148b7ec9963444c426d26aa35208d",
"manifestSha256": "2ac714eafb9acb4e4f11567b61848441de0f65ac41eb4260bc2d868c9500f56d",
"filesSha256": "732dd26406e0f1e836970499d7ea644def332ce909d7f8aa0a403bbe7337e604",
"files": 6,
"dir": "model/scale-calculator"
@@ -94,8 +94,8 @@
"signature": {
"alg": "ECDSA-P256-SHA256",
"keyId": "gc-2026-12",
"value": "6i/y23uDD4qa3docjAeeUIHHEV+hSrEGEV6vxQ54a3tyUzxc5lbxBth15gnmxgac7kL3ULULb3G4dI59R6MHxg==",
"contentSha256": "86290d84dce5ae9619f5f25e7151480d916aab6177449955366f87b74fbce71c",
"signedAt": "2026-11-18T13:06:34Z"
"value": "U6j86/9PIUe5ZIqLRUlSIFf6EhODc7Dar1KvL7MecYujzNJ+ZnRrUg7aUT1rvktVwz4nyRacf9RYM2JQFb+qKw==",
"contentSha256": "585f22236fa1a50d4e99581c676b8ad694c5e352b12fe1bfed30c342b1f38690",
"signedAt": "2026-11-19T10:21:32Z"
}
}
+29 -29
View File
@@ -1,46 +1,46 @@
{
"schema": 1,
"generated": "2026-11-18T13:05:57Z",
"generated": "2026-11-19T10:20:00Z",
"repository": "https://git.xhmcl.com/Morris/GC",
"branch": "main",
"modelDir": "model",
"launcher": {
"version": "1.0.11",
"version": "1.1.1",
"revision": "",
"packages": {
"win-x64": {
"path": "dist/win-amd64/GCL-1.0.11-win-amd64.zip",
"path": "dist/win-amd64/GCL-1.1.1-win-amd64.zip",
"dir": "dist/win-amd64",
"name": "GCL-1.0.11-win-amd64.zip",
"url": "https://git.xhmcl.com/Morris/GC/releases/download/1.0.11/GCL-1.0.11-win-amd64.zip",
"sha256": "55f1d5eb0dfdfc243656e6705c3d276dd83611561f913fe5ca9e6e5d2f2dd658",
"size": 74973271
"name": "GCL-1.1.1-win-amd64.zip",
"url": "https://git.xhmcl.com/Morris/GC/releases/download/1.1.1/GCL-1.1.1-win-amd64.zip",
"sha256": "a03532606121280a1553ea73e56d6f9e8cc6cd9eefaf49f8c62857733199c10f",
"size": 74993562
},
"win-arm64": {
"path": "dist/win-arm64/GCL-1.0.11-win-arm64.zip",
"path": "dist/win-arm64/GCL-1.1.1-win-arm64.zip",
"dir": "dist/win-arm64",
"name": "GCL-1.0.11-win-arm64.zip",
"url": "https://git.xhmcl.com/Morris/GC/releases/download/1.0.11/GCL-1.0.11-win-arm64.zip",
"sha256": "9ce48381fcca18e7d6789364e1c43f7e616ceae529c0c1167b099ed762f5808f",
"size": 72515856
"name": "GCL-1.1.1-win-arm64.zip",
"url": "https://git.xhmcl.com/Morris/GC/releases/download/1.1.1/GCL-1.1.1-win-arm64.zip",
"sha256": "0cd3e045fbc2415bb170e545bb720841eb4c5ebc01a98e03105618a2b7bace46",
"size": 72535103
},
"osx-arm64": {
"path": "dist/mac-arm64/GCL-1.0.11-mac-arm64.zip",
"path": "dist/mac-arm64/GCL-1.1.1-mac-arm64.zip",
"dir": "dist/mac-arm64",
"name": "GCL-1.0.11-mac-arm64.zip",
"url": "https://git.xhmcl.com/Morris/GC/releases/download/1.0.11/GCL-1.0.11-mac-arm64.zip"
"name": "GCL-1.1.1-mac-arm64.zip",
"url": "https://git.xhmcl.com/Morris/GC/releases/download/1.1.1/GCL-1.1.1-mac-arm64.zip"
},
"osx-x64": {
"path": "dist/mac-x64/GCL-1.0.11-mac-x64.zip",
"path": "dist/mac-x64/GCL-1.1.1-mac-x64.zip",
"dir": "dist/mac-x64",
"name": "GCL-1.0.11-mac-x64.zip",
"url": "https://git.xhmcl.com/Morris/GC/releases/download/1.0.11/GCL-1.0.11-mac-x64.zip"
"name": "GCL-1.1.1-mac-x64.zip",
"url": "https://git.xhmcl.com/Morris/GC/releases/download/1.1.1/GCL-1.1.1-mac-x64.zip"
},
"linux-arm64": {
"path": "dist/linux-arm64/GCL-1.0.11-linux-arm64.zip",
"path": "dist/linux-arm64/GCL-1.1.1-linux-arm64.zip",
"dir": "dist/linux-arm64",
"name": "GCL-1.0.11-linux-arm64.zip",
"url": "https://git.xhmcl.com/Morris/GC/releases/download/1.0.11/GCL-1.0.11-linux-arm64.zip"
"name": "GCL-1.1.1-linux-arm64.zip",
"url": "https://git.xhmcl.com/Morris/GC/releases/download/1.1.1/GCL-1.1.1-linux-arm64.zip"
}
}
},
@@ -49,7 +49,7 @@
"id": "contour-map",
"version": "1.1",
"build": "773ab2161d",
"manifestSha256": "f673521f7462324a2a461253ed975c9f89abc4df34b937cad70a2a134623456d",
"manifestSha256": "ac3231d55175757b4c477ad6a3c398c041db9511061f0c650d2c10efca881103",
"filesSha256": "a6bdf9b4273aabee50c3c94ceab4d0abee15f0df1af90c58bdbb796e0d2d5699",
"files": 5,
"dir": "model/contour-map"
@@ -58,7 +58,7 @@
"id": "earth-geography",
"version": "1.9",
"build": "cc68b8863b",
"manifestSha256": "89e3afa8843fb080c81e062967790cddba54665b182e4a0819c8c1fd737d5189",
"manifestSha256": "f69ceb758c643701480af441da26dfa64e190c9e583073deba211bac3e2a6e1a",
"filesSha256": "c018ba481831e23d3183a38ac47251f19754c7464baa5d85b47cea7a49fcfa95",
"files": 11,
"dir": "model/earth-geography"
@@ -67,7 +67,7 @@
"id": "earth-revolution",
"version": "1.7",
"build": "53b7a0fbc3",
"manifestSha256": "31f20837131573957101f7fba9a653c8785f6dbda5fd678862148a9f7f87e841",
"manifestSha256": "ab257669cd2bc57289d7e86b361064034d6040e85603b65069a93aec8d457b0b",
"filesSha256": "4cd45b0324a77574a0da3a939c2a6faebc785c5a24cb50136d62a78a6ea2e9b1",
"files": 7,
"dir": "model/earth-revolution"
@@ -76,7 +76,7 @@
"id": "earth-rotation",
"version": "1.7",
"build": "ecd52665f9",
"manifestSha256": "caa89497a70b29db87e67d35cd7d3e27a18306646209b2178cfb71b73cfca8ba",
"manifestSha256": "d463d85e08fd7f0525f8e08a5e9ec49c0005b3d8ca97a7f9497e95bdbb0697cb",
"filesSha256": "594b005a6a9f36cd0b5d4e4a7a0b1ab42d53c8032832545b71c3915493d56c8e",
"files": 7,
"dir": "model/earth-rotation"
@@ -85,7 +85,7 @@
"id": "scale-calculator",
"version": "1.6",
"build": "105653737d",
"manifestSha256": "952d2529f3b62f6703456ae9bc6f867edac148b7ec9963444c426d26aa35208d",
"manifestSha256": "2ac714eafb9acb4e4f11567b61848441de0f65ac41eb4260bc2d868c9500f56d",
"filesSha256": "732dd26406e0f1e836970499d7ea644def332ce909d7f8aa0a403bbe7337e604",
"files": 6,
"dir": "model/scale-calculator"
@@ -94,8 +94,8 @@
"signature": {
"alg": "ECDSA-P256-SHA256",
"keyId": "gc-2026-12",
"value": "6i/y23uDD4qa3docjAeeUIHHEV+hSrEGEV6vxQ54a3tyUzxc5lbxBth15gnmxgac7kL3ULULb3G4dI59R6MHxg==",
"contentSha256": "86290d84dce5ae9619f5f25e7151480d916aab6177449955366f87b74fbce71c",
"signedAt": "2026-11-18T13:06:34Z"
"value": "U6j86/9PIUe5ZIqLRUlSIFf6EhODc7Dar1KvL7MecYujzNJ+ZnRrUg7aUT1rvktVwz4nyRacf9RYM2JQFb+qKw==",
"contentSha256": "585f22236fa1a50d4e99581c676b8ad694c5e352b12fe1bfed30c342b1f38690",
"signedAt": "2026-11-19T10:21:32Z"
}
}