Kiseki
/
launcher
1
0
Fork 0
Code Issues 3 Pull Requests Packages Projects Releases 1 Wiki Activity

fix: bootstrapper stuff

This commit is contained in:
rjindael 2023-10-01 18:04:33 -07:00
parent c1a2035866
commit c1545761f6
No known key found for this signature in database
GPG Key ID: D069369C906CCF31
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Kiseki.Launcher.Windows/Bootstrapper.cs
View File

@ -62,6 +62,8 @@ public class Bootstrapper : Interfaces.IBootstrapper
// Check for updates // Check for updates
HeadingChange("Checking for updates..."); HeadingChange("Checking for updates...");
/*
// Check for a new launcher release from GitHub // Check for a new launcher release from GitHub
var launcherRelease = await Http.GetJson<GitHubRelease>($"https://api.github.com/repos/{Constants.PROJECT_REPOSITORY}/releases/latest"); var launcherRelease = await Http.GetJson<GitHubRelease>($"https://api.github.com/repos/{Constants.PROJECT_REPOSITORY}/releases/latest");
bool launcherUpToDate = true; bool launcherUpToDate = true;
@ -117,6 +119,8 @@ public class Bootstrapper : Interfaces.IBootstrapper
} }
} }
*/
var clientRelease = await Http.GetJson<ClientRelease>(Web.FormatUrl($"/api/setup/{Arguments["Version"]}")); var clientRelease = await Http.GetJson<ClientRelease>(Web.FormatUrl($"/api/setup/{Arguments["Version"]}"));
bool clientUpToDate = true; bool clientUpToDate = true;
bool createStudioShortcut = false; bool createStudioShortcut = false;
@ -151,9 +155,10 @@ public class Bootstrapper : Interfaces.IBootstrapper
using SHA256 SHA256 = SHA256.Create(); using SHA256 SHA256 = SHA256.Create();
using FileStream fileStream = File.OpenRead(Path.Combine(Paths.Versions, Arguments["Version"], file)); using FileStream fileStream = File.OpenRead(Path.Combine(Paths.Versions, Arguments["Version"], file));
string computedChecksum = Convert.ToBase64String(SHA256.ComputeHash(fileStream)); byte[] hashBytes = SHA256.ComputeHash(fileStream);
string computedChecksum = BitConverter.ToString(hashBytes).Replace("-", "");
if (checksum != computedChecksum) if (checksum.ToLower() != computedChecksum.ToLower())
{ {
clientUpToDate = false; clientUpToDate = false;
break; break;
@ -245,12 +250,12 @@ public class Bootstrapper : Interfaces.IBootstrapper
} }
}; };
Thread waiter = new(() => { Task waiter = new(async () => {
bool launched = false; bool launched = false;
while (!launched) while (!launched)
{ {
Thread.Sleep(100); await Task.Delay(100);
launched = Win32.IsWindowVisible(player.MainWindowHandle); launched = Win32.IsWindowVisible(player.MainWindowHandle);
} }
@ -260,10 +265,12 @@ public class Bootstrapper : Interfaces.IBootstrapper
Environment.Exit((int)Win32.ErrorCode.ERROR_SUCCESS); Environment.Exit((int)Win32.ErrorCode.ERROR_SUCCESS);
}); });
player.Start(); await Task.Run(() => {
player.WaitForInputIdle(); player.Start();
player.WaitForInputIdle();
waiter.Start(); waiter.Start();
});
} }
#region MainWindow #region MainWindow