From 023e9468dbff83e06b8793393a4c48f33ae77ae9 Mon Sep 17 00:00:00 2001 From: Morris Date: Thu, 19 Nov 2026 13:17:22 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=A8=A1=E5=9E=8B?= =?UTF-8?q?=E6=A3=80=E6=B5=8B/=E8=87=AA=E5=8A=A8=E4=B8=8B=E8=BD=BD?= =?UTF-8?q?=E4=B8=8E=E5=90=AF=E5=8A=A8=E5=99=A8=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - ModelSourceClient: 自托管 Gitea 源(git.xhmcl.com)ArchiveCandidates 之前 直接 yield break,只能靠系统 git clone。没装 git 的机器「检测模型/下载/ 自动更新」全部失效。补上 archive/.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 与版本号不动。 --- GC-DOWNLOAD/LauncherUpdater.cs | 22 ++++++++++++++++++++-- GC-DOWNLOAD/ModelSourceClient.cs | 8 +++++++- model/version.json | 16 ++++++++-------- version.json | 16 ++++++++-------- 4 files changed, 43 insertions(+), 19 deletions(-) diff --git a/GC-DOWNLOAD/LauncherUpdater.cs b/GC-DOWNLOAD/LauncherUpdater.cs index fa8e38b..decc62e 100644 --- a/GC-DOWNLOAD/LauncherUpdater.cs +++ b/GC-DOWNLOAD/LauncherUpdater.cs @@ -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)) diff --git a/GC-DOWNLOAD/ModelSourceClient.cs b/GC-DOWNLOAD/ModelSourceClient.cs index e284737..741df02 100644 --- a/GC-DOWNLOAD/ModelSourceClient.cs +++ b/GC-DOWNLOAD/ModelSourceClient.cs @@ -154,7 +154,13 @@ 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/.zip 拉源码归档。 + // 关键:不能在这里 yield break —— 那样就只剩 git clone 一条路, + // 用户机器没装 git 时「检测模型 / 下载 / 自动更新」会全部失效。 + // 归档下载走 ResumableDownloader,无需系统 git。 + yield return $"{uri.GetLeftPart(UriPartial.Authority)}/{owner}/{repo}/archive/{b}.zip"; + } } } diff --git a/model/version.json b/model/version.json index 2f24535..d5c43c1 100644 --- a/model/version.json +++ b/model/version.json @@ -49,7 +49,7 @@ "id": "contour-map", "version": "1.1", "build": "773ab2161d", - "manifestSha256": "f673521f7462324a2a461253ed975c9f89abc4df34b937cad70a2a134623456d", + "manifestSha256": "f86a3f83d5953cafc333585da3009d8846448f6a8a9df13b39cde57b36037733", "filesSha256": "a6bdf9b4273aabee50c3c94ceab4d0abee15f0df1af90c58bdbb796e0d2d5699", "files": 5, "dir": "model/contour-map" @@ -58,7 +58,7 @@ "id": "earth-geography", "version": "1.9", "build": "cc68b8863b", - "manifestSha256": "89e3afa8843fb080c81e062967790cddba54665b182e4a0819c8c1fd737d5189", + "manifestSha256": "448f050fded46d7bfc8f0c3856e741c4a4f82523c8e012dd846ddcd400ff394a", "filesSha256": "c018ba481831e23d3183a38ac47251f19754c7464baa5d85b47cea7a49fcfa95", "files": 11, "dir": "model/earth-geography" @@ -67,7 +67,7 @@ "id": "earth-revolution", "version": "1.7", "build": "53b7a0fbc3", - "manifestSha256": "31f20837131573957101f7fba9a653c8785f6dbda5fd678862148a9f7f87e841", + "manifestSha256": "c69fc53f50213c6ab7658e1a761a20d2c55a7a344beb3c75a30393c26fa40167", "filesSha256": "4cd45b0324a77574a0da3a939c2a6faebc785c5a24cb50136d62a78a6ea2e9b1", "files": 7, "dir": "model/earth-revolution" @@ -76,7 +76,7 @@ "id": "earth-rotation", "version": "1.7", "build": "ecd52665f9", - "manifestSha256": "caa89497a70b29db87e67d35cd7d3e27a18306646209b2178cfb71b73cfca8ba", + "manifestSha256": "cbf12a47747a331c9980260f39169b1813bb4b52a8916995fda05755267bddca", "filesSha256": "594b005a6a9f36cd0b5d4e4a7a0b1ab42d53c8032832545b71c3915493d56c8e", "files": 7, "dir": "model/earth-rotation" @@ -85,7 +85,7 @@ "id": "scale-calculator", "version": "1.6", "build": "105653737d", - "manifestSha256": "952d2529f3b62f6703456ae9bc6f867edac148b7ec9963444c426d26aa35208d", + "manifestSha256": "fc6f7deb1efb076cc0bbee732e7de8f007ed74bc837dba2268be1e0adc1839d3", "filesSha256": "732dd26406e0f1e836970499d7ea644def332ce909d7f8aa0a403bbe7337e604", "files": 6, "dir": "model/scale-calculator" @@ -94,8 +94,8 @@ "signature": { "alg": "ECDSA-P256-SHA256", "keyId": "gc-2026-12", - "value": "A/A7GQ2muXgqhtG+HVKkAvs0cAX90TXDgXOtxWCr8VTQW10FPUUroUSdmp4x5FUT7KNnrs1wIoz4/YSJspv9oQ==", - "contentSha256": "84488b35a9f45f44c3b6c21c400f6c0d0a26b5f0f045a696afd889cf5af6f2f1", - "signedAt": "2026-11-18T14:46:36Z" + "value": "DzOHHAa1bdiwt2erQ0tpynhT4ukgtG7IMvfNO7oXo+FUe3RdokAtIbuQ599yOG2lGABxkU19UBp9scs5fiTdZA==", + "contentSha256": "17f9d2eacc27592db13167742c214498941267e7b77b54fcd3c5896f818cb082", + "signedAt": "2026-11-19T05:09:10Z" } } diff --git a/version.json b/version.json index 2f24535..d5c43c1 100644 --- a/version.json +++ b/version.json @@ -49,7 +49,7 @@ "id": "contour-map", "version": "1.1", "build": "773ab2161d", - "manifestSha256": "f673521f7462324a2a461253ed975c9f89abc4df34b937cad70a2a134623456d", + "manifestSha256": "f86a3f83d5953cafc333585da3009d8846448f6a8a9df13b39cde57b36037733", "filesSha256": "a6bdf9b4273aabee50c3c94ceab4d0abee15f0df1af90c58bdbb796e0d2d5699", "files": 5, "dir": "model/contour-map" @@ -58,7 +58,7 @@ "id": "earth-geography", "version": "1.9", "build": "cc68b8863b", - "manifestSha256": "89e3afa8843fb080c81e062967790cddba54665b182e4a0819c8c1fd737d5189", + "manifestSha256": "448f050fded46d7bfc8f0c3856e741c4a4f82523c8e012dd846ddcd400ff394a", "filesSha256": "c018ba481831e23d3183a38ac47251f19754c7464baa5d85b47cea7a49fcfa95", "files": 11, "dir": "model/earth-geography" @@ -67,7 +67,7 @@ "id": "earth-revolution", "version": "1.7", "build": "53b7a0fbc3", - "manifestSha256": "31f20837131573957101f7fba9a653c8785f6dbda5fd678862148a9f7f87e841", + "manifestSha256": "c69fc53f50213c6ab7658e1a761a20d2c55a7a344beb3c75a30393c26fa40167", "filesSha256": "4cd45b0324a77574a0da3a939c2a6faebc785c5a24cb50136d62a78a6ea2e9b1", "files": 7, "dir": "model/earth-revolution" @@ -76,7 +76,7 @@ "id": "earth-rotation", "version": "1.7", "build": "ecd52665f9", - "manifestSha256": "caa89497a70b29db87e67d35cd7d3e27a18306646209b2178cfb71b73cfca8ba", + "manifestSha256": "cbf12a47747a331c9980260f39169b1813bb4b52a8916995fda05755267bddca", "filesSha256": "594b005a6a9f36cd0b5d4e4a7a0b1ab42d53c8032832545b71c3915493d56c8e", "files": 7, "dir": "model/earth-rotation" @@ -85,7 +85,7 @@ "id": "scale-calculator", "version": "1.6", "build": "105653737d", - "manifestSha256": "952d2529f3b62f6703456ae9bc6f867edac148b7ec9963444c426d26aa35208d", + "manifestSha256": "fc6f7deb1efb076cc0bbee732e7de8f007ed74bc837dba2268be1e0adc1839d3", "filesSha256": "732dd26406e0f1e836970499d7ea644def332ce909d7f8aa0a403bbe7337e604", "files": 6, "dir": "model/scale-calculator" @@ -94,8 +94,8 @@ "signature": { "alg": "ECDSA-P256-SHA256", "keyId": "gc-2026-12", - "value": "A/A7GQ2muXgqhtG+HVKkAvs0cAX90TXDgXOtxWCr8VTQW10FPUUroUSdmp4x5FUT7KNnrs1wIoz4/YSJspv9oQ==", - "contentSha256": "84488b35a9f45f44c3b6c21c400f6c0d0a26b5f0f045a696afd889cf5af6f2f1", - "signedAt": "2026-11-18T14:46:36Z" + "value": "DzOHHAa1bdiwt2erQ0tpynhT4ukgtG7IMvfNO7oXo+FUe3RdokAtIbuQ599yOG2lGABxkU19UBp9scs5fiTdZA==", + "contentSha256": "17f9d2eacc27592db13167742c214498941267e7b77b54fcd3c5896f818cb082", + "signedAt": "2026-11-19T05:09:10Z" } } -- 2.54.0