From 7507d100720f9b1ef9c08489e072aaf460805ad6 Mon Sep 17 00:00:00 2001 From: Kei-Luna Date: Sat, 9 May 2026 17:39:17 +0900 Subject: [PATCH] Updater fixes due to changes in resource folders --- MikuSB.Updater/Program.cs | 9 ++------- MikuSB/Update/UpdateService.cs | 19 +++++++------------ version.txt | 2 +- 3 files changed, 10 insertions(+), 20 deletions(-) diff --git a/MikuSB.Updater/Program.cs b/MikuSB.Updater/Program.cs index dca3926..bc7429f 100644 --- a/MikuSB.Updater/Program.cs +++ b/MikuSB.Updater/Program.cs @@ -102,11 +102,6 @@ static void UpdateResources(string resourcePackagePath, string resourceTargetDir ZipFile.ExtractToDirectory(resourcePackagePath, resourceStagingDirectory, overwriteFiles: true); var extractedRoot = Directory.GetDirectories(resourceStagingDirectory).FirstOrDefault() ?? resourceStagingDirectory; - var excelOutputSource = Path.Combine(extractedRoot, "ExcelOutput"); - if (!Directory.Exists(excelOutputSource)) - throw new DirectoryNotFoundException($"ExcelOutput directory was not found in resource package: {excelOutputSource}"); - - var excelOutputTarget = Path.Combine(resourceTargetDirectory, "ExcelOutput"); - Directory.CreateDirectory(excelOutputTarget); - CopyDirectory(excelOutputSource, excelOutputTarget); + Directory.CreateDirectory(resourceTargetDirectory); + CopyDirectory(extractedRoot, resourceTargetDirectory); } diff --git a/MikuSB/Update/UpdateService.cs b/MikuSB/Update/UpdateService.cs index e12e332..1c6f2d9 100644 --- a/MikuSB/Update/UpdateService.cs +++ b/MikuSB/Update/UpdateService.cs @@ -24,8 +24,8 @@ public static class UpdateService "https://github.com/Kei-Luna/MikuSB-Resource/archive/refs/heads/main.zip"; private static readonly string[] RequiredResourceFiles = [ - "card.json", - "weapon.json" + "item/templates/card.json", + "item/templates/weapon.json" ]; public static async Task TryStartSelfUpdateAsync() @@ -160,11 +160,11 @@ public static class UpdateService private static bool AreRequiredResourcesPresent() { - var excelOutputPath = Path.Combine(AppContext.BaseDirectory, ConfigManager.Config.Path.ResourcePath, "ExcelOutput"); - if (!Directory.Exists(excelOutputPath)) + var resourcePath = Path.Combine(AppContext.BaseDirectory, ConfigManager.Config.Path.ResourcePath); + if (!Directory.Exists(resourcePath)) return false; - return RequiredResourceFiles.All(fileName => File.Exists(Path.Combine(excelOutputPath, fileName))); + return RequiredResourceFiles.All(fileName => File.Exists(Path.Combine(resourcePath, fileName))); } private static async Task DownloadAndInstallResourcesAsync() @@ -187,13 +187,8 @@ public static class UpdateService ZipFile.ExtractToDirectory(resourcePackagePath, resourceStagingDirectory, overwriteFiles: true); var extractedRoot = Directory.GetDirectories(resourceStagingDirectory).FirstOrDefault() ?? resourceStagingDirectory; - var excelOutputSource = Path.Combine(extractedRoot, "ExcelOutput"); - if (!Directory.Exists(excelOutputSource)) - throw new DirectoryNotFoundException($"ExcelOutput directory was not found in resource package: {excelOutputSource}"); - - var excelOutputTarget = Path.Combine(resourceTargetDirectory, "ExcelOutput"); - Directory.CreateDirectory(excelOutputTarget); - CopyDirectory(excelOutputSource, excelOutputTarget); + Directory.CreateDirectory(resourceTargetDirectory); + CopyDirectory(extractedRoot, resourceTargetDirectory); } private static bool ConfirmUpdate(string latestVersion) diff --git a/version.txt b/version.txt index 826bf42..601e3a2 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -v=1.9 \ No newline at end of file +v=2.0 \ No newline at end of file