添加GC-SAVEDOG项目,降低隐患
This commit is contained in:
1 parent
791db4fe12
commit
2f3a8682c9
54 files changed
+3642
-320
No files matched your search
@@ -15,6 +15,8 @@ public sealed class DirectoryRemote : IModelRemote
|
||||
{
|
||||
private readonly string _root;
|
||||
private static readonly HttpClient Http = new() { Timeout = TimeSpan.FromMinutes(5) };
|
||||
private string? _rawManifest;
|
||||
private string _launcherVersion = "";
|
||||
|
||||
public DirectoryRemote(string root) => _root = Path.GetFullPath(root);
|
||||
|
||||
@@ -26,9 +28,20 @@ public sealed class DirectoryRemote : IModelRemote
|
||||
var fallback = SafePath(Path.Combine("model", "version.json"));
|
||||
var file = File.Exists(primary) ? primary : fallback;
|
||||
if (!File.Exists(file)) return Task.FromResult<RepoVersion?>(null);
|
||||
return Task.FromResult(Json.Read<RepoVersion>(file));
|
||||
|
||||
// 离线目录同样验签:U 盘 / 共享盘里的清单也可能是被替换过的
|
||||
var text = File.ReadAllText(file);
|
||||
_rawManifest = text;
|
||||
var version = ManifestLoader.Parse(text, out _);
|
||||
if (version != null && !string.IsNullOrWhiteSpace(version.Launcher.Version))
|
||||
_launcherVersion = version.Launcher.Version.Trim();
|
||||
return Task.FromResult(version);
|
||||
}
|
||||
|
||||
/// <summary>最近一次读到的清单原文(SAVEDOG 二次验签用)。</summary>
|
||||
public Task<string?> GetRawVersionTextAsync(CancellationToken ct)
|
||||
=> Task.FromResult(_rawManifest);
|
||||
|
||||
public Task<IReadOnlyList<RepoEntry>> ListTreeAsync(string rootPath, CancellationToken ct)
|
||||
{
|
||||
var baseDir = SafePath(rootPath ?? "model");
|
||||
@@ -76,11 +89,21 @@ public sealed class DirectoryRemote : IModelRemote
|
||||
|
||||
public async Task<byte[]?> DownloadPackageAsync(RepoPackage package, CancellationToken ct)
|
||||
{
|
||||
if (!string.IsNullOrWhiteSpace(package.Path))
|
||||
// 清单路径 / dist 根目录命名:按仓库内相对路径直接找
|
||||
foreach (var rel in LauncherArtifacts.CandidateFiles(
|
||||
package.Rid, package.Dir, package.Path, package.Name, _launcherVersion))
|
||||
{
|
||||
var local = SafePath(package.Path!);
|
||||
if (File.Exists(local)) return await File.ReadAllBytesAsync(local, ct);
|
||||
string full;
|
||||
try { full = SafePath(rel); }
|
||||
catch (InvalidOperationException) { continue; }
|
||||
if (File.Exists(full)) return await File.ReadAllBytesAsync(full, ct);
|
||||
}
|
||||
|
||||
// dist/<系统>-<架构>/ 里放着的编译产物(与远端同一套查找规则):
|
||||
// 本地源同样要能跑通「只发产物、不发 Release」的更新方式。
|
||||
var fromDist = FindInDist(package);
|
||||
if (fromDist != null) return await File.ReadAllBytesAsync(fromDist, ct);
|
||||
|
||||
var url = package.Url;
|
||||
if (string.IsNullOrWhiteSpace(url)) return null;
|
||||
// 离线 U 盘源与 ./build.sh update-test 都会用本地 zip 路径,必须保持兼容。
|
||||
@@ -93,6 +116,27 @@ public sealed class DirectoryRemote : IModelRemote
|
||||
return null;
|
||||
}
|
||||
|
||||
/// <summary>在 dist/<系统>-<架构>/ 里找这个平台的启动器包;找不到返回 null。</summary>
|
||||
private string? FindInDist(RepoPackage package)
|
||||
{
|
||||
foreach (var dir in LauncherArtifacts.CandidateDirs(package.Rid, package.Dir))
|
||||
{
|
||||
string full;
|
||||
try { full = SafePath(dir); }
|
||||
catch (InvalidOperationException) { continue; }
|
||||
if (!Directory.Exists(full)) continue;
|
||||
|
||||
var zips = Directory.GetFiles(full, "*.zip");
|
||||
if (zips.Length == 0) continue;
|
||||
|
||||
foreach (var zip in zips)
|
||||
if (LauncherArtifacts.LooksLikePackage(Path.GetFileName(zip), _launcherVersion, package.Rid))
|
||||
return zip;
|
||||
if (zips.Length == 1) return zips[0];
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
private string SafePath(string relative)
|
||||
{
|
||||
var full = Path.GetFullPath(Path.Combine(_root, relative));
|
||||
|
||||
Reference in new issue
Block a user