diff --git a/BetterGenshinImpact/Core/Script/ScriptRepoUpdater.cs b/BetterGenshinImpact/Core/Script/ScriptRepoUpdater.cs index 573ad2d2..463ed95f 100644 --- a/BetterGenshinImpact/Core/Script/ScriptRepoUpdater.cs +++ b/BetterGenshinImpact/Core/Script/ScriptRepoUpdater.cs @@ -133,9 +133,8 @@ public class ScriptRepoUpdater : Singleton try { // 检测repo.json是否存在，存在则备份 - var oldRepoJsonPath = Directory - .GetFiles(CenterRepoPath, "repo.json", SearchOption.AllDirectories).FirstOrDefault(); - if (oldRepoJsonPath != null) + var oldRepoJsonPath = Path.Combine(repoPath, "repo.json"); + if (File.Exists(oldRepoJsonPath)) { oldRepoJsonContent = File.ReadAllText(oldRepoJsonPath); } @@ -171,7 +170,6 @@ public class ScriptRepoUpdater : Singleton // 获取远程分支信息并拉取最新数据 var remote = repo.Network.Remotes["origin"]; - var refSpecs = remote.FetchRefSpecs.Select(x => x.Specification); var fetchOptions = new FetchOptions { @@ -180,18 +178,24 @@ public class ScriptRepoUpdater : Singleton CredentialsProvider = CreateCredentialsHandler() // 添加凭据处理器 }; - Commands.Fetch(repo, remote.Name, refSpecs, fetchOptions, "拉取最新更新"); + // 拉取到远程追踪分支 + string refSpec = $"+refs/heads/release:refs/remotes/origin/release"; + Commands.Fetch(repo, remote.Name, new[] { refSpec }, fetchOptions, "拉取最新更新"); // 获取本地和远程commit - var currentCommitSha = repo.Head.Tip.Sha; + var localBranch = repo.Branches["release"]; + if (localBranch == null) + { + throw new Exception("未找到本地release分支"); + } - // 获取远程release分支的最新commit - var remoteBranch = repo.Branches["refs/remotes/origin/release"]; + var remoteBranch = repo.Branches["origin/release"]; if (remoteBranch == null) { throw new Exception("未找到远程release分支"); } + var currentCommitSha = localBranch.Tip?.Sha; var remoteCommitSha = remoteBranch.Tip.Sha; // 比较本地和远程commit @@ -202,11 +206,16 @@ public class ScriptRepoUpdater : Singleton } else { - _logger.LogInformation($"检测到远程更新: 本地 {currentCommitSha[..7]} -> 远程 {remoteCommitSha[..7]}，将重新克隆"); + _logger.LogInformation($"检测到远程更新: 本地 {currentCommitSha?[..7] ?? "无"} -> 远程 {remoteCommitSha[..7]}"); + + // 更新本地分支引用指向远程分支的 commit + repo.Refs.UpdateTarget(localBranch.Reference, remoteBranch.Tip.Id); + _logger.LogInformation("本地分支引用已更新到远程分支"); + + // 检出 repo.json 文件到工作目录 + CheckoutRepoJson(repo, remoteBranch.Tip); + _logger.LogInformation("已更新工作目录中的 repo.json 文件"); - // commit不一致，删除本地仓库重新克隆 - repo?.Dispose(); - CloneRepository(repoUrl, repoPath, "release", onCheckoutProgress); updated = true; } } @@ -217,6 +226,7 @@ public class ScriptRepoUpdater : Singleton UIDispatcherHelper.Invoke(() => Toast.Error("脚本仓库更新异常，直接删除后重新克隆\n原因：" + ex.Message)); repo?.Dispose(); CloneRepository(repoUrl, repoPath, "release", onCheckoutProgress); + updated = true; } finally { @@ -227,9 +237,9 @@ public class ScriptRepoUpdater : Singleton // 标记新repo.json中的更新节点 try { - var newRepoJsonPath = Directory.GetFiles(CenterRepoPath, "repo.json", SearchOption.AllDirectories) - .FirstOrDefault(); - if (newRepoJsonPath != null) + // 查找repo.json文件 + var newRepoJsonPath = Directory.GetFiles(repoPath, "repo.json", SearchOption.AllDirectories).FirstOrDefault(); + if (!string.IsNullOrEmpty(newRepoJsonPath)) { var newRepoJsonContent = await File.ReadAllTextAsync(newRepoJsonPath); @@ -406,7 +416,7 @@ public class ScriptRepoUpdater : Singleton { if (token == null || token.Type == JTokenType.Null) return false; if (token.Type == JTokenType.Boolean) return (bool)token; - if (token.Type == JTokenType.String) return string.Equals((string)token, "true", StringComparison.OrdinalIgnoreCase); + if (token.Type == JTokenType.String) return string.Equals(token.ToString(), "true", StringComparison.OrdinalIgnoreCase); return false; } @@ -429,7 +439,7 @@ public class ScriptRepoUpdater : Singleton } /// - /// + /// 克隆Git仓库（只检出repo.json） /// 相当于 Repository.Clone(repoUrl, repoPath, options); /// 用这个方法可以无视本地代理 /// @@ -465,16 +475,19 @@ public class ScriptRepoUpdater : Singleton Commands.Fetch(repo, remote.Name, new[] { refSpec }, fetchOptions, "初始化拉取"); // 获取远程分支 - var remoteBranch = repo.Branches[$"refs/remotes/origin/{branchName}"]; + var remoteBranch = repo.Branches[$"origin/{branchName}"]; if (remoteBranch == null) throw new Exception($"远程仓库中未找到 {branchName} 分支"); - // 创建并检出本地分支 + // 创建本地分支 var localBranch = repo.CreateBranch(branchName, remoteBranch.Tip); repo.Branches.Update(localBranch, b => b.TrackedBranch = remoteBranch.CanonicalName); - var checkoutOptions = new CheckoutOptions { OnCheckoutProgress = onCheckoutProgress }; - Commands.Checkout(repo, localBranch, checkoutOptions); + // 手动检出HEAD到新分支 + repo.Refs.UpdateTarget(repo.Refs.Head, localBranch.CanonicalName); + + // 手动检出 repo.json 文件 + CheckoutRepoJson(repo, remoteBranch.Tip); } finally { @@ -482,6 +495,401 @@ public class ScriptRepoUpdater : Singleton } } + /// + /// 从Git仓库检出repo.json文件到工作目录 + /// + /// + /// + private void CheckoutRepoJson(Repository repo, Commit commit) + { + try + { + // 查找repo.json文件 + var repoJsonEntry = commit.Tree.FirstOrDefault(e => e.Name == "repo.json"); + if (repoJsonEntry != null && repoJsonEntry.TargetType == TreeEntryTargetType.Blob) + { + var blob = (Blob)repoJsonEntry.Target; + var repoJsonPath = Path.Combine(repo.Info.WorkingDirectory ?? repo.Info.Path, "repo.json"); + + // 创建目录（如果需要） + var dir = Path.GetDirectoryName(repoJsonPath); + if (!string.IsNullOrEmpty(dir) && !Directory.Exists(dir)) + { + Directory.CreateDirectory(dir); + } + + // 写入文件 + using (var contentStream = blob.GetContentStream()) + using (var fileStream = File.Create(repoJsonPath)) + { + contentStream.CopyTo(fileStream); + } + } + else + { + _logger.LogWarning("未在仓库中找到 repo.json 文件"); + } + } + catch (Exception ex) + { + _logger.LogError(ex, "检出 repo.json 失败"); + } + } + + /// + /// 检查指定路径是否为 Git 仓库（非文件式仓库） + /// + /// 仓库路径 + /// 如果是 Git 仓库返回 true，否则返回 false + private bool IsGitRepository(string repoPath) + { + return Repository.IsValid(repoPath) && !Directory.Exists(Path.Combine(repoPath, "repo")); + } + + /// + /// 获取仓库中 repo/ 子目录的树对象 + /// + private Tree GetRepoSubdirectoryTree(Repository repo) + { + var commit = repo.Head?.Tip; + if (commit == null) + { + throw new Exception("仓库HEAD未指向任何提交"); + } + + // 脚本内容都在 repo/ 子目录下 + var repoEntry = commit.Tree["repo"]; + if (repoEntry == null || repoEntry.TargetType != TreeEntryTargetType.Tree) + { + throw new Exception("仓库结构错误：未找到 repo/ 子目录"); + } + + return (Tree)repoEntry.Target; + } + + /// + /// 从中央仓库读取文件内容 + /// + /// 相对于仓库根目录的路径 + /// 文件内容，如果文件不存在则返回null + public string? ReadFileFromCenterRepo(string relPath) + { + try + { + var repoPath = CenterRepoPath; + + // 判断是否为 Git 仓库 + bool isGitRepo = IsGitRepository(repoPath); + + if (isGitRepo) + { + return ReadFileFromGitRepository(repoPath, relPath); + } + else + { + // 文件式仓库：从文件系统读取 + var filePath = Path.Combine(repoPath, "repo", relPath); + if (File.Exists(filePath)) + { + return File.ReadAllText(filePath); + } + return null; + } + } + catch (Exception ex) + { + _logger.LogError(ex, $"从中央仓库读取文件失败: {relPath}"); + return null; + } + } + + /// + /// 从中央仓库读取二进制文件 + /// + /// 相对于仓库根目录的路径 + /// 文件字节数组，如果文件不存在则返回null + public byte[]? ReadBinaryFileFromCenterRepo(string relPath) + { + try + { + var repoPath = CenterRepoPath; + + // 判断是否为 Git 仓库 + bool isGitRepo = IsGitRepository(repoPath); + + if (isGitRepo) + { + return ReadBinaryFileFromGitRepository(repoPath, relPath); + } + else + { + // 文件式仓库：从文件系统读取 + var filePath = Path.Combine(repoPath, "repo", relPath); + if (File.Exists(filePath)) + { + return File.ReadAllBytes(filePath); + } + return null; + } + } + catch (Exception ex) + { + _logger.LogError(ex, $"从中央仓库读取二进制文件失败: {relPath}"); + return null; + } + } + + /// + /// 从Git仓库读取文件内容 + /// + private string? ReadFileFromGitRepository(string repoPath, string filePath) + { + try + { + // 判断是否为 Git 仓库 + bool isGitRepo = IsGitRepository(repoPath); + if (!isGitRepo) + { + return null; + } + + using var repo = new Repository(repoPath); + + var manifestPath = $"repo/{filePath}"; + var pathParts = manifestPath.Split(new[] { '/', '\\' }, StringSplitOptions.RemoveEmptyEntries); + Tree currentTree = repo.Head.Tip!.Tree; + TreeEntry? entry = null; + + for (int i = 0; i < pathParts.Length; i++) + { + entry = currentTree[pathParts[i]]; + if (entry == null) + { + return null; + } + + if (i < pathParts.Length - 1) + { + if (entry.TargetType != TreeEntryTargetType.Tree) + { + return null; + } + currentTree = (Tree)entry.Target; + } + } + + if (entry == null || entry.TargetType != TreeEntryTargetType.Blob) + { + return null; + } + + var blob = (Blob)entry.Target; + using var contentStream = blob.GetContentStream(); + using var reader = new StreamReader(contentStream); + return reader.ReadToEnd(); + } + catch (Exception ex) + { + _logger.LogError(ex, $"从Git仓库读取文件失败: {filePath}"); + return null; + } + } + + /// + /// 从Git仓库读取二进制文件内容 + /// + private byte[]? ReadBinaryFileFromGitRepository(string repoPath, string filePath) + { + try + { + // 判断是否为 Git 仓库 + bool isGitRepo = IsGitRepository(repoPath); + if (!isGitRepo) + { + return null; + } + + using var repo = new Repository(repoPath); + + var manifestPath = $"repo/{filePath}"; + var pathParts = manifestPath.Split(new[] { '/', '\\' }, StringSplitOptions.RemoveEmptyEntries); + Tree currentTree = repo.Head.Tip!.Tree; + TreeEntry? entry = null; + + for (int i = 0; i < pathParts.Length; i++) + { + entry = currentTree[pathParts[i]]; + if (entry == null) + { + return null; + } + + if (i < pathParts.Length - 1) + { + if (entry.TargetType != TreeEntryTargetType.Tree) + { + return null; + } + currentTree = (Tree)entry.Target; + } + } + + if (entry == null || entry.TargetType != TreeEntryTargetType.Blob) + { + return null; + } + + var blob = (Blob)entry.Target; + using var contentStream = blob.GetContentStream(); + using var memoryStream = new MemoryStream(); + contentStream.CopyTo(memoryStream); + return memoryStream.ToArray(); + } + catch (Exception ex) + { + _logger.LogError(ex, $"从Git仓库读取二进制文件失败: {filePath}"); + return null; + } + } + + /// + /// 从仓库中检出指定路径的文件或文件夹到目标位置 + /// + /// 仓库路径 + /// 仓库中的相对路径 + /// 目标路径 + private void CheckoutPath(string repoPath, string sourcePath, string destPath) + { + // 判断仓库类型：检查是否为 Git 仓库且不存在 repo/ 子目录 + bool isGitRepo = IsGitRepository(repoPath); + + if (isGitRepo) + { + // 从Git仓库检出 + using var repo = new Repository(repoPath); + var commit = repo.Head.Tip; + + if (commit == null) + { + _logger.LogError($"仓库HEAD未指向任何提交。HEAD: {repo.Head?.CanonicalName ?? "null"}"); + throw new Exception("仓库HEAD未指向任何提交"); + } + + // 递归查找路径 + TreeEntry? entry = null; + var pathParts = sourcePath.Split(new[] { '/', '\\' }, StringSplitOptions.RemoveEmptyEntries); + Tree currentTree = GetRepoSubdirectoryTree(repo); + + for (int i = 0; i < pathParts.Length; i++) + { + entry = currentTree[pathParts[i]]; + if (entry == null) + { + // 调试信息：列出当前树中的所有条目 + var availableEntries = string.Join(", ", currentTree.Select(e => e.Name)); + _logger.LogError($"在路径 '{string.Join("/", pathParts.Take(i))}' 中未找到 '{pathParts[i]}'"); + _logger.LogError($"可用的条目: {availableEntries}"); + throw new Exception($"仓库中不存在路径: {sourcePath}"); + } + + if (i < pathParts.Length - 1) + { + if (entry.TargetType != TreeEntryTargetType.Tree) + { + throw new Exception($"路径中间部分不是目录: {string.Join("/", pathParts.Take(i + 1))}"); + } + currentTree = (Tree)entry.Target; + } + } + + // 检出文件或目录 + if (entry == null) + { + throw new Exception($"未找到路径: {sourcePath}"); + } + + if (entry.TargetType == TreeEntryTargetType.Blob) + { + // 检出单个文件 + var blob = (Blob)entry.Target; + + // 确保目标目录存在 + var dir = Path.GetDirectoryName(destPath); + if (!string.IsNullOrEmpty(dir) && !Directory.Exists(dir)) + { + Directory.CreateDirectory(dir); + } + + using (var contentStream = blob.GetContentStream()) + using (var fileStream = File.Create(destPath)) + { + contentStream.CopyTo(fileStream); + } + } + else if (entry.TargetType == TreeEntryTargetType.Tree) + { + // 检出目录 + var tree = (Tree)entry.Target; + CheckoutTree(tree, destPath, sourcePath); + } + } + else + { + // 文件式仓库：从文件系统复制 + var scriptPath = Path.Combine(repoPath, sourcePath); + + if (Directory.Exists(scriptPath)) + { + // 复制目录 + CopyDirectory(scriptPath, destPath); + } + else if (File.Exists(scriptPath)) + { + // 复制文件 + var dir = Path.GetDirectoryName(destPath); + if (!string.IsNullOrEmpty(dir) && !Directory.Exists(dir)) + { + Directory.CreateDirectory(dir); + } + File.Copy(scriptPath, destPath, true); + } + else + { + throw new Exception($"仓库中不存在路径: {sourcePath}"); + } + } + } + + /// + /// 递归检出树对象 + /// + private void CheckoutTree(Tree tree, string destPath, string currentPath) + { + if (!Directory.Exists(destPath)) + { + Directory.CreateDirectory(destPath); + } + + foreach (var entry in tree) + { + var entryDestPath = Path.Combine(destPath, entry.Name); + var entrySourcePath = $"{currentPath}/{entry.Name}"; + + if (entry.TargetType == TreeEntryTargetType.Blob) + { + var blob = (Blob)entry.Target; + using var contentStream = blob.GetContentStream(); + using var fileStream = File.Create(entryDestPath); + contentStream.CopyTo(fileStream); + } + else if (entry.TargetType == TreeEntryTargetType.Tree) + { + var subTree = (Tree)entry.Target; + CheckoutTree(subTree, entryDestPath, entrySourcePath); + } + } + } + private void GitConfig(Repository repo) { // 设置 Git 配置 @@ -582,22 +990,42 @@ public class ScriptRepoUpdater : Singleton public string FindCenterRepoPath() { - var localRepoJsonPath = Directory.GetFiles(CenterRepoPath, "repo.json", SearchOption.AllDirectories) - .FirstOrDefault(); - if (localRepoJsonPath is null) + // 查找 repo.json 文件 + var repoJsonPath = Path.Combine(CenterRepoPath, "repo.json"); + string? repoJsonDir = null; + + if (File.Exists(repoJsonPath)) + { + repoJsonDir = CenterRepoPath; + } + else + { + // 递归查找 repo.json + var localRepoJsonPath = Directory + .GetFiles(CenterRepoPath, "repo.json", SearchOption.AllDirectories).FirstOrDefault(); + if (localRepoJsonPath != null) + { + repoJsonDir = Path.GetDirectoryName(localRepoJsonPath); + } + } + + if (string.IsNullOrEmpty(repoJsonDir)) { throw new Exception("本地仓库缺少 repo.json"); } - // 获取与 localRepoJsonPath 同名（无扩展名）的文件夹路径 - var folderName = Path.GetFileNameWithoutExtension(localRepoJsonPath); - var folderPath = Path.Combine(Path.GetDirectoryName(localRepoJsonPath)!, folderName); - if (!Directory.Exists(folderPath)) + // 检查 repo.json 同级是否存在 repo/ 目录来判断仓库类型 + var repoSubDir = Path.Combine(repoJsonDir, "repo"); + if (Directory.Exists(repoSubDir)) { - throw new Exception("本地仓库文件夹不存在"); + // 存在 repo/ 目录，说明是文件式仓库 + return repoSubDir; + } + else + { + // 不存在 repo/ 目录，说明是 Git 仓库 + return repoJsonDir; } - - return folderPath; } private (string time, string url, string file) ParseJson(string jsonString) @@ -824,19 +1252,55 @@ public class ScriptRepoUpdater : Singleton //顶层节点，按库中的文件夹来 if (path == "pathing") { - var scriptPath = Path.Combine(repoPath, path); - if (Directory.Exists(scriptPath)) + // 判断仓库类型：Git 仓库或文件式仓库 + bool isGitRepo = IsGitRepository(repoPath); + + if (isGitRepo) { - // 获取该路径下的所有“仅第一层文件夹” - string[] directories = Directory.GetDirectories(scriptPath, "*", SearchOption.TopDirectoryOnly); - foreach (var dir in directories) + // 从Git仓库读取 + using var repo = new Repository(repoPath); + var commit = repo.Head.Tip; + if (commit == null) { - newPaths.Add("pathing" + "/" + Path.GetFileName(dir)); + throw new Exception("仓库HEAD未指向任何提交"); + } + + Tree repoTree = GetRepoSubdirectoryTree(repo); + + var pathingEntry = repoTree["pathing"]; + if (pathingEntry != null && pathingEntry.TargetType == TreeEntryTargetType.Tree) + { + var pathingTree = (Tree)pathingEntry.Target; + foreach (var entry in pathingTree) + { + if (entry.TargetType == TreeEntryTargetType.Tree) + { + newPaths.Add("pathing/" + entry.Name); + } + } + } + else + { + Toast.Warning($"未知的脚本路径：{path}"); } } else { - Toast.Warning($"未知的脚本路径：{path}"); + // 文件式仓库：从文件系统读取 + var pathingDir = Path.Combine(repoPath, "pathing"); + if (Directory.Exists(pathingDir)) + { + // 获取该路径下的所有“仅第一层文件夹” + string[] directories = Directory.GetDirectories(pathingDir, "*", SearchOption.TopDirectoryOnly); + foreach (var dir in directories) + { + newPaths.Add("pathing/" + Path.GetFileName(dir)); + } + } + else + { + Toast.Warning($"未知的脚本路径：{path}"); + } } } else @@ -845,13 +1309,12 @@ public class ScriptRepoUpdater : Singleton } } - // 拷贝文件 + // 从 Git 仓库检出文件到用户文件夹 foreach (var path in newPaths) { var (first, remainingPath) = GetFirstFolderAndRemainingPath(path); if (PathMapper.TryGetValue(first, out var userPath)) { - var scriptPath = Path.Combine(repoPath, path); var destPath = Path.Combine(userPath, remainingPath); // 备份需要保存的文件 @@ -861,29 +1324,23 @@ public class ScriptRepoUpdater : Singleton backupFiles = BackupScriptFiles(path, repoPath); } - if (Directory.Exists(scriptPath)) + // 如果目标路径存在，先删除 + if (Directory.Exists(destPath)) { - if (Directory.Exists(destPath)) - { - DirectoryHelper.DeleteDirectoryWithReadOnlyCheck(destPath); - } - - CopyDirectory(scriptPath, destPath); - - // 图标处理 - DealWithIconFolder(destPath); + DirectoryHelper.DeleteDirectoryWithReadOnlyCheck(destPath); } - else if (File.Exists(scriptPath)) + else if (File.Exists(destPath)) { - // 目标文件所在文件夹不存在时创建它 - Directory.CreateDirectory(Path.GetDirectoryName(destPath)!); + File.Delete(destPath); + } - if (File.Exists(destPath)) - { - File.Delete(destPath); - } + // 从 Git 仓库检出文件或目录 + CheckoutPath(repoPath, path, destPath); - File.Copy(scriptPath, destPath, true); + // 图标处理（仅对目录） + if (Directory.Exists(destPath)) + { + DealWithIconFolder(destPath); } // 恢复备份的文件 @@ -1299,16 +1756,35 @@ public class ScriptRepoUpdater : Singleton Directory.CreateDirectory(backupScriptDir); } - // 获取脚本的manifest文件路径 - var scriptManifestPath = Path.Combine(repoPath, scriptPath, "manifest.json"); - if (!File.Exists(scriptManifestPath)) + // 获取脚本的manifest文件内容 + string? manifestContent = null; + + // 判断仓库类型 + bool isGitRepo = IsGitRepository(repoPath); + + if (isGitRepo) { - _logger.LogWarning($"脚本manifest文件不存在: {scriptManifestPath}"); - return backupFiles; + // 从Git仓库读取 + manifestContent = ReadFileFromGitRepository(repoPath, $"{scriptPath}/manifest.json"); + if (manifestContent == null) + { + _logger.LogWarning($"脚本manifest文件不存在: {scriptPath}/manifest.json"); + return backupFiles; + } + } + else + { + // 文件式仓库：从文件系统读取 + var scriptManifestPath = Path.Combine(repoPath, scriptPath, "manifest.json"); + if (!File.Exists(scriptManifestPath)) + { + _logger.LogWarning($"脚本manifest文件不存在: {scriptManifestPath}"); + return backupFiles; + } + manifestContent = File.ReadAllText(scriptManifestPath); } // 解析manifest文件获取savedFiles - var manifestContent = File.ReadAllText(scriptManifestPath); var manifest = Manifest.FromJson(manifestContent); if (manifest.SavedFiles == null || manifest.SavedFiles.Length == 0) @@ -1405,16 +1881,35 @@ public class ScriptRepoUpdater : Singleton var backupScriptDir = Path.Combine(tempBackupPath, scriptPathSafe); try { - // 获取脚本的manifest文件路径 - var scriptManifestPath = Path.Combine(repoPath, scriptPath, "manifest.json"); - if (!File.Exists(scriptManifestPath)) + // 获取脚本的manifest文件内容 + string? manifestContent = null; + + // 判断仓库类型 + bool isGitRepo = IsGitRepository(repoPath); + + if (isGitRepo) { - _logger.LogWarning($"脚本manifest文件不存在: {scriptManifestPath}"); - return; + // 从Git仓库读取 + manifestContent = ReadFileFromGitRepository(repoPath, $"{scriptPath}/manifest.json"); + if (manifestContent == null) + { + _logger.LogWarning($"脚本manifest文件不存在: {scriptPath}/manifest.json"); + return; + } + } + else + { + // 文件式仓库：从文件系统读取 + var scriptManifestPath = Path.Combine(repoPath, scriptPath, "manifest.json"); + if (!File.Exists(scriptManifestPath)) + { + _logger.LogWarning($"脚本manifest文件不存在: {scriptManifestPath}"); + return; + } + manifestContent = File.ReadAllText(scriptManifestPath); } // 解析manifest文件获取savedFiles - var manifestContent = File.ReadAllText(scriptManifestPath); var manifest = Manifest.FromJson(manifestContent); if (manifest.SavedFiles == null || manifest.SavedFiles.Length == 0) diff --git a/BetterGenshinImpact/Core/Script/WebView/RepoWebBridge.cs b/BetterGenshinImpact/Core/Script/WebView/RepoWebBridge.cs index eac1a69f..2ac8e214 100644 --- a/BetterGenshinImpact/Core/Script/WebView/RepoWebBridge.cs +++ b/BetterGenshinImpact/Core/Script/WebView/RepoWebBridge.cs @@ -31,7 +31,7 @@ public sealed class RepoWebBridge { ".png", ".jpg", ".jpeg", ".gif", ".webp", ".svg", ".bmp", ".ico" }; - + public async Task GetRepoJson() { try @@ -104,12 +104,22 @@ public sealed class RepoWebBridge if (AllowedTextExtensions.Contains(extension)) { - return await File.ReadAllTextAsync(filePath); + // 读取文本文件 + string? content = ScriptRepoUpdater.Instance.ReadFileFromCenterRepo(relPath); + return string.IsNullOrEmpty(content) ? "404" : content; } else if (AllowedImageExtensions.Contains(extension)) { - byte[] bytes = await File.ReadAllBytesAsync(filePath); - return Convert.ToBase64String(bytes); + // 读取图片文件，返回 Base64 编码 + byte[]? bytes = ScriptRepoUpdater.Instance.ReadBinaryFileFromCenterRepo(relPath); + if (bytes == null || bytes.Length == 0) + { + return "404"; + } + + string base64 = Convert.ToBase64String(bytes); + string mimeType = GetMimeType(extension); + return $"data:{mimeType};base64,{base64}"; } return "404"; @@ -119,7 +129,22 @@ public sealed class RepoWebBridge return "404"; } } - + + private static string GetMimeType(string extension) + { + return extension.ToLower() switch + { + ".png" => "image/png", + ".jpg" or ".jpeg" => "image/jpeg", + ".gif" => "image/gif", + ".bmp" => "image/bmp", + ".webp" => "image/webp", + ".svg" => "image/svg+xml", + ".ico" => "image/x-icon", + _ => "application/octet-stream" + }; + } + public async Task UpdateSubscribed(string path) { try