This commit is contained in:
2509_92447106 committed 2026-11-07 19:31:02 +08:00
1 parent ab39c5103d
commit d81ab2acaa
20 files changed
+312 -66

No files matched your search

@@ -38,7 +38,8 @@ public sealed class AppServices
var services = new AppServices(paths);
L.I.Initialize(services.Settings.Current.Language);
services.Memory.Apply(services.Settings.Current.MemoryMb);
services.Memory.ApplyAuto(services.Settings.Current.MemoryAuto,
services.Settings.Current.MemoryMb);
Current = services;
return services;
@@ -25,7 +25,7 @@ public sealed class GitCodeReleaseRemote : IModelRemote
private readonly GitCodeRemote _content;
private readonly HttpClient _http;
private readonly string _releasesUrl;
private readonly Dictionary<string, (string Url, string? Sha256, long Size)> _assets = new();
private readonly Dictionary<string, (string Url, string? Sha256, long Size, string Name)> _assets = new();
public GitCodeReleaseRemote(string? manifestUrl, string? repository, HttpClient? http = null)
{
@@ -101,7 +101,7 @@ public sealed class GitCodeReleaseRemote : IModelRemote
if (rid == null || string.IsNullOrWhiteSpace(asset.Url)) continue;
// 同名平台取第一个有效附件
if (!_assets.ContainsKey(rid))
_assets[rid] = (asset.Url, asset.Sha256, asset.Size);
_assets[rid] = (asset.Url, asset.Sha256, asset.Size, asset.Name);
}
// 把附件地址写回 packages:有附件就用附件的直链与校验值,
@@ -114,6 +114,7 @@ public sealed class GitCodeReleaseRemote : IModelRemote
version.Launcher.Packages[rid] = pkg;
}
pkg.Url = info.Url;
pkg.AssetName = info.Name;
if (!string.IsNullOrWhiteSpace(info.Sha256)) pkg.Sha256 = info.Sha256;
if (info.Size > 0) pkg.Size = info.Size;
}
@@ -141,13 +142,17 @@ public sealed class GitCodeReleaseRemote : IModelRemote
{
foreach (var a in assets.EnumerateArray())
{
// 跳过 GitCode 自动生成的源码包(type=source),只取真正的发布附件
var type = Str(a, "type");
if (string.Equals(type, "source", StringComparison.OrdinalIgnoreCase)) continue;
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")
Sha256 = Str(a, "sha256") ?? Str(a, "digest"),
Type = type
});
}
}
@@ -21,6 +21,27 @@ public sealed class MemoryBudget
Changed?.Invoke();
}
/// <summary>
/// 自动预算:取设备可用物理内存的一部分(约 1/4),
/// 夹在 512–8192 MB 之间,低配设备也不会因为预算过大而卡顿。
/// </summary>
public static int AutoComputeMb()
{
try
{
var info = GC.GetGCMemoryInfo();
var totalMb = info.TotalAvailableMemoryBytes / (1024.0 * 1024.0);
if (totalMb > 0)
return (int)Math.Clamp(Math.Round(totalMb / 4.0 / 256.0) * 256, 512, 8192);
}
catch { /* 平台不支持时回退默认值 */ }
return 2048;
}
/// <summary>按设置应用:auto 时自动计算,否则用手动值。</summary>
public void ApplyAuto(bool auto, int manualMb)
=> Apply(auto ? AutoComputeMb() : manualMb);
/// <summary>内存情况变化(例如模型窗口开关)时刷新展示。</summary>
public void Refresh() => Changed?.Invoke();
@@ -28,9 +28,17 @@ public sealed class ReleaseInfo
// "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 时只取版本段
// 形如 GC-1.0.1-Win-amd64 时只取版本段;但 2.3.0-beta 这类预发布串要保留完整。
// 用「后缀是否常见预发布标签」区分,避免把 "-Win" 误当成预发布。
var dash = raw.IndexOf('-');
if (dash > 0 && System.Version.TryParse(raw[..dash], out _)) raw = raw[..dash];
if (dash > 0 && System.Version.TryParse(raw[..dash], out _))
{
var tail = raw[(dash + 1)..].ToLowerInvariant();
bool isPrerelease = tail.StartsWith("alpha") || tail.StartsWith("beta") ||
tail.StartsWith("rc") || tail.StartsWith("pre") ||
tail.StartsWith("dev") || tail.StartsWith("snapshot");
if (!isPrerelease) raw = raw[..dash];
}
return raw;
}
}
@@ -41,11 +49,43 @@ public sealed class ReleaseAsset
public string? BrowserDownloadUrl { get; set; }
public string? DownloadUrl { get; set; }
public long Size { get; set; }
public string? Sha256 { get; set; }
/// <summary>附件类型:GitCode 用 "source" 表示自动生成的源码压缩包,需跳过。</summary>
public string? Type { get; set; }
private string? _sha256;
/// <summary>
/// 校验值。真实 Release 的 digest 形如 "sha256:899fc1...",
/// 这里统一剥掉算法前缀,只留 hex,便于与 SHA256.HashData 结果比较。
/// </summary>
public string? Sha256
{
get => _sha256;
set
{
if (string.IsNullOrWhiteSpace(value)) { _sha256 = null; return; }
var v = value!.Trim();
var colon = v.IndexOf(':');
if (colon > 0 && v[..colon].Equals("sha256", StringComparison.OrdinalIgnoreCase))
v = v[(colon + 1)..];
_sha256 = v.Trim();
}
}
[JsonIgnore]
public string Url => BrowserDownloadUrl ?? DownloadUrl ?? "";
/// <summary>单文件发布包(.exe 等)不能走解压,需要直接作为 payload 内容。</summary>
public bool IsSingleFile
{
get
{
var n = Name.ToLowerInvariant();
return !n.EndsWith(".zip", StringComparison.Ordinal) &&
!n.EndsWith(".tar.gz", StringComparison.Ordinal) &&
!n.EndsWith(".tgz", StringComparison.Ordinal);
}
}
/// <summary>解析附件名里的系统/架构,映射到 .NET RID。</summary>
/// <returns>如 win-x64 / win-arm64 / osx-arm64;无法识别返回 null。</returns>
public string? RidFromName(string fullName)
@@ -60,8 +100,12 @@ public sealed class ReleaseAsset
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
// x86_64 / x86-64 / amd64 / x64 都是 64 位;只有裸 "x86"/"win-x86" 才是 32 位
bool is64 = lower.Contains("x64") || lower.Contains("amd64") ||
lower.Contains("x86-64") || lower.Contains("x86_64");
bool x86 = !is64 && !arm64 &&
(lower.Contains("x86") || lower.Contains("win32") || lower.Contains("i386"));
// 其余(未显式标注 32 位)一律按 64 位处理,覆盖 "GC-1.0.1-Windows.zip" 这类简写
var arch = arm64 ? "arm64" : x86 ? "x86" : "x64";
if (win) return "win-" + arch;
@@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using EarthModelStudio.Models;
namespace EarthModelStudio.Services;
@@ -17,24 +18,40 @@ public sealed class SettingsService
public void Load()
{
Current = Json.Read<AppSettings>(_paths.SettingsFile) ?? new AppSettings();
if (Current.Sources.Count == 0) SeedSources();
SeedDefaultSource();
if (Current.MemoryMb < 256) Current.MemoryMb = 2048;
}
/// <summary>
/// 自动更新由 UpdateService 负责(版本清单 version.json),这里不预置任何在线源;
/// 只给「下载」页留一条空的自定义源占位。
/// 默认下载源(gitcode 官方仓库)始终内置在列表里,且不允许删除:
/// 它是启动器自动更新的同源仓库,用户清掉会导致模型无法回退。
/// 老配置里没有这条时自动补上;已有的用户自定义源保持不变。
/// </summary>
private void SeedSources()
public const string DefaultSourceId = "gitcode-official";
public const string DefaultSourceUrl = "https://gitcode.com/2509_92447106/GC";
private void SeedDefaultSource()
{
Current.Sources.Add(new ModelSource
var existing = Current.Sources.FirstOrDefault(s =>
string.Equals(s.Id, DefaultSourceId, StringComparison.OrdinalIgnoreCase));
if (existing == null)
{
Id = "custom",
Name = "自定义源",
Url = "",
Enabled = false
});
Save();
Current.Sources.Insert(0, new ModelSource
{
Id = DefaultSourceId,
Name = "Morris GC (GitCode)",
Url = DefaultSourceUrl,
Enabled = true,
BuiltIn = true
});
Save();
}
else
{
// 强制保证内置标记与地址,避免旧配置被用户改坏后失去保护
existing.BuiltIn = true;
if (string.IsNullOrWhiteSpace(existing.Url)) existing.Url = DefaultSourceUrl;
}
}
public void Save()
@@ -32,6 +32,8 @@ public sealed class RepoPackage
public string? Path { get; set; }
public string? Sha256 { get; set; }
public long Size { get; set; }
/// <summary>Release 附件名(用于判断是 zip 还是单文件 exe / .app.zip)。</summary>
public string? AssetName { get; set; }
}
public sealed class RepoModel
@@ -314,24 +314,36 @@ public sealed class UpdateService
Directory.CreateDirectory(_paths.UpdateRoot);
var payload = Path.Combine(_paths.UpdateRoot, "payload");
if (Directory.Exists(payload)) Directory.Delete(payload, true);
var zip = Path.Combine(_paths.CacheRoot, "launcher-" + Safe(launcher.Version) + ".zip");
await File.WriteAllBytesAsync(zip, bytes, ct);
try
Directory.CreateDirectory(payload);
// 单文件发布包(.exe / .app.zip 里的可执行文件不在此列)就是程序本体,不能解压。
// 直接按附件原名放进 payload,脚本会把 payload/ 整体覆盖到安装目录。
var assetName = package!.AssetName;
bool singleFile = !string.IsNullOrWhiteSpace(assetName) &&
!assetName!.EndsWith(".zip", StringComparison.OrdinalIgnoreCase) &&
!assetName.EndsWith(".tar.gz", StringComparison.OrdinalIgnoreCase);
string executableName;
if (singleFile)
{
ZipSafety.ExtractToDirectory(zip, payload);
executableName = Path.GetFileName(assetName!);
await File.WriteAllBytesAsync(Path.Combine(payload, executableName), bytes, ct);
}
finally
else
{
try { File.Delete(zip); } catch { }
var zip = Path.Combine(_paths.CacheRoot, "launcher-" + Safe(launcher.Version) + ".zip");
await File.WriteAllBytesAsync(zip, bytes, ct);
try { ZipSafety.ExtractToDirectory(zip, payload); }
finally { try { File.Delete(zip); } catch { } }
FlattenPayload(payload);
executableName = Path.GetFileName(Environment.ProcessPath ?? "");
}
FlattenPayload(payload);
Json.Write(Path.Combine(_paths.UpdateRoot, "pending.json"), new PendingUpdate
{
Version = launcher.Version,
Rid = rid,
InstallDirectory = _paths.InstallDirectory,
Executable = Path.GetFileName(Environment.ProcessPath ?? ""),
Executable = executableName,
Payload = "payload",
DownloadedAt = DateTime.UtcNow.ToString("O")
});