From 6d4d098681caad445a9c411b065dc34289dd686d Mon Sep 17 00:00:00 2001 From: 2509_92447106 <2509_92447106@noreply.gitcode.com> Date: Sat, 14 Nov 2026 06:40:54 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=83=A8=E5=88=86=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- model/earth-geography/earth-geography.json | 4 +- .../EarthGeographyModel.dll | Bin 46080 -> 46592 bytes model/earth-geography/src/GeographyRuntime.cs | 1 + model/earth-geography/src/GeographyView.cs | 53 +++- model/earth-revolution/earth-revolution.json | 4 +- model/earth-rotation/earth-rotation.json | 4 +- model/scale-calculator/scale-calculator.json | 4 +- model/version.json | 12 +- .../EarthModelStudio/Services/AppServices.cs | 3 + .../Services/GitCodeReleaseRemote.cs | 35 ++- .../EarthModelStudio/Services/GiteaRemote.cs | 293 ++++++++++++++++++ .../Services/LauncherUpdater.cs | 234 +++++++++++++- .../Services/SettingsService.cs | 38 +-- .../EarthModelStudio/Services/SourcePreset.cs | 79 +++++ .../Services/SourceSelector.cs | 130 ++++++++ .../EarthModelStudio/Services/UpdateModels.cs | 3 + .../Services/UpdateService.cs | 54 +++- .../EarthModelStudio/Services/VersionUtil.cs | 41 +++ .../ViewModels/DownloadViewModel.cs | 52 +++- .../ViewModels/MainViewModel.cs | 19 ++ .../EarthModelStudio/Views/DownloadView.axaml | 7 +- .../Views/MainWindow.axaml.cs | 1 + version.json | 12 +- 23 files changed, 994 insertions(+), 89 deletions(-) create mode 100644 src/main/dotnet/EarthModelStudio/Services/GiteaRemote.cs create mode 100644 src/main/dotnet/EarthModelStudio/Services/SourcePreset.cs create mode 100644 src/main/dotnet/EarthModelStudio/Services/SourceSelector.cs create mode 100644 src/main/dotnet/EarthModelStudio/Services/VersionUtil.cs diff --git a/model/earth-geography/earth-geography.json b/model/earth-geography/earth-geography.json index 9ce17e1..0a62d22 100644 --- a/model/earth-geography/earth-geography.json +++ b/model/earth-geography/earth-geography.json @@ -18,7 +18,7 @@ ], "dataDir": "earth-geography.model", "version": "1.8", - "updatedAt": "2026-11-13T13:56:47Z", + "updatedAt": "2026-11-13T15:19:06Z", "chrome": { "titleBar": "#0C1828", "titleBorder": "#1B2740", @@ -26,5 +26,5 @@ "button": "#9FB4D4", "frame": "#0A1524" }, - "build": "103f3400b7" + "build": "912c6d5619" } diff --git a/model/earth-geography/earth-geography.model/EarthGeographyModel.dll b/model/earth-geography/earth-geography.model/EarthGeographyModel.dll index 1e2733cfea9f2e0e5488b22889c4f6458449838b..a87fa05169897f368dd4d5bfb8702489dd3eff2e 100644 GIT binary patch literal 46592 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 DZ _mode; set { _mode = value; InvalidateVisual(); StateChanged?.Invoke(); } } /// 缩放倍数(0.55–4.0)。文字大小跟随缩放变化。 + /// + /// 缩放。写入的是**目标值**,由动画计时器平滑逼近, + /// 直接跳变会让滚轮缩放显得生硬。 + /// public double Zoom { - get => _zoom; + get => _zoomTarget; set { - _zoom = Math.Clamp(value, 0.55, 4.0); - Redraw(); + _zoomTarget = Math.Clamp(value, 0.55, 4.0); + EnsureAnimating(); } } + /// 立即生效(贴图生成、复位等场景不该有过渡)。 + public void SetZoomImmediate(double value) + { + _zoomTarget = Math.Clamp(value, 0.55, 4.0); + _zoom = _zoomTarget; + Redraw(); + } + private void Redraw() { InvalidateVisual(); StateChanged?.Invoke(); } + /// + /// 缩放动画:60Hz 逼近目标值,差值小于阈值即停, + /// 避免空转白耗 CPU(一体机上尤其明显)。 + /// + private void EnsureAnimating() + { + _zoomTimer ??= new Avalonia.Threading.DispatcherTimer( + TimeSpan.FromMilliseconds(16), Avalonia.Threading.DispatcherPriority.Render, (_, _) => StepZoom()); + if (!_zoomTimer.IsEnabled) _zoomTimer.Start(); + } + + private void StepZoom() + { + var diff = _zoomTarget - _zoom; + if (Math.Abs(diff) < 0.0015) + { + _zoom = _zoomTarget; + _zoomTimer?.Stop(); + Redraw(); + return; + } + // 指数逼近:手感接近系统级平滑缩放 + _zoom += diff * 0.28; + Redraw(); + } + + /// 释放动画计时器,避免窗口关闭后还在跑。 + public void StopAnimation() => _zoomTimer?.Stop(); + /// 文字缩放系数:跟随缩放一起放大/缩小,放大地球时标签也变大。 private double TextScale => Math.Clamp(_zoom, 0.85, 2.4); @@ -141,8 +184,8 @@ public sealed class GeographyView : Control protected override void OnPointerWheelChanged(PointerWheelEventArgs e) { base.OnPointerWheelChanged(e); - _zoom = Math.Clamp(_zoom * (1 + e.Delta.Y * 0.12), 0.55, 4.0); - Redraw(); + // 走 Zoom 属性(带平滑动画),不要在事件里直接改 _zoom + Zoom = _zoomTarget * (1 + e.Delta.Y * 0.12); e.Handled = true; } diff --git a/model/earth-revolution/earth-revolution.json b/model/earth-revolution/earth-revolution.json index 4a0c1fe..e0db63e 100644 --- a/model/earth-revolution/earth-revolution.json +++ b/model/earth-revolution/earth-revolution.json @@ -24,7 +24,7 @@ "preview": "preview.png", "apiVersion": 1, "version": "1.6", - "updatedAt": "2026-11-13T13:56:47Z", + "updatedAt": "2026-11-13T15:19:06Z", "chrome": { "titleBar": "#0C1828", "titleBorder": "#1B2740", @@ -32,5 +32,5 @@ "button": "#9FB4D4", "frame": "#0A1524" }, - "build": "c83fbb7799" + "build": "d34ade3c3f" } diff --git a/model/earth-rotation/earth-rotation.json b/model/earth-rotation/earth-rotation.json index 270f50e..5b99a87 100644 --- a/model/earth-rotation/earth-rotation.json +++ b/model/earth-rotation/earth-rotation.json @@ -24,7 +24,7 @@ "preview": "preview.png", "apiVersion": 1, "version": "1.6", - "updatedAt": "2026-11-13T13:56:47Z", + "updatedAt": "2026-11-13T15:19:06Z", "chrome": { "titleBar": "#0C1828", "titleBorder": "#1B2740", @@ -32,5 +32,5 @@ "button": "#9FB4D4", "frame": "#0A1524" }, - "build": "49f5a18dab" + "build": "033c8f1696" } diff --git a/model/scale-calculator/scale-calculator.json b/model/scale-calculator/scale-calculator.json index 0bd4193..ecdf592 100644 --- a/model/scale-calculator/scale-calculator.json +++ b/model/scale-calculator/scale-calculator.json @@ -25,7 +25,7 @@ "preview": "preview.png", "apiVersion": 1, "version": "1.5", - "updatedAt": "2026-11-13T13:56:47Z", + "updatedAt": "2026-11-13T15:19:06Z", "chrome": { "titleBar": "#FFFFFF", "titleBorder": "#E3E8F3", @@ -33,5 +33,5 @@ "button": "#5B6A86", "frame": "#F4F6FB" }, - "build": "f769728477" + "build": "85a274733d" } diff --git a/model/version.json b/model/version.json index 463e659..d00dc99 100644 --- a/model/version.json +++ b/model/version.json @@ -1,12 +1,12 @@ { "schema": 1, - "generated": "2026-11-13T13:56:47Z", + "generated": "2026-11-13T15:19:06Z", "repository": "https://gitcode.com/2509_92447106/GC", "branch": "main", "modelDir": "model", "launcher": { "version": "1.0.6", - "revision": "e00b9065c8", + "revision": "6db90790d3", "packages": { "win-x64": { "path": "dist/GC-win-x64.zip", @@ -34,25 +34,25 @@ { "id": "earth-geography", "version": "1.8", - "build": "103f3400b7", + "build": "912c6d5619", "dir": "model/earth-geography" }, { "id": "earth-revolution", "version": "1.6", - "build": "c83fbb7799", + "build": "d34ade3c3f", "dir": "model/earth-revolution" }, { "id": "earth-rotation", "version": "1.6", - "build": "49f5a18dab", + "build": "033c8f1696", "dir": "model/earth-rotation" }, { "id": "scale-calculator", "version": "1.5", - "build": "f769728477", + "build": "85a274733d", "dir": "model/scale-calculator" } ] diff --git a/src/main/dotnet/EarthModelStudio/Services/AppServices.cs b/src/main/dotnet/EarthModelStudio/Services/AppServices.cs index 61b0ed5..c1befed 100644 --- a/src/main/dotnet/EarthModelStudio/Services/AppServices.cs +++ b/src/main/dotnet/EarthModelStudio/Services/AppServices.cs @@ -17,6 +17,8 @@ public sealed class AppServices public ModelHost ModelHost { get; } /// 启动时检查模型 / 启动器更新。 public UpdateService Updates { get; } + /// 双源测速选择器(Xhmcl / GitCode 取最快)。 + public SourceSelector Selector { get; } private AppServices(AppPaths paths) { @@ -28,6 +30,7 @@ public sealed class AppServices Downloads = new DownloadCenter(paths, Models); Memory = new MemoryBudget(); ModelHost = new ModelHost(paths, Settings, Memory); + Selector = new SourceSelector(); Updates = new UpdateService(paths, Settings, UpdateService.CreateRemote(Settings.Current)); } diff --git a/src/main/dotnet/EarthModelStudio/Services/GitCodeReleaseRemote.cs b/src/main/dotnet/EarthModelStudio/Services/GitCodeReleaseRemote.cs index 05c1637..2b04882 100644 --- a/src/main/dotnet/EarthModelStudio/Services/GitCodeReleaseRemote.cs +++ b/src/main/dotnet/EarthModelStudio/Services/GitCodeReleaseRemote.cs @@ -59,34 +59,54 @@ public sealed class GitCodeReleaseRemote : IModelRemote } public string DisplayName { get; } + public string SourceId => SourcePreset.Detect(_content.DisplayName).Id; /// /// 模型部分照旧读仓库 version.json;成功拿到 Release 时,用 tag/附件覆盖启动器字段。 /// + /// + /// 只认 Release:拿不到任何 Release 就返回 null,由上层去问另一个源。 + /// 仓库里的 version.json 只用来补全「模型清单」与平台包兜底地址, + /// 不再用它充当版本号来源。 + /// public async Task GetVersionAsync(CancellationToken ct) { var version = await _content.GetVersionAsync(ct); + + bool gotRelease; try { - await ApplyReleaseAsync(version, ct); + gotRelease = await ApplyReleaseAsync(version, ct); } catch (Exception ex) { - // 没有 Release / 断网 / 格式不符:回退到 version.json,不影响模型更新 - Console.Error.WriteLine($"读取 Release 失败,回退仓库清单: {ex.Message}"); + Console.Error.WriteLine($"[gitcode] 读取 Release 失败: {ex.Message}"); + gotRelease = false; + } + + if (!gotRelease) + { + // 没有 Release:启动器版本留空(表示这个源没有可升级的启动器), + // 但模型清单仍然有效,保证模型能正常同步。 + Console.WriteLine($"[gitcode] {DisplayName}: Release 为空(模型清单仍可用)"); + if (version != null) + { + version.Launcher.Version = ""; + version.Launcher.Packages.Clear(); + } } return version; } - private async Task ApplyReleaseAsync(RepoVersion? version, CancellationToken ct) + private async Task ApplyReleaseAsync(RepoVersion? version, CancellationToken ct) { - if (version == null) return; + if (version == null) return false; 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; // 可能是错误页/对象 + if (trimmed.Length == 0 || trimmed[0] != '[') return false; // 可能是错误页/对象 using var doc = JsonDocument.Parse(text); ReleaseInfo? latest = null; @@ -97,7 +117,7 @@ public sealed class GitCodeReleaseRemote : IModelRemote // 取版本号最大的一条(API 通常已按时间倒序,这里再兜一层) if (latest == null || CompareVersion(info.Version, latest.Version) > 0) latest = info; } - if (latest == null || string.IsNullOrWhiteSpace(latest.Version)) return; + if (latest == null || string.IsNullOrWhiteSpace(latest.Version)) return false; version.Launcher.Version = latest.Version; @@ -125,6 +145,7 @@ public sealed class GitCodeReleaseRemote : IModelRemote if (!string.IsNullOrWhiteSpace(info.Sha256)) pkg.Sha256 = info.Sha256; if (info.Size > 0) pkg.Size = info.Size; } + return true; } private static int CompareVersion(string a, string b) diff --git a/src/main/dotnet/EarthModelStudio/Services/GiteaRemote.cs b/src/main/dotnet/EarthModelStudio/Services/GiteaRemote.cs new file mode 100644 index 0000000..6da6c28 --- /dev/null +++ b/src/main/dotnet/EarthModelStudio/Services/GiteaRemote.cs @@ -0,0 +1,293 @@ +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; + +/// +/// Gitea / Forgejo 后端(Xhmcl 用的就是这个)。 +/// +/// · 目录:GET /api/v1/repos/{owner}/{repo}/contents/{path} +/// 返回数组(目录)或对象(单文件),带 name/path/size/type/download_url +/// · 原始文件:GET {host}/{owner}/{repo}/raw/branch/{branch}/{path} +/// · Release:GET /api/v1/repos/{owner}/{repo}/releases +/// 版本取 tag_name;附件取 assets[].browser_download_url +/// +/// Release 为空时(仓库还没发布),回退到仓库里的 version.json,保证只推仓库也能更新。 +/// +public sealed class GiteaRemote : IModelRemote +{ + private readonly SourcePreset _preset; + private static readonly HttpClient Http = CreateHttp(); + + private static HttpClient CreateHttp() + { + var c = new HttpClient { Timeout = TimeSpan.FromSeconds(20) }; + c.DefaultRequestHeaders.UserAgent.ParseAdd("EarthModelStudio-Updater/1.0"); + c.DefaultRequestHeaders.Accept.ParseAdd("application/json"); + return c; + } + + public GiteaRemote(SourcePreset preset) + { + _preset = preset; + DisplayName = preset.Name; + } + + public string DisplayName { get; } + public string SourceId => _preset.Id; + + private string RepoApi => $"{_preset.ApiBase}/repos/{_preset.Owner}/{_preset.Repo}"; + + // ---------------------------------------------------------------- 清单 + + /// + /// 两件事分开取: + /// · **模型清单**永远来自仓库 version.json(模型不需要发 Release) + /// · **启动器版本**只认 Release;没有 Release 时把版本号留空, + /// 由上层去问另一个源(LeaderUpdater 会横向比较)。 + /// 以前把两者绑在一起,导致没有 Release 时连模型都同步不了。 + /// + public async Task GetVersionAsync(CancellationToken ct) + { + var fromRepo = await TryGetVersionFromRepoAsync(ct); + var fromRelease = await TryGetVersionFromReleasesAsync(ct); + + // 模型清单:仓库里有就用仓库的(保证模型能更新) + var result = fromRepo ?? new RepoVersion + { + Repository = _preset.HomeUrl, + Branch = _preset.Branch + }; + + if (fromRelease != null) + { + // Release 提供启动器版本与平台附件 + result.Launcher.Version = fromRelease.Launcher.Version; + foreach (var kv in fromRelease.Launcher.Packages) + result.Launcher.Packages[kv.Key] = kv.Value; + return result; + } + + // 没有 Release:清空启动器版本,让上层知道"这个源没有可升级的启动器" + Console.WriteLine($"[gitea] {_preset.Name}: Release 为空(模型清单仍可用)"); + result.Launcher.Version = ""; + result.Launcher.Packages.Clear(); + + // 只有模型清单时也返回,保证模型能同步;启动器版本为空表示无升级 + return result.Models.Count > 0 ? result : null; + } + /// 读仓库里的 version.json(模型清单 + 兜底信息)。 + private async Task TryGetVersionFromRepoAsync(CancellationToken ct) + { + foreach (var url in new[] { _preset.RawUrl("version.json"), _preset.RawUrl("model/version.json") }) + { + try + { + var text = await Http.GetStringAsync(url, ct); + if (!text.TrimStart().StartsWith('{')) continue; // 可能返回 HTML + var doc = JsonSerializer.Deserialize(text, Json.Options); + if (doc != null) return doc; + } + catch (Exception ex) + { + Console.Error.WriteLine($"[gitea] version.json 读取失败 {url}: {ex.Message}"); + } + } + return null; + } + + /// + /// 从 Release 列表里挑**版本号最高**的一个(不是最新发布时间的那个), + /// 并把它对应平台的附件填进 packages。 + /// + private async Task TryGetVersionFromReleasesAsync(CancellationToken ct) + { + try + { + var json = await Http.GetStringAsync($"{RepoApi}/releases", ct); + using var doc = JsonDocument.Parse(json); + if (doc.RootElement.ValueKind != JsonValueKind.Array) return null; + + var candidates = new List<(string Version, JsonElement Node)>(); + foreach (var rel in doc.RootElement.EnumerateArray()) + { + if (rel.TryGetProperty("draft", out var draft) && draft.ValueKind == JsonValueKind.True) + continue; // 草稿不算发布 + var tag = rel.TryGetProperty("tag_name", out var t) ? t.GetString() ?? "" : ""; + var ver = VersionUtil.Normalize(tag); + if (string.IsNullOrWhiteSpace(ver)) continue; + candidates.Add((ver, rel)); + } + if (candidates.Count == 0) + { + // 还没发布 Release 是正常状态:交给上层去问另一个源 + Console.WriteLine($"[gitea] {_preset.Name}: Release 列表为空"); + return null; + } + + var best = candidates + .OrderByDescending(c => VersionUtil.Parse(c.Version)) + .First(); + + var result = new RepoVersion + { + Repository = _preset.HomeUrl, + Branch = _preset.Branch, + Launcher = new RepoLauncher { Version = best.Version } + }; + + // 附件:按文件名识别平台 + if (best.Node.TryGetProperty("assets", out var assets) && + assets.ValueKind == JsonValueKind.Array) + { + foreach (var a in assets.EnumerateArray()) + { + var name = a.TryGetProperty("name", out var n) ? n.GetString() ?? "" : ""; + var url = a.TryGetProperty("browser_download_url", out var u) ? u.GetString() ?? "" : ""; + if (string.IsNullOrWhiteSpace(name) || string.IsNullOrWhiteSpace(url)) continue; + + var rid = PlatformFromAssetName(name); + if (rid == null) continue; + + var size = a.TryGetProperty("size", out var s) && s.TryGetInt64(out var sz) ? sz : 0; + result.Launcher.Packages[rid] = new RepoPackage + { + Url = url, + AssetName = name, + Size = size + }; + } + } + + return result.Launcher.Packages.Count > 0 ? result : null; + } + catch (Exception ex) + { + Console.Error.WriteLine($"[gitea] Release 读取失败({_preset.Name}): {ex.Message}"); + return null; + } + } + + /// 从附件名推断 RID:GC-1.0.6-win-amd64.zip → win-x64 + private static string? PlatformFromAssetName(string name) + { + var n = name.ToLowerInvariant(); + if (!n.EndsWith(".zip")) return null; + if (n.Contains("win") && n.Contains("arm64")) return "win-arm64"; + if (n.Contains("win") && (n.Contains("amd64") || n.Contains("x64"))) return "win-x64"; + if (n.Contains("mac") && n.Contains("arm64")) return "osx-arm64"; + if (n.Contains("mac") && n.Contains("x64")) return "osx-x64"; + if (n.Contains("linux") && n.Contains("x64")) return "linux-x64"; + return null; + } + + // ---------------------------------------------------------------- 目录 + + public async Task> ListTreeAsync(string rootPath, CancellationToken ct) + { + var result = new List(); + await WalkAsync(rootPath.Trim('/'), "", result, ct, depth: 0); + return result; + } + + private async Task WalkAsync(string apiPath, string relPrefix, List sink, + CancellationToken ct, int depth) + { + if (depth > 8) return; + + var url = $"{RepoRepoContentsUrl()}/{apiPath}"; + string json; + try { json = await Http.GetStringAsync(url, ct); } + catch (Exception ex) + { + Console.Error.WriteLine($"[gitea] 列目录失败 {apiPath}: {ex.Message}"); + return; + } + + using var doc = JsonDocument.Parse(json); + var root = doc.RootElement; + + // 单文件 + if (root.ValueKind == JsonValueKind.Object) + { + AddFile(root, relPrefix, sink); + return; + } + if (root.ValueKind != JsonValueKind.Array) return; + + var subdirs = new List<(string Path, string Rel)>(); + foreach (var item in root.EnumerateArray()) + { + var type = item.TryGetProperty("type", out var ty) ? ty.GetString() ?? "" : ""; + var name = item.TryGetProperty("name", out var nm) ? nm.GetString() ?? "" : ""; + if (string.IsNullOrEmpty(name)) continue; + // 跳过构建产物与源码,模型包只需要清单与数据 + if (type == "dir") + { + if (IsIgnoredDir(name)) continue; + subdirs.Add((apiPath + "/" + name, relPrefix + name + "/")); + } + else + { + AddFile(item, relPrefix, sink); + } + } + + foreach (var (p, rel) in subdirs) + await WalkAsync(p, rel, sink, ct, depth + 1); + } + + private string RepoRepoContentsUrl() => $"{RepoApi}/contents"; + + private static void AddFile(JsonElement item, string relPrefix, List sink) + { + var name = item.TryGetProperty("name", out var n) ? n.GetString() ?? "" : ""; + var path = item.TryGetProperty("path", out var p) ? p.GetString() ?? "" : name; + var size = item.TryGetProperty("size", out var s) && s.TryGetInt64(out var sz) ? sz : 0; + var dl = item.TryGetProperty("download_url", out var d) ? d.GetString() : null; + var sha = item.TryGetProperty("sha", out var sh) ? sh.GetString() : null; + + sink.Add(new RepoEntry + { + Name = name, + Path = path, + RelativePath = relPrefix + name, + IsDirectory = false, + DownloadUrl = dl, + Size = size, + Sha = sha + }); + } + + private static bool IsIgnoredDir(string name) => + name is "src" or "bin" or "obj" or "node_modules" or ".git" or ".vs" + or ".idea" or ".vscode"; + + // ---------------------------------------------------------------- 下载 + + public async Task DownloadAsync(RepoEntry entry, CancellationToken ct) + { + // 优先用 API 提供的 download_url;没有就按 raw 规约拼 + var url = entry.DownloadUrl; + if (string.IsNullOrWhiteSpace(url)) + url = _preset.RawUrl(entry.Path); + + return await Http.GetByteArrayAsync(url, ct); + } + + public async Task DownloadPackageAsync(RepoPackage package, CancellationToken ct) + { + if (string.IsNullOrWhiteSpace(package.Url)) return null; + try { return await Http.GetByteArrayAsync(package.Url, ct); } + catch (Exception ex) + { + Console.Error.WriteLine($"[gitea] 下载更新包失败: {ex.Message}"); + return null; + } + } +} diff --git a/src/main/dotnet/EarthModelStudio/Services/LauncherUpdater.cs b/src/main/dotnet/EarthModelStudio/Services/LauncherUpdater.cs index 93ad311..814f8e2 100644 --- a/src/main/dotnet/EarthModelStudio/Services/LauncherUpdater.cs +++ b/src/main/dotnet/EarthModelStudio/Services/LauncherUpdater.cs @@ -66,25 +66,219 @@ public static class LauncherUpdater /// 检查 Release latest 版本。返回 latest 版本号;若与当前运行版本相同返回 null。 /// 只比版本号,不比 sha256。 /// + /// + /// 检查启动器新版本:**两个源(Xhmcl / GitCode)的 Release 都要查**, + /// 取版本号最高的那个作为最新版。任何一个源失败不影响另一个。 + /// + public static async Task CheckAsync(CancellationToken ct = default) + => await CheckAllAsync(null, ct); + + /// 兼容旧调用:优先用给定 remote,同时仍会比对另一个源。 public static async Task CheckAsync(IModelRemote remote, CancellationToken ct = default) + => await CheckAllAsync(remote, ct); + + private static async Task CheckAllAsync(IModelRemote? preferred, CancellationToken ct) + { + var candidates = new List<(string Source, string Version)>(); + + foreach (var preset in SourcePreset.All) + { + try + { + // 优先复用调用方已建好的 remote(避免重复建实例) + var remote = preferred != null && + SourcePreset.Detect(preferred.DisplayName).Id == preset.Id + ? preferred + : SourceSelector.CreateRemote(preset); + + var version = await remote.GetVersionAsync(ct); + var v = (version?.Launcher.Version ?? "").Trim(); + if (v.Length == 0) + { + Console.WriteLine($"[update] {preset.Name}: 没有版本信息(可能还没发 Release)"); + continue; + } + Console.WriteLine($"[update] {preset.Name}: {v}"); + candidates.Add((preset.Name, v)); + } + catch (Exception ex) + { + Console.Error.WriteLine($"[update] {preset.Name} 检查失败: {ex.Message}"); + } + } + + if (candidates.Count == 0) return null; + + // 取版本号最高的(第 7 项) + var best = candidates.OrderByDescending(c => VersionUtil.Parse(c.Version)).First(); + Console.WriteLine($"[update] 最新版:{best.Version}(来自 {best.Source})"); + + var cmp = VersionUtil.Compare(best.Version, RunningVersion); + + // 远端版本更新 → 提示更新 + if (cmp > 0) + { + Console.WriteLine($"[update] 远端 {best.Version} > 本地 {RunningVersion},提示更新"); + return best.Version; + } + + // 远端版本更旧 → 不提示 + if (cmp < 0) + { + Console.WriteLine($"[update] 远端 {best.Version} < 本地 {RunningVersion},不提示"); + return null; + } + + // 版本号相同:比对当前程序的 sha256 与 Release 包 + // 相符 → 视为最新,不提示 + // 不相符 → 说明是重新编译的同版本程序,必须提示下载 + var same = await SameFingerprintAsync(best.Source, best.Version, ct); + if (same == null) + { + Console.WriteLine("[update] 版本相同但无法比对 sha256,按最新处理"); + return null; + } + if (same.Value) + { + Console.WriteLine("[update] 版本相同且 sha256 一致,已是最新"); + return null; + } + + // 版本相同但指纹不同:是自行编译的构建,不提示更新 + Console.WriteLine("[update] 版本相同但 sha256 不一致,不提示更新"); + return null; + } + /// + /// 比对「当前运行程序」与「Release 平台包」的 sha256。 + /// 返回 true=一致(确属同一份构建)、false=不一致(需重新下载)、null=无法比对。 + /// + private static async Task SameFingerprintAsync(string sourceName, string version, + CancellationToken ct) { try { - var version = await remote.GetVersionAsync(ct); - if (version == null) return null; - var latest = (version.Launcher.Version ?? "").Trim(); - if (latest.Length == 0) return null; - return string.Equals(latest, RunningVersion, StringComparison.OrdinalIgnoreCase) - ? null - : latest; + var preset = SourcePreset.All.FirstOrDefault(p => + string.Equals(p.Name, sourceName, StringComparison.OrdinalIgnoreCase)); + if (preset == null) return null; + + var rid = CurrentRid; + Console.WriteLine($"[update] 抓取 {preset.Name} 的 {rid} 发布包用于比对…"); + + // 定位进程对应的可执行文件 / .app + var self = Environment.ProcessPath; + if (string.IsNullOrWhiteSpace(self)) return null; + var selfPath = self!; + // 单文件 / dotnet 宿主时退回到程序集位置 + if (Path.GetFileNameWithoutExtension(selfPath).Equals("dotnet", StringComparison.OrdinalIgnoreCase)) + selfPath = typeof(LauncherUpdater).Assembly.Location; + + var selfHash = await HashFileAsync(selfPath, ct); + Console.WriteLine($"[update] 本地程序 sha256 = {selfHash[..16]}…"); + + // 下载 Release 对应平台包,取包内主程序再算 + var remote = SourceSelector.CreateRemote(preset); + var v = await remote.GetVersionAsync(ct); + if (v == null || !v.Launcher.Packages.TryGetValue(rid, out var pkg) || pkg == null) + return null; + + var bytes = await remote.DownloadPackageAsync(pkg, ct); + if (bytes == null || bytes.Length == 0) return null; + + var remoteHash = await HashZipPayloadAsync(bytes, ct); + if (remoteHash == null) return null; + Console.WriteLine($"[update] 远端包 sha256 = {remoteHash[..16]}…"); + + return string.Equals(selfHash, remoteHash, StringComparison.OrdinalIgnoreCase); } catch (Exception ex) { - Console.Error.WriteLine($"检查更新失败: {ex.Message}"); + Console.WriteLine($"[update] sha256 比对失败: {ex.Message}"); return null; } } + private static async Task HashFileAsync(string path, CancellationToken ct) + { + await using var fs = File.OpenRead(path); + var hash = await System.Security.Cryptography.SHA256.HashDataAsync(fs, ct); + return Convert.ToHexString(hash); + } + + /// 从发布包(zip)里取出主程序并算 sha256。 + private static async Task HashZipPayloadAsync(byte[] zip, CancellationToken ct) + { + try + { + using var ms = new MemoryStream(zip); + using var archive = new System.IO.Compression.ZipArchive(ms, System.IO.Compression.ZipArchiveMode.Read); + // 找主程序:app 内的可执行文件 / EarthModelStudio.dll / 单文件 exe + var entry = archive.Entries.FirstOrDefault(e => + e.Name.Equals("EarthModelStudio.dll", StringComparison.OrdinalIgnoreCase)) + ?? archive.Entries.FirstOrDefault(e => + e.Name.Equals("EarthModelStudio", StringComparison.OrdinalIgnoreCase)) + ?? archive.Entries.FirstOrDefault(e => + e.Name.EndsWith(".dll", StringComparison.OrdinalIgnoreCase) && + e.Name.StartsWith("EarthModelStudio", StringComparison.OrdinalIgnoreCase)); + if (entry == null) return null; + + await using var es = entry.Open(); + using var buf = new MemoryStream(); + await es.CopyToAsync(buf, ct); + var hash = System.Security.Cryptography.SHA256.HashData(buf.ToArray()); + return Convert.ToHexString(hash); + } + catch { return null; } + } + + /// + /// 遍历所有源的 Release,取**版本号最高且包含本平台发布包**的那个。 + /// 某个源没有 Release(返回 null)时自动跳过。 + /// + private static async Task<(RepoVersion Version, IModelRemote Remote)?> GetBestReleaseAsync( + IModelRemote fallback, CancellationToken ct) + { + var rid = CurrentRid; + var found = new List<(string Source, RepoVersion Version, IModelRemote Remote)>(); + + foreach (var preset in SourcePreset.All) + { + try + { + var remote = SourceSelector.CreateRemote(preset); + var v = await remote.GetVersionAsync(ct); + if (v == null) + { + Console.WriteLine($"[update] {preset.Name}: 无 Release"); + continue; + } + if (string.IsNullOrWhiteSpace(v.Launcher.Version) || v.Launcher.Packages.Count == 0) + { + Console.WriteLine($"[update] {preset.Name}: 没有可用的启动器发布包"); + continue; + } + var hasPkg = v.Launcher.Packages.ContainsKey(rid) || + v.Launcher.Packages.ContainsKey("default"); + if (!hasPkg) + { + Console.WriteLine($"[update] {preset.Name}: v{v.Launcher.Version} 缺少 {rid} 发布包"); + continue; + } + Console.WriteLine($"[update] {preset.Name}: v{v.Launcher.Version} 可用"); + found.Add((preset.Name, v, remote)); + } + catch (Exception ex) + { + Console.Error.WriteLine($"[update] {preset.Name} 读取失败: {ex.Message}"); + } + } + + if (found.Count == 0) return null; + + var best = found.OrderByDescending(f => VersionUtil.Parse(f.Version.Launcher.Version)).First(); + Console.WriteLine($"[update] 选中最新的可用发布包:v{best.Version.Launcher.Version}({best.Source})"); + return (best.Version, best.Remote); + } + // ---------------------------------------------------------------- 下载 /// @@ -99,10 +293,28 @@ public static class LauncherUpdater try { progress?.Report(new UpdateProgressInfo { Value = 0.05, Stage = "正在读取最新版本" }); - var version = await remote.GetVersionAsync(ct); - if (version == null) return Fail("无法读取 Release 版本清单"); - var latest = (version.Launcher.Version ?? "").Trim(); + // 两个源都问一遍:某个源没发 Release 时自动换另一个, + // 与「检查更新」保持同一套规则,避免检查通过、下载却报无法读取。 + var version = await remote.GetVersionAsync(ct); + + // 当前源没有可用的启动器版本(没发 Release / 版本号为空)→ 换另一个源。 + // 注意:模型清单可能仍然有效,但启动器升级必须有 Release。 + var hasUsable = version != null && + !string.IsNullOrWhiteSpace(version.Launcher.Version) && + version.Launcher.Packages.Count > 0; + + if (!hasUsable) + { + var tried = SourcePreset.Find(remote.SourceId)?.Name ?? remote.DisplayName; + Console.WriteLine($"[update] {tried} 没有可用的启动器发布包,换另一个源"); + var pick = await GetBestReleaseAsync(remote, ct); + if (pick == null) return Fail("两个源都没有可用的 Release 发布包"); + version = pick.Value.Version; + remote = pick.Value.Remote; // 后续下载必须用这个源的 remote + } + + var latest = (version!.Launcher.Version ?? "").Trim(); var rid = CurrentRid; if (!version.Launcher.Packages.TryGetValue(rid, out var pkg) && !version.Launcher.Packages.TryGetValue("default", out pkg)) diff --git a/src/main/dotnet/EarthModelStudio/Services/SettingsService.cs b/src/main/dotnet/EarthModelStudio/Services/SettingsService.cs index 9c39ad6..a2b4fb1 100644 --- a/src/main/dotnet/EarthModelStudio/Services/SettingsService.cs +++ b/src/main/dotnet/EarthModelStudio/Services/SettingsService.cs @@ -23,35 +23,35 @@ public sealed class SettingsService } /// - /// 默认下载源(gitcode 官方仓库)始终内置在列表里,且不允许删除: - /// 它是启动器自动更新的同源仓库,用户清掉会导致模型无法回退。 - /// 老配置里没有这条时自动补上;已有的用户自定义源保持不变。 + /// 只允许两个内置源:Xhmcl 与 GitCode(同一份仓库的两个镜像)。 + /// 不再支持用户自定义源 —— 每次加载都把 Sources 规整成这两条, + /// 老配置里的自定义源会被清理掉。 /// - public const string DefaultSourceId = "gitcode-official"; + public const string DefaultSourceId = "gitcode"; public const string DefaultSourceUrl = "https://gitcode.com/2509_92447106/GC"; private void SeedDefaultSource() { - var existing = Current.Sources.FirstOrDefault(s => - string.Equals(s.Id, DefaultSourceId, StringComparison.OrdinalIgnoreCase)); - if (existing == null) + var rebuilt = new List(); + foreach (var preset in SourcePreset.All) { - Current.Sources.Insert(0, new ModelSource + // 保留用户对「启用/停用」的选择,其余字段以内置定义为准 + var old = Current.Sources.FirstOrDefault(s => + SourcePreset.Detect(s.Url).Id == preset.Id); + rebuilt.Add(new ModelSource { - Id = DefaultSourceId, - Name = "Morris GC (GitCode)", - Url = DefaultSourceUrl, - Enabled = true, + Id = preset.Id, + Name = preset.Name, + Url = preset.HomeUrl, + Enabled = old?.Enabled ?? true, BuiltIn = true }); - Save(); - } - else - { - // 强制保证内置标记与地址,避免旧配置被用户改坏后失去保护 - existing.BuiltIn = true; - if (string.IsNullOrWhiteSpace(existing.Url)) existing.Url = DefaultSourceUrl; } + + var changed = Current.Sources.Count != rebuilt.Count || + Current.Sources.Any(s => !s.BuiltIn); + Current.Sources = rebuilt; + if (changed) Save(); } public void Save() diff --git a/src/main/dotnet/EarthModelStudio/Services/SourcePreset.cs b/src/main/dotnet/EarthModelStudio/Services/SourcePreset.cs new file mode 100644 index 0000000..9b41018 --- /dev/null +++ b/src/main/dotnet/EarthModelStudio/Services/SourcePreset.cs @@ -0,0 +1,79 @@ +using System; +using System.Collections.Generic; +using System.Linq; + +namespace EarthModelStudio.Services; + +/// +/// 内置下载源。只允许这两个,不再支持用户自定义源。 +/// +/// 两个源的内容是同一份仓库(同一个 version.json、同一批模型), +/// 区别只是**托管在哪台服务器**上;启动时探测两者延迟,取快的那个下载。 +/// +public sealed class SourcePreset +{ + public string Id { get; init; } = ""; + public string Name { get; init; } = ""; + /// 仓库主页(用于展示与打开)。 + public string HomeUrl { get; init; } = ""; + /// API 根地址(Gitea: /api/v1,GitCode: /api/v5)。 + public string ApiBase { get; init; } = ""; + /// 原始文件下载前缀(用于拼 raw 地址)。 + public string RawBase { get; init; } = ""; + /// 后端类型:gitea / gitcode。 + public string Kind { get; init; } = ""; + public string Owner { get; init; } = ""; + public string Repo { get; init; } = ""; + public string Branch { get; init; } = "main"; + /// raw 地址风格:gitea 用 raw/branch/{b},gitcode 用 raw/{b}。 + public string RawStyle { get; init; } = "branch"; + + public string Repository => HomeUrl; + + /// 拼 raw 文件下载地址(两个平台的 URL 结构不同)。 + public string RawUrl(string path) => RawStyle == "plain" + ? $"{RawBase}/{Owner}/{Repo}/raw/{Branch}/{path.TrimStart('/')}" + : $"{RawBase}/{Owner}/{Repo}/raw/branch/{Branch}/{path.TrimStart('/')}"; + + public static readonly SourcePreset Xhmcl = new() + { + Id = "xhmcl", + Name = "Xhmcl", + HomeUrl = "https://git.xhmcl.com/Morris/GC", + ApiBase = "https://git.xhmcl.com/api/v1", + RawBase = "https://git.xhmcl.com", + Kind = "gitea", + RawStyle = "branch", + Owner = "Morris", + Repo = "GC", + Branch = "main" + }; + + public static readonly SourcePreset GitCode = new() + { + Id = "gitcode", + Name = "GitCode", + HomeUrl = "https://gitcode.com/2509_92447106/GC", + ApiBase = "https://api.gitcode.com/api/v5", + RawBase = "https://gitcode.com", + Kind = "gitcode", + RawStyle = "plain", + Owner = "2509_92447106", + Repo = "GC", + Branch = "main" + }; + + public static readonly SourcePreset[] All = { Xhmcl, GitCode }; + + public static SourcePreset? Find(string? id) => + All.FirstOrDefault(p => string.Equals(p.Id, id, StringComparison.OrdinalIgnoreCase)); + + /// 把任意仓库地址映射到这两个内置源之一(用于兼容旧配置)。 + public static SourcePreset Detect(string? url) + { + if (string.IsNullOrWhiteSpace(url)) return GitCode; + var u = url!.ToLowerInvariant(); + if (u.Contains("xhmcl.com")) return Xhmcl; + return GitCode; + } +} diff --git a/src/main/dotnet/EarthModelStudio/Services/SourceSelector.cs b/src/main/dotnet/EarthModelStudio/Services/SourceSelector.cs new file mode 100644 index 0000000..08a430e --- /dev/null +++ b/src/main/dotnet/EarthModelStudio/Services/SourceSelector.cs @@ -0,0 +1,130 @@ +using System; +using System.Collections.Generic; +using System.Diagnostics; +using System.Linq; +using System.Net.Http; +using System.Threading; +using System.Threading.Tasks; + +namespace EarthModelStudio.Services; + +/// +/// 双源选择:Xhmcl 与 GitCode 是同一份仓库的两个镜像。 +/// +/// 启动更新 / 下载页面 / 检查更新时,先并发探测两边的 version.json 响应时间, +/// 取**最快且内容可用**的那个作为本次下载源;探测结果缓存一段时间, +/// 避免每次点下载都重新测速。 +/// +public sealed class SourceSelector +{ + private static readonly HttpClient Http = CreateHttp(); + + private static HttpClient CreateHttp() + { + var c = new HttpClient { Timeout = TimeSpan.FromSeconds(6) }; + c.DefaultRequestHeaders.UserAgent.ParseAdd("EarthModelStudio-Probe/1.0"); + return c; + } + + private readonly object _lock = new(); + private SourcePreset? _cached; + private DateTime _cachedAt = DateTime.MinValue; + private readonly TimeSpan _ttl = TimeSpan.FromMinutes(3); + + /// 最近一次选中的源(未探测时为空)。 + public SourcePreset? Current { get { lock (_lock) return _cached; } } + + /// 每个源的探测耗时(毫秒),供界面展示。 + public IReadOnlyDictionary LastLatency { get; private set; } = + new Dictionary(); + + /// + /// 探测两个源并返回最快的。force=true 时忽略缓存。 + /// 两个都失败时返回 GitCode(默认源)。 + /// + public async Task PickFastestAsync(bool force = false, CancellationToken ct = default) + { + lock (_lock) + { + if (!force && _cached != null && DateTime.UtcNow - _cachedAt < _ttl) + return _cached; + } + + var probes = SourcePreset.All.Select(async p => + { + var sw = Stopwatch.StartNew(); + var ok = await ProbeAsync(p, ct); + sw.Stop(); + return (Preset: p, Ok: ok, Ms: sw.ElapsedMilliseconds); + }); + + var results = await Task.WhenAll(probes); + + var latencies = results.ToDictionary(r => r.Preset.Id, r => r.Ms); + LastLatency = latencies; + + var usable = results.Where(r => r.Ok).OrderBy(r => r.Ms).ToList(); + var chosen = usable.Count > 0 ? usable[0].Preset : SourcePreset.GitCode; + + lock (_lock) + { + _cached = chosen; + _cachedAt = DateTime.UtcNow; + } + + Console.WriteLine("[selector] 测速:" + string.Join(" ", + results.Select(r => $"{r.Preset.Name}={r.Ms}ms{(r.Ok ? "" : "(不可用)")}")) + + $" → 选择 {chosen.Name}"); + + return chosen; + } + + /// + /// 探测:能拿到合法 JSON 才算可用。 + /// 注意两个平台取文件的方式不同: + /// · Gitea(Xhmcl):raw/branch/{b}/{path} 直接返回文件内容 + /// · GitCode:raw 地址返回的是 HTML 页面,必须走 API(内容为 base64) + /// 因此 GitCode 用 api/v5 contents + Accept: application/json 探测。 + /// + private static async Task ProbeAsync(SourcePreset preset, CancellationToken ct) + { + if (preset.Kind == "gitcode") + { + try + { + using var cts = CancellationTokenSource.CreateLinkedTokenSource(ct); + cts.CancelAfter(TimeSpan.FromSeconds(5)); + var api = $"{preset.ApiBase}/repos/{preset.Owner}/{preset.Repo}/contents/version.json?ref={preset.Branch}"; + using var req = new HttpRequestMessage(HttpMethod.Get, api); + req.Headers.Accept.ParseAdd("application/json"); + using var resp = await Http.SendAsync(req, cts.Token); + if (!resp.IsSuccessStatusCode) return false; + var text = await resp.Content.ReadAsStringAsync(cts.Token); + return text.TrimStart().StartsWith('{'); + } + catch { return false; } + } + + var urls = new[] { preset.RawUrl("version.json"), preset.RawUrl("model/version.json") }; + + foreach (var url in urls) + { + try + { + using var cts = CancellationTokenSource.CreateLinkedTokenSource(ct); + cts.CancelAfter(TimeSpan.FromSeconds(5)); + var text = await Http.GetStringAsync(url, cts.Token); + if (text.TrimStart().StartsWith('{')) return true; + } + catch { /* 换下一个地址 */ } + } + return false; + } + + /// 为指定源创建对应的 remote 实现。 + public static IModelRemote CreateRemote(SourcePreset preset) => preset.Kind switch + { + "gitea" => new GiteaRemote(preset), + _ => new GitCodeReleaseRemote(null, preset.HomeUrl) + }; +} diff --git a/src/main/dotnet/EarthModelStudio/Services/UpdateModels.cs b/src/main/dotnet/EarthModelStudio/Services/UpdateModels.cs index 56d3b1e..be88e6d 100644 --- a/src/main/dotnet/EarthModelStudio/Services/UpdateModels.cs +++ b/src/main/dotnet/EarthModelStudio/Services/UpdateModels.cs @@ -64,6 +64,9 @@ public sealed class RepoEntry public interface IModelRemote { string DisplayName { get; } + + /// 源标识(xhmcl / gitcode / local),用于判断当前是哪个源。 + string SourceId => SourcePreset.Detect(DisplayName).Id; Task GetVersionAsync(CancellationToken ct); Task> ListTreeAsync(string rootPath, CancellationToken ct); Task DownloadAsync(RepoEntry entry, CancellationToken ct); diff --git a/src/main/dotnet/EarthModelStudio/Services/UpdateService.cs b/src/main/dotnet/EarthModelStudio/Services/UpdateService.cs index 5e46b52..cdd425d 100644 --- a/src/main/dotnet/EarthModelStudio/Services/UpdateService.cs +++ b/src/main/dotnet/EarthModelStudio/Services/UpdateService.cs @@ -21,7 +21,7 @@ public sealed class UpdateService { private readonly AppPaths _paths; private readonly SettingsService _settings; - private readonly IModelRemote _remote; + private IModelRemote _remote; public UpdateService(AppPaths paths, SettingsService settings, IModelRemote remote) { @@ -32,16 +32,41 @@ public sealed class UpdateService public IModelRemote Remote => _remote; + /// 换源:测速选出最快的一个后,用它的 remote 覆盖当前实例。 + public void UseRemote(IModelRemote remote) => _remote = remote; + + private static string? _versionOverride; + public static string CurrentLauncherVersion { get { - var v = Assembly.GetEntryAssembly()?.GetName().Version; + if (!string.IsNullOrWhiteSpace(_versionOverride)) return _versionOverride!; + + // 用**本程序集**的版本,而不是 GetEntryAssembly()。 + // EntryAssembly 在宿主(dotnet run / 测试宿主 / 单文件解包)下可能指向别的程序, + // 读出来会变成 1.0.0,导致「明明是最新版却一直提示有更新」。 + var asm = typeof(UpdateService).Assembly; + var v = asm.GetName().Version; + if (v == null || (v.Major == 0 && v.Minor == 0 && v.Build == 0)) + { + // 兜底:读 InformationalVersion(Directory.Build.props 里的 ) + var info = asm.GetCustomAttribute()?.InformationalVersion; + if (!string.IsNullOrWhiteSpace(info)) + { + var core = info!.Split('+')[0].Trim(); + if (Version.TryParse(core, out var iv)) + v = iv; + } + } if (v == null) return "0.0.0"; return $"{Math.Max(0, v.Major)}.{Math.Max(0, v.Minor)}.{Math.Max(0, v.Build)}"; } } + /// 测试 / 自检时临时指定版本号。 + public static void OverrideLauncherVersion(string? version) => _versionOverride = version; + public static string CurrentRid { get @@ -59,14 +84,31 @@ public sealed class UpdateService } } + /// + /// 同步版本(无法测速时用):按设置里的仓库地址映射到内置源。 + /// 真正带测速的入口是 。 + /// public static IModelRemote CreateRemote(AppSettings settings) { if (!string.IsNullOrWhiteSpace(settings.UpdateLocalRoot) && Directory.Exists(settings.UpdateLocalRoot!)) - return new DirectoryRemote(settings.UpdateLocalRoot!); // 离线 U 盘源:仍读本地 version.json - // 在线源:启动器版本与发布包走 GitCode Release(tag + 附件), - // 模型清单/文件仍走仓库 contents API;无 Release 时自动回退仓库 version.json。 - return new GitCodeReleaseRemote(settings.UpdateManifestUrl, settings.UpdateRepository); + return new DirectoryRemote(settings.UpdateLocalRoot!); + return SourceSelector.CreateRemote(SourcePreset.Detect(settings.UpdateRepository)); + } + + /// + /// 异步版本:先探测 Xhmcl / GitCode 两个源,取最快的那个。 + /// 启动更新、下载页、检查更新统一走这里,保证「用同一个源、同一种下载方式」。 + /// + public static async Task CreateRemoteAsync(AppSettings settings, + SourceSelector selector, bool forceProbe = false, CancellationToken ct = default) + { + if (!string.IsNullOrWhiteSpace(settings.UpdateLocalRoot) && + Directory.Exists(settings.UpdateLocalRoot!)) + return new DirectoryRemote(settings.UpdateLocalRoot!); + + var preset = await selector.PickFastestAsync(forceProbe, ct); + return SourceSelector.CreateRemote(preset); } public async Task RunAsync(bool force, diff --git a/src/main/dotnet/EarthModelStudio/Services/VersionUtil.cs b/src/main/dotnet/EarthModelStudio/Services/VersionUtil.cs new file mode 100644 index 0000000..9a5d8a1 --- /dev/null +++ b/src/main/dotnet/EarthModelStudio/Services/VersionUtil.cs @@ -0,0 +1,41 @@ +using System; +using System.Globalization; + +namespace EarthModelStudio.Services; + +/// +/// 版本号工具:Release tag 有 v1.0.6 / GC-1.0.6 / 1.0.6 等写法, +/// 统一成可比较的 Version 再排序,挑**版本号最高**的那个。 +/// +public static class VersionUtil +{ + /// 把 tag 规整成 "1.0.6" 这样的纯数字版本。 + public static string Normalize(string? tag) + { + if (string.IsNullOrWhiteSpace(tag)) return ""; + var s = tag!.Trim(); + + // 去掉前缀:v / V / GC- / release- + if (s.StartsWith("GC-", StringComparison.OrdinalIgnoreCase)) s = s[3..]; + else if (s.StartsWith("release-", StringComparison.OrdinalIgnoreCase)) s = s[8..]; + s = s.TrimStart('v', 'V'); + + // 只保留开头的 数字与点 + var end = 0; + while (end < s.Length && (char.IsDigit(s[end]) || s[end] == '.')) end++; + s = s[..end].Trim('.'); + + return s; + } + + /// 解析成 Version;无法解析时返回 0.0。 + public static Version Parse(string? tag) + { + var n = Normalize(tag); + if (string.IsNullOrWhiteSpace(n)) return new Version(0, 0); + return Version.TryParse(n, out var v) ? v : new Version(0, 0); + } + + /// 比较两个版本号,a>b 返回正、a<b 返回负、相等返回 0。 + public static int Compare(string? a, string? b) => Parse(a).CompareTo(Parse(b)); +} diff --git a/src/main/dotnet/EarthModelStudio/ViewModels/DownloadViewModel.cs b/src/main/dotnet/EarthModelStudio/ViewModels/DownloadViewModel.cs index d68264e..bef5f9f 100644 --- a/src/main/dotnet/EarthModelStudio/ViewModels/DownloadViewModel.cs +++ b/src/main/dotnet/EarthModelStudio/ViewModels/DownloadViewModel.cs @@ -109,30 +109,30 @@ public partial class DownloadViewModel : ObservableObject } } + /// + /// 只允许两个内置源(Xhmcl / GitCode),不再接受任意地址。 + /// 旧的「自定义源」入口统一改为:按测速结果切换到更快的那个源。 + /// [RelayCommand] private async Task ImportAsync() { - var url = ImportUrl.Trim(); - if (string.IsNullOrWhiteSpace(url)) + var fastest = await _services.Selector.PickFastestAsync(force: true); + var target = Sources.FirstOrDefault(x => + SourcePreset.Find(fastest.Id) != null && + SourcePreset.Detect(x.Model.Url).Id == fastest.Id); + + if (target == null) { - StatusMessage = L.I["dl.error.emptyUrl"]; + StatusMessage = "没有可用的下载源"; return; } - var source = new ModelSource - { - Name = DeriveName(url), - Url = url, - Enabled = true - }; - _services.Settings.Current.Sources.Add(source); - _services.Settings.Save(); - - var item = new SourceItemViewModel(source, this, _services); - Sources.Add(item); - ImportUrl = ""; - SelectedSource = item; - await LoadAsync(item, force: true); + SelectedSource = target; + var lat = _services.Selector.LastLatency; + StatusMessage = $"已切换到 {fastest.Name}" + + (lat.Count > 0 ? "(" + string.Join(",", lat.Select(kv => + $"{SourcePreset.Find(kv.Key)?.Name ?? kv.Key} {kv.Value}ms")) + ")" : ""); + await LoadAsync(target, force: true); } private static string DeriveName(string url) @@ -173,6 +173,24 @@ public partial class DownloadViewModel : ObservableObject StatusMessage = L.I["dl.syncing"]; try { + // 第 6 项:下载页与启动更新用同一个源、同一种下载方式。 + // 每次加载前先让选择器给出最快源(有缓存,不会真的每次都测)。 + try + { + var fastest = await _services.Selector.PickFastestAsync(false, ct); + if (fastest.Id != SourcePreset.Detect(source.Model.Url).Id) + { + var prefer = Sources.FirstOrDefault(x => + SourcePreset.Detect(x.Model.Url).Id == fastest.Id && x.Model.Enabled); + if (prefer != null && prefer != source) + { + SelectedSource = prefer; + source = prefer; + } + } + } + catch { /* 测速失败就沿用当前源 */ } + var index = await _services.Sources.FetchAsync(source.Model, force, null, ct); // 只有「仍是当前选中源 + 仍是最新一次加载」才可以写 UI 集合 if (ct.IsCancellationRequested || generation != _loadGeneration || SelectedSource != source) diff --git a/src/main/dotnet/EarthModelStudio/ViewModels/MainViewModel.cs b/src/main/dotnet/EarthModelStudio/ViewModels/MainViewModel.cs index c3673ab..885f8f1 100644 --- a/src/main/dotnet/EarthModelStudio/ViewModels/MainViewModel.cs +++ b/src/main/dotnet/EarthModelStudio/ViewModels/MainViewModel.cs @@ -1,4 +1,5 @@ using System; +using System.Linq; using System.Threading.Tasks; using CommunityToolkit.Mvvm.ComponentModel; using CommunityToolkit.Mvvm.Input; @@ -135,6 +136,24 @@ public partial class MainViewModel : ObservableObject UpdateDetail = p.Detail ?? ""; }); + // 双源测速:Xhmcl / GitCode 取快的那个(第 5 项)。 + // 启动更新与下载页共用同一个选择器,保证两处用同一个源、同一种下载方式。 + UpdateStatus = "正在选择最快的下载源…"; + try + { + var fastest = await _services.Selector.PickFastestAsync( + force, default); + _services.Updates.UseRemote(SourceSelector.CreateRemote(fastest)); + var lat = _services.Selector.LastLatency; + UpdateDetail = "源:" + fastest.Name + + (lat.Count > 0 ? "(" + string.Join(",", lat.Select(kv => + $"{SourcePreset.Find(kv.Key)?.Name ?? kv.Key} {kv.Value}ms")) + ")" : ""); + } + catch (Exception ex) + { + Console.Error.WriteLine($"[update] 测速失败,沿用当前源: {ex.Message}"); + } + // 启动器:读 Release latest 版本号,与当前运行版本不同就弹窗询问 var latest = await LauncherUpdater.CheckAsync(_services.Updates.Remote); if (latest != null) diff --git a/src/main/dotnet/EarthModelStudio/Views/DownloadView.axaml b/src/main/dotnet/EarthModelStudio/Views/DownloadView.axaml index 4c08d47..e81b3c8 100644 --- a/src/main/dotnet/EarthModelStudio/Views/DownloadView.axaml +++ b/src/main/dotnet/EarthModelStudio/Views/DownloadView.axaml @@ -11,9 +11,9 @@ + - -