Updater fixes due to changes in resource folders

This commit is contained in:
Kei-Luna
2026-05-09 17:39:17 +09:00
parent 8a7a919d04
commit 7507d10072
3 changed files with 10 additions and 20 deletions

View File

@@ -102,11 +102,6 @@ static void UpdateResources(string resourcePackagePath, string resourceTargetDir
ZipFile.ExtractToDirectory(resourcePackagePath, resourceStagingDirectory, overwriteFiles: true); ZipFile.ExtractToDirectory(resourcePackagePath, resourceStagingDirectory, overwriteFiles: true);
var extractedRoot = Directory.GetDirectories(resourceStagingDirectory).FirstOrDefault() ?? resourceStagingDirectory; var extractedRoot = Directory.GetDirectories(resourceStagingDirectory).FirstOrDefault() ?? resourceStagingDirectory;
var excelOutputSource = Path.Combine(extractedRoot, "ExcelOutput"); Directory.CreateDirectory(resourceTargetDirectory);
if (!Directory.Exists(excelOutputSource)) CopyDirectory(extractedRoot, resourceTargetDirectory);
throw new DirectoryNotFoundException($"ExcelOutput directory was not found in resource package: {excelOutputSource}");
var excelOutputTarget = Path.Combine(resourceTargetDirectory, "ExcelOutput");
Directory.CreateDirectory(excelOutputTarget);
CopyDirectory(excelOutputSource, excelOutputTarget);
} }

View File

@@ -24,8 +24,8 @@ public static class UpdateService
"https://github.com/Kei-Luna/MikuSB-Resource/archive/refs/heads/main.zip"; "https://github.com/Kei-Luna/MikuSB-Resource/archive/refs/heads/main.zip";
private static readonly string[] RequiredResourceFiles = private static readonly string[] RequiredResourceFiles =
[ [
"card.json", "item/templates/card.json",
"weapon.json" "item/templates/weapon.json"
]; ];
public static async Task<bool> TryStartSelfUpdateAsync() public static async Task<bool> TryStartSelfUpdateAsync()
@@ -160,11 +160,11 @@ public static class UpdateService
private static bool AreRequiredResourcesPresent() private static bool AreRequiredResourcesPresent()
{ {
var excelOutputPath = Path.Combine(AppContext.BaseDirectory, ConfigManager.Config.Path.ResourcePath, "ExcelOutput"); var resourcePath = Path.Combine(AppContext.BaseDirectory, ConfigManager.Config.Path.ResourcePath);
if (!Directory.Exists(excelOutputPath)) if (!Directory.Exists(resourcePath))
return false; 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() private static async Task DownloadAndInstallResourcesAsync()
@@ -187,13 +187,8 @@ public static class UpdateService
ZipFile.ExtractToDirectory(resourcePackagePath, resourceStagingDirectory, overwriteFiles: true); ZipFile.ExtractToDirectory(resourcePackagePath, resourceStagingDirectory, overwriteFiles: true);
var extractedRoot = Directory.GetDirectories(resourceStagingDirectory).FirstOrDefault() ?? resourceStagingDirectory; var extractedRoot = Directory.GetDirectories(resourceStagingDirectory).FirstOrDefault() ?? resourceStagingDirectory;
var excelOutputSource = Path.Combine(extractedRoot, "ExcelOutput"); Directory.CreateDirectory(resourceTargetDirectory);
if (!Directory.Exists(excelOutputSource)) CopyDirectory(extractedRoot, resourceTargetDirectory);
throw new DirectoryNotFoundException($"ExcelOutput directory was not found in resource package: {excelOutputSource}");
var excelOutputTarget = Path.Combine(resourceTargetDirectory, "ExcelOutput");
Directory.CreateDirectory(excelOutputTarget);
CopyDirectory(excelOutputSource, excelOutputTarget);
} }
private static bool ConfirmUpdate(string latestVersion) private static bool ConfirmUpdate(string latestVersion)

View File

@@ -1 +1 @@
v=1.9 v=2.0