This commit is contained in:
CWX 2022-05-31 14:49:28 +01:00
parent a3bbb4756b
commit bcc1e6e9ec
3 changed files with 5 additions and 8 deletions

View File

@ -8,7 +8,6 @@ namespace SPT_AKI_Installer.Aki.Core
{ {
//TODO: //TODO:
// locales, language selection // locales, language selection
// make the installer download relevant version of patcher and aki based on game version if possible
public static class SPTinstaller public static class SPTinstaller
{ {
@ -59,7 +58,6 @@ namespace SPT_AKI_Installer.Aki.Core
while (jsonDownload.Status != System.Threading.Tasks.TaskStatus.RanToCompletion) while (jsonDownload.Status != System.Threading.Tasks.TaskStatus.RanToCompletion)
{ {
} }
//Thread.Sleep(3000);
LogHelper.Info("Downloading Complete, Checking Versions!"); LogHelper.Info("Downloading Complete, Checking Versions!");
DownloadHelper.ReadJson(targetPath); DownloadHelper.ReadJson(targetPath);
@ -85,7 +83,7 @@ namespace SPT_AKI_Installer.Aki.Core
{ {
LogHelper.Info("Unable to find Patcher Zip in Directory"); LogHelper.Info("Unable to find Patcher Zip in Directory");
LogHelper.Info("Downloading Patcher Zip now!"); LogHelper.Info("Downloading Patcher Zip now!");
var task = DownloadHelper.DownloadFileAsync(targetPath, DownloadHelper.patcherLink, "/PATCHER.zip"); var task = DownloadHelper.DownloadFileAsync(targetPath, DownloadHelper.patcherLink, "/PATCHERZIP.zip");
while(task.Status != System.Threading.Tasks.TaskStatus.RanToCompletion) while(task.Status != System.Threading.Tasks.TaskStatus.RanToCompletion)
{ {
} }
@ -100,14 +98,13 @@ namespace SPT_AKI_Installer.Aki.Core
{ {
LogHelper.Info("Unable to find Aki Zip in Directory"); LogHelper.Info("Unable to find Aki Zip in Directory");
LogHelper.Info("Downloading Aki Zip now!"); LogHelper.Info("Downloading Aki Zip now!");
var task = DownloadHelper.DownloadFileAsync(targetPath, DownloadHelper.akiLink, "/AKI.zip"); var task = DownloadHelper.DownloadFileAsync(targetPath, DownloadHelper.akiLink, "/AKIZIP.zip");
while (task.Status != System.Threading.Tasks.TaskStatus.RanToCompletion) while (task.Status != System.Threading.Tasks.TaskStatus.RanToCompletion)
{ {
} }
LogHelper.Info("Download Complete!"); LogHelper.Info("Download Complete!");
} }
LogHelper.Info("Ready to continue with installation"); LogHelper.Info("Ready to continue with installation");
Console.ReadKey();
PreCheckHelper.PatcherZipCheck(originalGamePath, targetPath, out patcherZipPath); PreCheckHelper.PatcherZipCheck(originalGamePath, targetPath, out patcherZipPath);
PreCheckHelper.AkiZipCheck(targetPath, out akiZipPath); PreCheckHelper.AkiZipCheck(targetPath, out akiZipPath);

View File

@ -53,7 +53,7 @@ namespace SPT_AKI_Installer.Aki.Helper
patchZip = FileHelper.FindFile(targetPath, gameVersion, "Patcher"); patchZip = FileHelper.FindFile(targetPath, gameVersion, "Patcher");
if (patchZip == null) if (patchZip == null)
{ {
patchZip = FileHelper.FindFile(targetPath, "PATCHER"); patchZip = FileHelper.FindFile(targetPath, "PATCHERZIP");
} }
patcherZipPath = patchZip; patcherZipPath = patchZip;
} }
@ -64,7 +64,7 @@ namespace SPT_AKI_Installer.Aki.Helper
akiZip = FileHelper.FindFile(targetPath, "SPT", "RELEASE"); akiZip = FileHelper.FindFile(targetPath, "SPT", "RELEASE");
if (akiZip == null) if (akiZip == null)
{ {
akiZip = FileHelper.FindFile(targetPath, "AKI"); akiZip = FileHelper.FindFile(targetPath, "AKIZIP");
} }
akiZipPath = akiZip; akiZipPath = akiZip;
} }

View File

@ -4,6 +4,6 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
--> -->
<Project> <Project>
<PropertyGroup> <PropertyGroup>
<History>True|2022-05-17T00:06:33.6758525Z;True|2022-05-14T01:56:09.8410037+01:00;True|2022-05-14T00:54:24.0683990+01:00;True|2022-05-14T00:53:04.7105427+01:00;True|2022-05-14T00:51:00.6280767+01:00;True|2022-05-14T00:49:19.4630888+01:00;True|2022-05-14T00:47:59.2166156+01:00;</History> <History>True|2022-05-30T12:11:30.6942032Z;True|2022-05-30T13:08:08.4269393+01:00;True|2022-05-17T01:06:33.6758525+01:00;True|2022-05-14T01:56:09.8410037+01:00;True|2022-05-14T00:54:24.0683990+01:00;True|2022-05-14T00:53:04.7105427+01:00;True|2022-05-14T00:51:00.6280767+01:00;True|2022-05-14T00:49:19.4630888+01:00;True|2022-05-14T00:47:59.2166156+01:00;</History>
</PropertyGroup> </PropertyGroup>
</Project> </Project>