From 4c9b1f8cb70499d9541f95801f6ef44084fcd73c Mon Sep 17 00:00:00 2001 From: 2509_92447106 <2509_92447106@noreply.gitcode.com> Date: Sat, 7 Nov 2026 18:54:04 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D:=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Services/GitCodeReleaseRemote.cs | 194 ++++++++++++++++++ .../Services/ReleaseModels.cs | 71 +++++++ .../Services/UpdateService.cs | 6 +- 3 files changed, 269 insertions(+), 2 deletions(-) create mode 100644 src/main/dotnet/EarthModelStudio/Services/GitCodeReleaseRemote.cs create mode 100644 src/main/dotnet/EarthModelStudio/Services/ReleaseModels.cs diff --git a/src/main/dotnet/EarthModelStudio/Services/GitCodeReleaseRemote.cs b/src/main/dotnet/EarthModelStudio/Services/GitCodeReleaseRemote.cs new file mode 100644 index 0000000..d70ef15 --- /dev/null +++ b/src/main/dotnet/EarthModelStudio/Services/GitCodeReleaseRemote.cs @@ -0,0 +1,194 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Net.Http; +using System.Text.Json; +using System.Threading; +using System.Threading.Tasks; + +namespace EarthModelStudio.Services; + +/// +/// 启动器更新走 GitCode Release,模型仍走仓库 contents API 的远端源。 +/// +/// · 版本判定:最新 Release 的 tag_name(如 v1.0.1 / GC-1.0.1)与本地程序集版本比较; +/// · 发布包:按附件名识别平台(如 GC-1.0.1-Win-amd64.zip),用 browser_download_url 下载; +/// · 校验:附件自带的 sha256/size(Gitee/GitCode 的 assets 可能没有 sha256, +/// 此时退回 version.json 里同名 RID 条目的 sha256,两者都没有则只校验非空); +/// · 模型清单与模型文件:完全委托给内部 GitCodeRemote,保持原有链路不变。 +/// +/// Release API 失败(仓库还没有 Release / 断网)时静默回退到 version.json 的 +/// launcher 字段,保证「只发仓库、不发 Release」的旧发布方式仍然可用。 +/// +public sealed class GitCodeReleaseRemote : IModelRemote +{ + private readonly GitCodeRemote _content; + private readonly HttpClient _http; + private readonly string _releasesUrl; + private readonly Dictionary _assets = new(); + + public GitCodeReleaseRemote(string? manifestUrl, string? repository, HttpClient? http = null) + { + _content = new GitCodeRemote(manifestUrl, repository); + var (owner, repo) = ParseOwnerRepo(repository); + _releasesUrl = $"https://api.gitcode.com/api/v5/repos/{owner}/{repo}/releases"; + _http = http ?? new HttpClient { Timeout = TimeSpan.FromSeconds(15) }; + _http.DefaultRequestHeaders.UserAgent.ParseAdd("EarthModelStudio-Updater/1.0"); + _http.DefaultRequestHeaders.Accept.ParseAdd("application/json"); + DisplayName = (string.IsNullOrWhiteSpace(repository) + ? GitCodeRemote.DefaultRepository : repository!.TrimEnd('/')) + " (Release)"; + } + + private static (string Owner, string Repo) ParseOwnerRepo(string? url) + { + var raw = string.IsNullOrWhiteSpace(url) ? GitCodeRemote.DefaultRepository : url!.Trim(); + if (!Uri.TryCreate(raw, UriKind.Absolute, out var uri)) + return ("2509_92447106", "GC"); + var parts = uri.AbsolutePath.Trim('/').Split('/', StringSplitOptions.RemoveEmptyEntries); + if (parts.Length < 2) return ("2509_92447106", "GC"); + var repo = parts[1].EndsWith(".git", StringComparison.OrdinalIgnoreCase) + ? parts[1][..^4] : parts[1]; + return (parts[0], repo); + } + + public string DisplayName { get; } + + /// + /// 模型部分照旧读仓库 version.json;成功拿到 Release 时,用 tag/附件覆盖启动器字段。 + /// + public async Task GetVersionAsync(CancellationToken ct) + { + var version = await _content.GetVersionAsync(ct); + try + { + await ApplyReleaseAsync(version, ct); + } + catch (Exception ex) + { + // 没有 Release / 断网 / 格式不符:回退到 version.json,不影响模型更新 + Console.Error.WriteLine($"读取 Release 失败,回退仓库清单: {ex.Message}"); + } + return version; + } + + private async Task ApplyReleaseAsync(RepoVersion? version, CancellationToken ct) + { + if (version == null) return; + + using var timeout = CancellationTokenSource.CreateLinkedTokenSource(ct); + timeout.CancelAfter(TimeSpan.FromSeconds(12)); + var text = await _http.GetStringAsync(_releasesUrl, timeout.Token); + var trimmed = text.TrimStart(); + if (trimmed.Length == 0 || trimmed[0] != '[') return; // 可能是错误页/对象 + + using var doc = JsonDocument.Parse(text); + ReleaseInfo? latest = null; + foreach (var el in doc.RootElement.EnumerateArray()) + { + var info = ParseRelease(el); + if (info == null || info.Draft || info.Prerelease) continue; + // 取版本号最大的一条(API 通常已按时间倒序,这里再兜一层) + if (latest == null || CompareVersion(info.Version, latest.Version) > 0) latest = info; + } + if (latest == null || string.IsNullOrWhiteSpace(latest.Version)) return; + + version.Launcher.Version = latest.Version; + + _assets.Clear(); + foreach (var asset in latest.Assets) + { + var rid = asset.RidFromName(asset.Name); + if (rid == null || string.IsNullOrWhiteSpace(asset.Url)) continue; + // 同名平台取第一个有效附件 + if (!_assets.ContainsKey(rid)) + _assets[rid] = (asset.Url, asset.Sha256, asset.Size); + } + + // 把附件地址写回 packages:有附件就用附件的直链与校验值, + // 没有对应平台附件时保留 version.json 里原来的 path/url 兜底。 + foreach (var (rid, info) in _assets) + { + if (!version.Launcher.Packages.TryGetValue(rid, out var pkg)) + { + pkg = new RepoPackage(); + version.Launcher.Packages[rid] = pkg; + } + pkg.Url = info.Url; + if (!string.IsNullOrWhiteSpace(info.Sha256)) pkg.Sha256 = info.Sha256; + if (info.Size > 0) pkg.Size = info.Size; + } + } + + private static int CompareVersion(string a, string b) + { + if (Version.TryParse(a, out var va) && Version.TryParse(b, out var vb)) return va.CompareTo(vb); + return string.Compare(a, b, StringComparison.OrdinalIgnoreCase); + } + + private static ReleaseInfo? ParseRelease(JsonElement el) + { + try + { + var info = new ReleaseInfo + { + TagName = Str(el, "tag_name") ?? Str(el, "tag") ?? "", + Name = Str(el, "name") ?? "", + Draft = Bool(el, "draft"), + Prerelease = Bool(el, "prerelease") ?? Bool(el, "pre_release") ?? false, + PublishedAt = Str(el, "published_at") ?? Str(el, "created_at") + }; + if (el.TryGetProperty("assets", out var assets) && assets.ValueKind == JsonValueKind.Array) + { + foreach (var a in assets.EnumerateArray()) + { + info.Assets.Add(new ReleaseAsset + { + Name = Str(a, "name") ?? Str(a, "file_name") ?? "", + BrowserDownloadUrl = Str(a, "browser_download_url"), + DownloadUrl = Str(a, "download_url") ?? Str(a, "url"), + Size = Num(a, "size"), + Sha256 = Str(a, "sha256") ?? Str(a, "digest") + }); + } + } + // 有些平台把附件放在顶层 assets_link / attachments + if (info.Assets.Count == 0 && + el.TryGetProperty("attachments", out var att) && att.ValueKind == JsonValueKind.Array) + { + foreach (var a in att.EnumerateArray()) + info.Assets.Add(new ReleaseAsset + { + Name = Str(a, "name") ?? "", + BrowserDownloadUrl = Str(a, "browser_download_url") ?? Str(a, "url"), + Size = Num(a, "size") + }); + } + return info; + } + catch { return null; } + } + + private static string? Str(JsonElement el, string name) + => el.TryGetProperty(name, out var v) && v.ValueKind == JsonValueKind.String + ? v.GetString() : null; + + private static bool? Bool(JsonElement el, string name) + => el.TryGetProperty(name, out var v) && + (v.ValueKind == JsonValueKind.True || v.ValueKind == JsonValueKind.False) + ? v.GetBoolean() : null; + + private static long Num(JsonElement el, string name) + => el.TryGetProperty(name, out var v) && v.ValueKind == JsonValueKind.Number + && v.TryGetInt64(out var n) ? n : 0; + + // ---- 模型链路:原样委托,不做任何改动 ---- + public Task> ListTreeAsync(string rootPath, CancellationToken ct) + => _content.ListTreeAsync(rootPath, ct); + + public Task DownloadAsync(RepoEntry entry, CancellationToken ct) + => _content.DownloadAsync(entry, ct); + + /// 启动器包:优先用 Release 附件直链下载(url 已被 ApplyReleaseAsync 覆盖)。 + public Task DownloadPackageAsync(RepoPackage package, CancellationToken ct) + => _content.DownloadPackageAsync(package, ct); +} diff --git a/src/main/dotnet/EarthModelStudio/Services/ReleaseModels.cs b/src/main/dotnet/EarthModelStudio/Services/ReleaseModels.cs new file mode 100644 index 0000000..89a6739 --- /dev/null +++ b/src/main/dotnet/EarthModelStudio/Services/ReleaseModels.cs @@ -0,0 +1,71 @@ +using System; +using System.Collections.Generic; +using System.Text.Json; +using System.Text.Json.Serialization; + +namespace EarthModelStudio.Services; + +/// +/// GitCode/Gitee v5 releases API 的一条 Release(字段做宽松解析,兼容多种返回格式)。 +/// +public sealed class ReleaseInfo +{ + public string TagName { get; set; } = ""; + public string Name { get; set; } = ""; + public bool Draft { get; set; } + public bool Prerelease { get; set; } + public string? PublishedAt { get; set; } + public List Assets { get; set; } = new(); + + /// 从 tag_name / name 里抽出的版本号(去掉前缀 v、GC- 等)。 + public string Version => NormalizeVersion(TagName, Name); + + public static string NormalizeVersion(string tag, string name) + { + var raw = !string.IsNullOrWhiteSpace(tag) ? tag : name; + if (string.IsNullOrWhiteSpace(raw)) return ""; + raw = raw!.Trim(); + // "v1.0.1" / "GC-1.0.1" / "release-1.0.1" -> 取第一段像版本号的部分 + foreach (var prefix in new[] { "v", "V", "GC-", "gc-", "release-", "Release-" }) + if (raw.StartsWith(prefix, StringComparison.Ordinal)) { raw = raw[prefix.Length..]; break; } + // 形如 GC-1.0.1-Win-amd64 时只取版本段 + var dash = raw.IndexOf('-'); + if (dash > 0 && System.Version.TryParse(raw[..dash], out _)) raw = raw[..dash]; + return raw; + } +} + +public sealed class ReleaseAsset +{ + public string Name { get; set; } = ""; + public string? BrowserDownloadUrl { get; set; } + public string? DownloadUrl { get; set; } + public long Size { get; set; } + public string? Sha256 { get; set; } + + [JsonIgnore] + public string Url => BrowserDownloadUrl ?? DownloadUrl ?? ""; + + /// 解析附件名里的系统/架构,映射到 .NET RID。 + /// 如 win-x64 / win-arm64 / osx-arm64;无法识别返回 null。 + public string? RidFromName(string fullName) + { + var n = fullName ?? ""; + // 统一大小写与分隔符后再判断,兼容 "GC-1.0.1-Win-amd64.zip" + var lower = n.ToLowerInvariant().Replace('_', '-'); + + bool win = lower.Contains("win") || lower.Contains("windows"); + bool mac = lower.Contains("osx") || lower.Contains("mac") || lower.Contains("darwin"); + bool linux = lower.Contains("linux"); + if (!win && !mac && !linux) return null; + + bool arm64 = lower.Contains("arm64") || lower.Contains("aarch64") || lower.Contains("win-arm"); + bool x86 = lower.Contains("x86") && !lower.Contains("x64") && !lower.Contains("amd64") && !arm64; + // amd64 / x64 / x86_64 都视为 x64 + var arch = arm64 ? "arm64" : x86 ? "x86" : "x64"; + + if (win) return "win-" + arch; + if (mac) return "osx-" + arch; + return "linux-" + arch; + } +} diff --git a/src/main/dotnet/EarthModelStudio/Services/UpdateService.cs b/src/main/dotnet/EarthModelStudio/Services/UpdateService.cs index f961a15..96dd3a1 100644 --- a/src/main/dotnet/EarthModelStudio/Services/UpdateService.cs +++ b/src/main/dotnet/EarthModelStudio/Services/UpdateService.cs @@ -65,8 +65,10 @@ public sealed class UpdateService { if (!string.IsNullOrWhiteSpace(settings.UpdateLocalRoot) && Directory.Exists(settings.UpdateLocalRoot!)) - return new DirectoryRemote(settings.UpdateLocalRoot!); - return new GitCodeRemote(settings.UpdateManifestUrl, settings.UpdateRepository); + return new DirectoryRemote(settings.UpdateLocalRoot!); // 离线 U 盘源:仍读本地 version.json + // 在线源:启动器版本与发布包走 GitCode Release(tag + 附件), + // 模型清单/文件仍走仓库 contents API;无 Release 时自动回退仓库 version.json。 + return new GitCodeReleaseRemote(settings.UpdateManifestUrl, settings.UpdateRepository); } public async Task RunAsync(bool force,