tyler/Libation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Startup speedup

Browse Source
This commit is contained in:
Michael Bucari-Tovo 2022-07-14 02:35:38 -06:00
parent 26508e6a8a
commit 7b28a274a8
1 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
Source/LibationWinForms/Program.cs
View File

@ -25,26 +25,34 @@ namespace LibationWinForms
[STAThread] [STAThread]
static async Task Main() static async Task Main()
{ {
//Start as much work in parallel as possible.
var startupTask = Task.Run(RunStartupStuff); var startupTask = Task.Run(RunStartupStuff);
if (UseAvaloniaUI)
{
var appBuilderTask = Task.Run(BuildAvaloniaApp); var appBuilderTask = Task.Run(BuildAvaloniaApp);
var classicLifetimeTask = Task.Run(() => new ClassicDesktopStyleApplicationLifetime()); var classicLifetimeTask = Task.Run(() => new ClassicDesktopStyleApplicationLifetime());
await Task.WhenAll(appBuilderTask, classicLifetimeTask, startupTask); List<Task> tasks = new() { startupTask, appBuilderTask, classicLifetimeTask };
if (!startupTask.Result) while ((await Task.WhenAny(tasks)) is Task t && t != startupTask)
tasks.Remove(t);
//When RunStartupStuff completes, check success and return if fail
if (!startupTask.Result.success)
return; return;
//When RunStartupStuff completes, check if user has opted into beta and run Avalonia UI if they did.
//Otherwise we just ignore all the Avalonia app build stuff and continue with winforms.
//For debug purposes, always run AvaloniaUI.
if (true) // (startupTask.Result.useBeta)
{
await Task.WhenAll(appBuilderTask, classicLifetimeTask, startupTask);
appBuilderTask.Result.SetupWithLifetime(classicLifetimeTask.Result); appBuilderTask.Result.SetupWithLifetime(classicLifetimeTask.Result);
classicLifetimeTask.Result.Start(null); classicLifetimeTask.Result.Start(null);
} }
else else
{ {
if (!await startupTask)
return;
System.Windows.Forms.Application.Run(new Form1()); System.Windows.Forms.Application.Run(new Form1());
} }
} }
@ -55,8 +63,9 @@ namespace LibationWinForms
.LogToTrace() .LogToTrace()
.UseReactiveUI(); .UseReactiveUI();
private static bool RunStartupStuff() private static (bool success, bool useBeta) RunStartupStuff()
{ {
bool useBeta = false;
try try
{ {
//// Uncomment to see Console. Must be called before anything writes to Console. //// Uncomment to see Console. Must be called before anything writes to Console.
@ -92,6 +101,8 @@ namespace LibationWinForms
#endif #endif
// logging is init'd here // logging is init'd here
AppScaffolding.LibationScaffolding.RunPostMigrationScaffolding(config); AppScaffolding.LibationScaffolding.RunPostMigrationScaffolding(config);
useBeta = config.GetNonString<bool>("BetaOptIn");
} }
catch (Exception ex) catch (Exception ex)
{ {
@ -105,12 +116,12 @@ namespace LibationWinForms
{ {
MessageBox.Show($"{body}\r\n\r\n{ex.Message}\r\n\r\n{ex.StackTrace}", title, MessageBoxButtons.OK, MessageBoxIcon.Error); MessageBox.Show($"{body}\r\n\r\n{ex.Message}\r\n\r\n{ex.StackTrace}", title, MessageBoxButtons.OK, MessageBoxIcon.Error);
} }
return false; return (false, false);
} }
// global exception handling (ShowAdminAlert) attempts to use logging. only call it after logging has been init'd // global exception handling (ShowAdminAlert) attempts to use logging. only call it after logging has been init'd
postLoggingGlobalExceptionHandling(); postLoggingGlobalExceptionHandling();
return true; return (true, !useBeta);
} }
private static void RunInstaller(Configuration config) private static void RunInstaller(Configuration config)