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

Speed up start time

Browse Source
This commit is contained in:
Michael Bucari-Tovo 2022-07-14 02:18:26 -06:00
parent c8d91032c0
commit 26508e6a8a
2 changed files with 40 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/AppScaffolding/LibationScaffolding.cs
View File

@ -411,9 +411,9 @@ namespace AppScaffolding
public static void migrate_from_7_10_1(Configuration config) public static void migrate_from_7_10_1(Configuration config)
{ {
var lastNigrationThres = config.GetNonString<bool>($"{nameof(migrate_from_7_10_1)}_ThrewError"); var lastMigrationThrew = config.GetNonString<bool>($"{nameof(migrate_from_7_10_1)}_ThrewError");
if (lastNigrationThres) return; if (lastMigrationThrew) return;
try try
{ {

50
Source/LibationWinForms/Program.cs
View File

@ -2,8 +2,10 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Threading.Tasks;
using System.Windows.Forms; using System.Windows.Forms;
using Avalonia; using Avalonia;
using Avalonia.Controls.ApplicationLifetimes;
using Avalonia.ReactiveUI; using Avalonia.ReactiveUI;
using Dinah.Core; using Dinah.Core;
using LibationFileManager; using LibationFileManager;
@ -21,7 +23,39 @@ namespace LibationWinForms
static bool UseAvaloniaUI = true; static bool UseAvaloniaUI = true;
[STAThread] [STAThread]
static void Main() static async Task Main()
{
var startupTask = Task.Run(RunStartupStuff);
if (UseAvaloniaUI)
{
var appBuilderTask = Task.Run(BuildAvaloniaApp);
var classicLifetimeTask = Task.Run(() => new ClassicDesktopStyleApplicationLifetime());
await Task.WhenAll(appBuilderTask, classicLifetimeTask, startupTask);
if (!startupTask.Result)
return;
appBuilderTask.Result.SetupWithLifetime(classicLifetimeTask.Result);
classicLifetimeTask.Result.Start(null);
}
else
{
if (!await startupTask)
return;
System.Windows.Forms.Application.Run(new Form1());
}
}
public static AppBuilder BuildAvaloniaApp()
=> AppBuilder.Configure<AvaloniaUI.App>()
.UsePlatformDetect()
.LogToTrace()
.UseReactiveUI();
private static bool RunStartupStuff()
{ {
try try
{ {
@ -71,23 +105,13 @@ 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; return 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();
if (UseAvaloniaUI) return true;
BuildAvaloniaApp().StartWithClassicDesktopLifetime(null);
else
System.Windows.Forms.Application.Run(new Form1());
} }
public static AppBuilder BuildAvaloniaApp()
=> AppBuilder.Configure<AvaloniaUI.App>()
.UsePlatformDetect()
.LogToTrace()
.UseReactiveUI();
private static void RunInstaller(Configuration config) private static void RunInstaller(Configuration config)
{ {