mirror of
https://github.com/MikuLeaks/MikuSB.git
synced 2026-06-04 03:03:58 +00:00
Updater fixes due to changes in resource folders
This commit is contained in:
@@ -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);
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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)
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
v=1.9
|
v=2.0
|
||||||
Reference in New Issue
Block a user