From 8a7596d66a0ce386cd78645898badf0eb4a99478 Mon Sep 17 00:00:00 2001
From: Ionite <dev@ionite.io>
Date: Sun, 28 May 2023 16:47:35 -0400
Subject: [PATCH 01/15] Add NLog config target - debug console

---
 StabilityMatrix/App.xaml.cs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/StabilityMatrix/App.xaml.cs b/StabilityMatrix/App.xaml.cs
index 82e6640d..8335b1be 100644
--- a/StabilityMatrix/App.xaml.cs
+++ b/StabilityMatrix/App.xaml.cs
@@ -48,6 +48,7 @@ namespace StabilityMatrix
             serviceCollection.AddSingleton<LaunchViewModel>();
             serviceCollection.AddSingleton<InstallerViewModel>();
             serviceCollection.AddSingleton<TextToImageViewModel>();
+            serviceCollection.AddSingleton<LaunchOptionsDialogViewModel>();
             serviceCollection.AddSingleton<IContentDialogService, ContentDialogService>();
             serviceCollection.AddSingleton<IPackageFactory, PackageFactory>();
             serviceCollection.AddSingleton<BasePackage, A3WebUI>();
@@ -70,10 +71,15 @@ namespace StabilityMatrix
                 client.BaseAddress = new Uri("http://localhost:7860");
             });
 
+            // Logging configuration
             var logPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "log.txt");
             var logConfig = new NLog.Config.LoggingConfiguration();
+            // File logging
             var fileTarget = new NLog.Targets.FileTarget("logfile") { FileName = logPath };
-            logConfig.AddRule(NLog.LogLevel.Trace, NLog.LogLevel.Fatal, fileTarget);
+            // Log trace+ to debug console
+            var debugTarget = new NLog.Targets.DebuggerTarget("debugger") { Layout = "${message}" };
+            logConfig.AddRule(NLog.LogLevel.Info, NLog.LogLevel.Fatal, fileTarget);
+            logConfig.AddRule(NLog.LogLevel.Trace, NLog.LogLevel.Fatal, debugTarget);
             NLog.LogManager.Configuration = logConfig;
 
             serviceCollection.AddLogging(log =>

From f1a40d3c07d72d742d1acfd01706eec7ae9e2866 Mon Sep 17 00:00:00 2001
From: Ionite <dev@ionite.io>
Date: Sun, 28 May 2023 16:48:20 -0400
Subject: [PATCH 02/15] Add launch options popup

---
 StabilityMatrix/LaunchOptionsDialog.xaml      | 90 +++++++++++++++++++
 StabilityMatrix/LaunchOptionsDialog.xaml.cs   | 13 +++
 StabilityMatrix/LaunchPage.xaml               | 66 +++++++++-----
 StabilityMatrix/Models/BasePackage.cs         |  2 +
 StabilityMatrix/Models/InstalledPackage.cs    |  4 +-
 StabilityMatrix/Models/LaunchOptionCard.cs    | 11 +++
 .../Models/LaunchOptionDefinition.cs          | 17 ++++
 StabilityMatrix/Models/Packages/A3WebUI.cs    | 20 +++++
 .../Models/Packages/DankDiffusion.cs          | 22 ++++-
 .../LaunchOptionsDialogViewModel.cs           | 22 +++++
 StabilityMatrix/ViewModels/LaunchViewModel.cs | 37 +++++++-
 11 files changed, 279 insertions(+), 25 deletions(-)
 create mode 100644 StabilityMatrix/LaunchOptionsDialog.xaml
 create mode 100644 StabilityMatrix/LaunchOptionsDialog.xaml.cs
 create mode 100644 StabilityMatrix/Models/LaunchOptionCard.cs
 create mode 100644 StabilityMatrix/Models/LaunchOptionDefinition.cs
 create mode 100644 StabilityMatrix/ViewModels/LaunchOptionsDialogViewModel.cs

diff --git a/StabilityMatrix/LaunchOptionsDialog.xaml b/StabilityMatrix/LaunchOptionsDialog.xaml
new file mode 100644
index 00000000..c14fcdfa
--- /dev/null
+++ b/StabilityMatrix/LaunchOptionsDialog.xaml
@@ -0,0 +1,90 @@
+<ui:ContentDialog
+    CloseButtonText="Close"
+    Title="Launch Options"
+    d:DataContext="{d:DesignInstance Type=viewModels:LaunchOptionsDialogViewModel,
+                                     IsDesignTimeCreatable=True}"
+    d:DesignHeight="512"
+    d:DesignWidth="512"
+    mc:Ignorable="d"
+    ui:Design.Background="{DynamicResource ApplicationBackgroundBrush}"
+    ui:Design.Foreground="{DynamicResource TextFillColorPrimaryBrush}"
+    x:Class="StabilityMatrix.LaunchOptionsDialog"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:StabilityMatrix"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:models="clr-namespace:StabilityMatrix.Models"
+    xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
+    xmlns:viewModels="clr-namespace:StabilityMatrix.ViewModels"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+    <ui:ContentDialog.Resources>
+        <Style BasedOn="{StaticResource {x:Type ui:ContentDialog}}" TargetType="{x:Type local:LaunchOptionsDialog}" />
+        <DataTemplate DataType="{x:Type models:LaunchOptionCard}" x:Key="LaunchOptionCardDataTemplate">
+            <ui:Card Margin="16,8,8,8">
+                <StackPanel
+                    HorizontalAlignment="Left"
+                    Margin="8,0,8,0"
+                    Orientation="Vertical">
+                    <TextBlock
+                        FontSize="16"
+                        FontWeight="Bold"
+                        Margin="0,8"
+                        Text="{Binding Title}" />
+                    <StackPanel Orientation="Horizontal">
+                        <ItemsControl ItemsSource="{Binding Options}">
+                            <ItemsControl.ItemTemplate>
+                                <DataTemplate>
+                                    <CheckBox Content="{Binding}" />
+                                </DataTemplate>
+                            </ItemsControl.ItemTemplate>
+                        </ItemsControl>
+                    </StackPanel>
+                </StackPanel>
+            </ui:Card>
+        </DataTemplate>
+    </ui:ContentDialog.Resources>
+
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="*" />
+            <RowDefinition Height="Auto" />
+        </Grid.RowDefinitions>
+        <TextBlock
+            Margin="8"
+            Text="Launch Options"
+            TextWrapping="WrapWithOverflow" />
+        <ScrollViewer Grid.Row="1" HorizontalScrollBarVisibility="Auto">
+            <StackPanel Orientation="Vertical">
+                <!--  Options cards  -->
+                <ItemsControl ItemTemplate="{StaticResource LaunchOptionCardDataTemplate}" ItemsSource="{Binding Cards}" />
+            </StackPanel>
+        </ScrollViewer>
+        <StackPanel
+            Grid.Row="2"
+            Margin="16,8,16,8"
+            VerticalAlignment="Bottom">
+
+            <UniformGrid Columns="2" VerticalAlignment="Bottom">
+                <ui:Button
+                    Appearance="Primary"
+                    Content="Save"
+                    FontSize="16"
+                    HorizontalAlignment="Stretch"
+                    Margin="8"
+                    VerticalAlignment="Center"
+                    VerticalContentAlignment="Center" />
+                <ui:Button
+                    Appearance="Secondary"
+                    Content="Cancel"
+                    FontSize="16"
+                    HorizontalAlignment="Stretch"
+                    Margin="8"
+                    VerticalAlignment="Center"
+                    VerticalContentAlignment="Center" />
+            </UniformGrid>
+
+        </StackPanel>
+    </Grid>
+</ui:ContentDialog>
diff --git a/StabilityMatrix/LaunchOptionsDialog.xaml.cs b/StabilityMatrix/LaunchOptionsDialog.xaml.cs
new file mode 100644
index 00000000..7bd9f457
--- /dev/null
+++ b/StabilityMatrix/LaunchOptionsDialog.xaml.cs
@@ -0,0 +1,13 @@
+using System.Windows.Controls;
+using StabilityMatrix.ViewModels;
+using Wpf.Ui.Controls.ContentDialogControl;
+
+namespace StabilityMatrix;
+
+public partial class LaunchOptionsDialog : ContentDialog
+{
+    public LaunchOptionsDialog(ContentPresenter contentPresenter) : base(contentPresenter)
+    {
+        InitializeComponent();
+    }
+}
diff --git a/StabilityMatrix/LaunchPage.xaml b/StabilityMatrix/LaunchPage.xaml
index eb4f5388..e80cef9b 100644
--- a/StabilityMatrix/LaunchPage.xaml
+++ b/StabilityMatrix/LaunchPage.xaml
@@ -116,28 +116,50 @@
                 <ColumnDefinition Width="Auto" />
                 <ColumnDefinition Width="*" />
             </Grid.ColumnDefinitions>
-            <ui:Button
-                Background="Green"
-                Command="{Binding LaunchCommand}"
-                Content="Launch"
-                Grid.Row="0"
-                HorizontalAlignment="Left"
-                Margin="8,8,0,0"
-                VerticalAlignment="Stretch"
-                Visibility="{Binding LaunchButtonVisibility, FallbackValue=Visible}"
-                Width="72"
-                x:Name="LaunchButton" />
-            <ui:Button
-                Background="DarkRed"
-                Command="{Binding StopCommand}"
-                Content="Stop"
-                Grid.Row="0"
-                HorizontalAlignment="Left"
-                Margin="8,8,0,0"
-                VerticalAlignment="Stretch"
-                Visibility="{Binding StopButtonVisibility, FallbackValue=Hidden}"
-                Width="72"
-                x:Name="StopButton" />
+            <Grid>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="0.8*" />
+                    <ColumnDefinition Width="0.2*" />
+                </Grid.ColumnDefinitions>
+                <ui:Button
+                    Background="Green"
+                    Command="{Binding LaunchCommand}"
+                    Content="Launch"
+                    Grid.Column="0"
+                    Grid.Row="0"
+                    HorizontalAlignment="Left"
+                    Margin="8,8,0,0"
+                    VerticalAlignment="Stretch"
+                    Visibility="{Binding LaunchButtonVisibility, FallbackValue=Visible}"
+                    Width="72"
+                    x:Name="LaunchButton" />
+                <ui:Button
+                    Background="DarkRed"
+                    Command="{Binding StopCommand}"
+                    Content="Stop"
+                    Grid.Column="0"
+                    Grid.Row="0"
+                    HorizontalAlignment="Left"
+                    Margin="8,8,0,0"
+                    VerticalAlignment="Stretch"
+                    Visibility="{Binding StopButtonVisibility, FallbackValue=Hidden}"
+                    Width="72"
+                    x:Name="StopButton" />
+                <ui:Button
+                    Command="{Binding ConfigCommand}"
+                    FontSize="16"
+                    Grid.Column="1"
+                    Grid.Row="0"
+                    HorizontalAlignment="Left"
+                    Margin="8,8,0,0"
+                    VerticalAlignment="Stretch"
+                    Width="48"
+                    x:Name="ConfigButton">
+                    <ui:Button.Icon>
+                        <ui:SymbolIcon Symbol="Settings32" />
+                    </ui:Button.Icon>
+                </ui:Button>
+            </Grid>
             <ComboBox
                 Grid.Column="1"
                 Grid.Row="0"
diff --git a/StabilityMatrix/Models/BasePackage.cs b/StabilityMatrix/Models/BasePackage.cs
index 336f2271..176d9f0b 100644
--- a/StabilityMatrix/Models/BasePackage.cs
+++ b/StabilityMatrix/Models/BasePackage.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Threading.Tasks;
 
 namespace StabilityMatrix.Models;
@@ -18,6 +19,7 @@ public abstract class BasePackage
     public abstract Task Shutdown();
     public abstract Task<bool> CheckForUpdates();
     public abstract Task<string?> Update();
+    public abstract List<LaunchOptionDefinition> LaunchOptions { get; }
 
     internal virtual string DownloadLocation => $"{Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData)}\\StabilityMatrix\\Packages\\{Name}.zip";
     internal virtual string InstallLocation => $"{Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData)}\\StabilityMatrix\\Packages\\{Name}";
diff --git a/StabilityMatrix/Models/InstalledPackage.cs b/StabilityMatrix/Models/InstalledPackage.cs
index bd96f32c..98232020 100644
--- a/StabilityMatrix/Models/InstalledPackage.cs
+++ b/StabilityMatrix/Models/InstalledPackage.cs
@@ -1,4 +1,6 @@
 using System;
+using System.Collections.Generic;
+using System.Windows.Documents;
 
 namespace StabilityMatrix.Models;
 
@@ -17,6 +19,6 @@ public class InstalledPackage
     public string? PackageVersion { get; set; }
     // Install path
     public string? Path { get; set; }
-
     public string? LaunchCommand { get; set; }
+    public HashSet<string>? LaunchArgs { get; set; }
 }
diff --git a/StabilityMatrix/Models/LaunchOptionCard.cs b/StabilityMatrix/Models/LaunchOptionCard.cs
new file mode 100644
index 00000000..3401d891
--- /dev/null
+++ b/StabilityMatrix/Models/LaunchOptionCard.cs
@@ -0,0 +1,11 @@
+using System.Collections.Generic;
+using System.Windows.Documents;
+
+namespace StabilityMatrix.Models;
+
+public class LaunchOptionCard
+{
+    public string Title { get; set; }
+    public string? Description { get; set; }
+    public List<string> Options { get; set; }
+}
diff --git a/StabilityMatrix/Models/LaunchOptionDefinition.cs b/StabilityMatrix/Models/LaunchOptionDefinition.cs
new file mode 100644
index 00000000..b7c20419
--- /dev/null
+++ b/StabilityMatrix/Models/LaunchOptionDefinition.cs
@@ -0,0 +1,17 @@
+using System.Collections.Generic;
+
+namespace StabilityMatrix.Models;
+
+/// <summary>
+/// Defines a launch option for a BasePackage.
+/// </summary>
+public class LaunchOptionDefinition
+{
+    public string Name { get; set; }
+    // Minimum number of selected options
+    public int? MinSelectedOptions { get; set; }
+    // Maximum number of selected options
+    public int? MaxSelectedOptions { get; set; }
+    // List of option flags like "--api", "--lowvram", etc.
+    public List<string> Options { get; set; }
+}
diff --git a/StabilityMatrix/Models/Packages/A3WebUI.cs b/StabilityMatrix/Models/Packages/A3WebUI.cs
index 0f6d387a..1b6bc19a 100644
--- a/StabilityMatrix/Models/Packages/A3WebUI.cs
+++ b/StabilityMatrix/Models/Packages/A3WebUI.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
 using System.IO.Compression;
@@ -27,6 +28,25 @@ public class A3WebUI : BasePackage
     public override string DefaultLaunchArguments => $"{GetVramOption()} {GetXformersOption()}";
 
     public override bool UpdateAvailable { get; set; } = false;
+    
+    public override List<LaunchOptionDefinition> LaunchOptions => new()
+    {
+        new LaunchOptionDefinition
+        {
+            Name = "API",
+            Options = new List<string> { "--api" }
+        },
+        new LaunchOptionDefinition
+        {
+            Name = "VRAM",
+            Options = new List<string> { "--lowvram", "--medvram" }
+        },
+        new LaunchOptionDefinition
+        {
+            Name = "Xformers",
+            Options = new List<string> { "--xformers" }
+        }
+    };
 
 
     private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
diff --git a/StabilityMatrix/Models/Packages/DankDiffusion.cs b/StabilityMatrix/Models/Packages/DankDiffusion.cs
index 90fe93d3..7f4d1576 100644
--- a/StabilityMatrix/Models/Packages/DankDiffusion.cs
+++ b/StabilityMatrix/Models/Packages/DankDiffusion.cs
@@ -1,4 +1,5 @@
-using System.Threading.Tasks;
+using System.Collections.Generic;
+using System.Threading.Tasks;
 
 namespace StabilityMatrix.Models.Packages;
 
@@ -10,6 +11,25 @@ public class DankDiffusion : BasePackage
     public override string GithubUrl => "https://github.com/mohnjiles/dank-diffusion";
     public override string LaunchCommand => "";
 
+    public override List<LaunchOptionDefinition> LaunchOptions => new()
+    {
+        new LaunchOptionDefinition
+        {
+            Name = "API",
+            Options = new List<string> { "--api" }
+        },
+        new LaunchOptionDefinition
+        {
+            Name = "VRAM",
+            Options = new List<string> { "--lowvram", "--medvram" }
+        },
+        new LaunchOptionDefinition
+        {
+            Name = "Xformers",
+            Options = new List<string> { "--xformers" }
+        }
+    };
+    
     public override Task<string?> DownloadPackage(bool isUpdate = false)
     {
         throw new System.NotImplementedException();
diff --git a/StabilityMatrix/ViewModels/LaunchOptionsDialogViewModel.cs b/StabilityMatrix/ViewModels/LaunchOptionsDialogViewModel.cs
new file mode 100644
index 00000000..ffdfe57b
--- /dev/null
+++ b/StabilityMatrix/ViewModels/LaunchOptionsDialogViewModel.cs
@@ -0,0 +1,22 @@
+using System;
+using System.Collections.ObjectModel;
+using CommunityToolkit.Mvvm.ComponentModel;
+using StabilityMatrix.Helper;
+using StabilityMatrix.Models;
+
+namespace StabilityMatrix.ViewModels;
+
+public partial class LaunchOptionsDialogViewModel : ObservableObject
+{
+    public ObservableCollection<LaunchOptionCard> Cards { get; set; } = new();
+
+    [ObservableProperty]
+    private BasePackage? selectedPackage;
+
+    public void OnLoad()
+    {
+        // Populate Cards using the selected package
+        
+
+    }
+}
diff --git a/StabilityMatrix/ViewModels/LaunchViewModel.cs b/StabilityMatrix/ViewModels/LaunchViewModel.cs
index f98cad89..a1932ca8 100644
--- a/StabilityMatrix/ViewModels/LaunchViewModel.cs
+++ b/StabilityMatrix/ViewModels/LaunchViewModel.cs
@@ -10,6 +10,7 @@ using CommunityToolkit.Mvvm.Input;
 using Microsoft.Toolkit.Uwp.Notifications;
 using StabilityMatrix.Helper;
 using StabilityMatrix.Models;
+using Wpf.Ui.Contracts;
 
 namespace StabilityMatrix.ViewModels;
 
@@ -17,6 +18,8 @@ public partial class LaunchViewModel : ObservableObject
 {
     private readonly ISettingsManager settingsManager;
     private readonly IPackageFactory packageFactory;
+    private readonly IContentDialogService contentDialogService;
+    private readonly LaunchOptionsDialogViewModel launchOptionsDialogViewModel;
     private BasePackage? runningPackage;
     private bool clearingPackages = false;
 
@@ -56,8 +59,10 @@ public partial class LaunchViewModel : ObservableObject
 
     public event EventHandler? ScrollNeeded;
 
-    public LaunchViewModel(ISettingsManager settingsManager, IPackageFactory packageFactory)
+    public LaunchViewModel(ISettingsManager settingsManager, IPackageFactory packageFactory, IContentDialogService contentDialogService, LaunchOptionsDialogViewModel launchOptionsDialogViewModel)
     {
+        this.contentDialogService = contentDialogService;
+        this.launchOptionsDialogViewModel = launchOptionsDialogViewModel;
         this.settingsManager = settingsManager;
         this.packageFactory = packageFactory;
         SetProcessRunning(false);
@@ -102,6 +107,36 @@ public partial class LaunchViewModel : ObservableObject
         SetProcessRunning(true);
     });
 
+    [RelayCommand]
+    public async Task ConfigAsync()
+    {
+        var vm = launchOptionsDialogViewModel;
+        var name = SelectedPackage?.Name;
+        if (name == null)
+        {
+            Debug.WriteLine($"Selected package is null");
+            return;
+        }
+        var package = packageFactory.FindPackageByName(name);
+        if (package == null)
+        {
+            Debug.WriteLine($"Package {name} not found");
+            return;
+        }
+        
+        vm.SelectedPackage = package;
+        
+        // Open a config page
+        var dialog = new LaunchOptionsDialog(contentDialogService.GetContentPresenter())
+        {
+            DataContext = vm,
+            IsPrimaryButtonEnabled = true,
+            PrimaryButtonText = "Save",
+            CloseButtonText= "Cancel",
+        };
+        await dialog.ShowAsync();
+    }
+
     private void RunningPackageOnStartupComplete(object? sender, string url)
     {
         new ToastContentBuilder()

From b254e78ade7e7370bd5f855e66a9a8cea0bca7ed Mon Sep 17 00:00:00 2001
From: Ionite <dev@ionite.io>
Date: Sun, 28 May 2023 16:52:21 -0400
Subject: [PATCH 03/15] Add nlog logger to LaunchViewModel

---
 StabilityMatrix/ViewModels/LaunchViewModel.cs | 42 +++++++++++--------
 1 file changed, 24 insertions(+), 18 deletions(-)

diff --git a/StabilityMatrix/ViewModels/LaunchViewModel.cs b/StabilityMatrix/ViewModels/LaunchViewModel.cs
index a1932ca8..c8772713 100644
--- a/StabilityMatrix/ViewModels/LaunchViewModel.cs
+++ b/StabilityMatrix/ViewModels/LaunchViewModel.cs
@@ -7,6 +7,7 @@ using System.Windows;
 using System.Windows.Threading;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
+using Microsoft.Extensions.Logging;
 using Microsoft.Toolkit.Uwp.Notifications;
 using StabilityMatrix.Helper;
 using StabilityMatrix.Models;
@@ -20,23 +21,21 @@ public partial class LaunchViewModel : ObservableObject
     private readonly IPackageFactory packageFactory;
     private readonly IContentDialogService contentDialogService;
     private readonly LaunchOptionsDialogViewModel launchOptionsDialogViewModel;
+    private readonly ILogger<LaunchViewModel> logger;
     private BasePackage? runningPackage;
     private bool clearingPackages = false;
 
-    [ObservableProperty]
-    private string consoleInput = "";
+    [ObservableProperty] private string consoleInput = "";
 
-    [ObservableProperty]
-    private string consoleOutput = "";
+    [ObservableProperty] private string consoleOutput = "";
 
-    [ObservableProperty]
-    private Visibility launchButtonVisibility;
+    [ObservableProperty] private Visibility launchButtonVisibility;
 
-    [ObservableProperty]
-    private Visibility stopButtonVisibility;
+    [ObservableProperty] private Visibility stopButtonVisibility;
 
 
     private InstalledPackage? selectedPackage;
+
     public InstalledPackage? SelectedPackage
     {
         get => selectedPackage;
@@ -54,19 +53,23 @@ public partial class LaunchViewModel : ObservableObject
         }
     }
 
-    [ObservableProperty]
-    private ObservableCollection<InstalledPackage> installedPackages = new();
+    [ObservableProperty] private ObservableCollection<InstalledPackage> installedPackages = new();
 
     public event EventHandler? ScrollNeeded;
 
-    public LaunchViewModel(ISettingsManager settingsManager, IPackageFactory packageFactory, IContentDialogService contentDialogService, LaunchOptionsDialogViewModel launchOptionsDialogViewModel)
+    public LaunchViewModel(ISettingsManager settingsManager,
+        IPackageFactory packageFactory,
+        IContentDialogService contentDialogService,
+        LaunchOptionsDialogViewModel launchOptionsDialogViewModel,
+        ILogger<LaunchViewModel> logger)
     {
         this.contentDialogService = contentDialogService;
         this.launchOptionsDialogViewModel = launchOptionsDialogViewModel;
+        this.logger = logger;
         this.settingsManager = settingsManager;
         this.packageFactory = packageFactory;
         SetProcessRunning(false);
-        
+
         ToastNotificationManagerCompat.OnActivated += ToastNotificationManagerCompatOnOnActivated;
     }
 
@@ -74,7 +77,7 @@ public partial class LaunchViewModel : ObservableObject
     {
         if (e.Argument.StartsWith("http"))
         {
-            Process.Start(new ProcessStartInfo(e.Argument) { UseShellExecute = true });
+            Process.Start(new ProcessStartInfo(e.Argument) {UseShellExecute = true});
         }
     }
 
@@ -98,7 +101,7 @@ public partial class LaunchViewModel : ObservableObject
         {
             throw new InvalidOperationException("Package not found");
         }
-        
+
         basePackage.ConsoleOutput += OnConsoleOutput;
         basePackage.Exited += OnExit;
         basePackage.StartupComplete += RunningPackageOnStartupComplete;
@@ -117,22 +120,23 @@ public partial class LaunchViewModel : ObservableObject
             Debug.WriteLine($"Selected package is null");
             return;
         }
+
         var package = packageFactory.FindPackageByName(name);
         if (package == null)
         {
             Debug.WriteLine($"Package {name} not found");
             return;
         }
-        
+
         vm.SelectedPackage = package;
-        
+
         // Open a config page
         var dialog = new LaunchOptionsDialog(contentDialogService.GetContentPresenter())
         {
             DataContext = vm,
             IsPrimaryButtonEnabled = true,
             PrimaryButtonText = "Save",
-            CloseButtonText= "Cancel",
+            CloseButtonText = "Cancel",
         };
         await dialog.ShowAsync();
     }
@@ -175,6 +179,7 @@ public partial class LaunchViewModel : ObservableObject
             runningPackage.ConsoleOutput -= OnConsoleOutput;
             runningPackage.Exited -= OnExit;
         }
+
         runningPackage?.Shutdown();
         runningPackage = null;
         SetProcessRunning(false);
@@ -197,6 +202,7 @@ public partial class LaunchViewModel : ObservableObject
         {
             InstalledPackages.Add(package);
         }
+
         clearingPackages = false;
     }
 
@@ -213,7 +219,7 @@ public partial class LaunchViewModel : ObservableObject
             StopButtonVisibility = Visibility.Collapsed;
         }
     }
-    
+
     private void OnConsoleOutput(object? sender, string output)
     {
         if (output == null) return;

From 9c943b7305bc4a790ba82695d6fefb4cd98ab6d2 Mon Sep 17 00:00:00 2001
From: Ionite <dev@ionite.io>
Date: Sun, 28 May 2023 18:10:22 -0400
Subject: [PATCH 04/15] Add unit test project

---
 .../StabilityMatrix.Tests.csproj              | 24 +++++++++++++++++++
 StabilityMatrix.Tests/UnitTest1.cs            | 13 ++++++++++
 StabilityMatrix.Tests/Usings.cs               |  1 +
 StabilityMatrix.sln                           |  6 +++++
 4 files changed, 44 insertions(+)
 create mode 100644 StabilityMatrix.Tests/StabilityMatrix.Tests.csproj
 create mode 100644 StabilityMatrix.Tests/UnitTest1.cs
 create mode 100644 StabilityMatrix.Tests/Usings.cs

diff --git a/StabilityMatrix.Tests/StabilityMatrix.Tests.csproj b/StabilityMatrix.Tests/StabilityMatrix.Tests.csproj
new file mode 100644
index 00000000..96ae6f5c
--- /dev/null
+++ b/StabilityMatrix.Tests/StabilityMatrix.Tests.csproj
@@ -0,0 +1,24 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFramework>net6.0-windows10.0.17763.0</TargetFramework>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <Nullable>enable</Nullable>
+
+        <IsPackable>false</IsPackable>
+        <IsTestProject>true</IsTestProject>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
+        <PackageReference Include="Moq" Version="4.18.4" />
+        <PackageReference Include="MSTest.TestAdapter" Version="2.2.10" />
+        <PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
+        <PackageReference Include="coverlet.collector" Version="3.2.0" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <ProjectReference Include="..\StabilityMatrix\StabilityMatrix.csproj" />
+    </ItemGroup>
+
+</Project>
diff --git a/StabilityMatrix.Tests/UnitTest1.cs b/StabilityMatrix.Tests/UnitTest1.cs
new file mode 100644
index 00000000..e0c0b6c8
--- /dev/null
+++ b/StabilityMatrix.Tests/UnitTest1.cs
@@ -0,0 +1,13 @@
+using StabilityMatrix;
+
+namespace StabilityMatrix.Tests;
+
+[TestClass]
+public class UnitTest1
+{
+    [TestMethod]
+    public void TestMethod1()
+    {
+        Assert.IsTrue(true);
+    }
+}
diff --git a/StabilityMatrix.Tests/Usings.cs b/StabilityMatrix.Tests/Usings.cs
new file mode 100644
index 00000000..ab67c7ea
--- /dev/null
+++ b/StabilityMatrix.Tests/Usings.cs
@@ -0,0 +1 @@
+global using Microsoft.VisualStudio.TestTools.UnitTesting;
\ No newline at end of file
diff --git a/StabilityMatrix.sln b/StabilityMatrix.sln
index 7ca54ed3..e7ce760e 100644
--- a/StabilityMatrix.sln
+++ b/StabilityMatrix.sln
@@ -5,6 +5,8 @@ VisualStudioVersion = 17.6.33717.318
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StabilityMatrix", "StabilityMatrix\StabilityMatrix.csproj", "{7CA2E862-B121-495D-8CCC-2D6EF56A3312}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StabilityMatrix.Tests", "StabilityMatrix.Tests\StabilityMatrix.Tests.csproj", "{63EF4330-CCFF-4677-B14C-1A700CD81FDA}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -15,6 +17,10 @@ Global
 		{7CA2E862-B121-495D-8CCC-2D6EF56A3312}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7CA2E862-B121-495D-8CCC-2D6EF56A3312}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7CA2E862-B121-495D-8CCC-2D6EF56A3312}.Release|Any CPU.Build.0 = Release|Any CPU
+		{63EF4330-CCFF-4677-B14C-1A700CD81FDA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{63EF4330-CCFF-4677-B14C-1A700CD81FDA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{63EF4330-CCFF-4677-B14C-1A700CD81FDA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{63EF4330-CCFF-4677-B14C-1A700CD81FDA}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

From 54ac62048d4c5b17219a9ba70acb587f71e3ea29 Mon Sep 17 00:00:00 2001
From: Ionite <dev@ionite.io>
Date: Sun, 28 May 2023 18:10:44 -0400
Subject: [PATCH 05/15] Extract PyRunner as singleton for DI

---
 StabilityMatrix/App.xaml.cs                   |  8 +++-
 StabilityMatrix/IPyRunner.cs                  | 47 +++++++++++++++++++
 StabilityMatrix/PyIOStream.cs                 |  2 +-
 StabilityMatrix/PyRunner.cs                   | 42 ++++++++++-------
 .../ViewModels/InstallerViewModel.cs          | 10 ++--
 StabilityMatrix/ViewModels/LaunchViewModel.cs | 34 +++++++++-----
 .../ViewModels/SettingsViewModel.cs           | 10 ++--
 7 files changed, 111 insertions(+), 42 deletions(-)
 create mode 100644 StabilityMatrix/IPyRunner.cs

diff --git a/StabilityMatrix/App.xaml.cs b/StabilityMatrix/App.xaml.cs
index 8335b1be..4dcc6170 100644
--- a/StabilityMatrix/App.xaml.cs
+++ b/StabilityMatrix/App.xaml.cs
@@ -38,19 +38,23 @@ namespace StabilityMatrix
 
             var serviceCollection = new ServiceCollection();
             serviceCollection.AddSingleton<IPageService, PageService>();
+            serviceCollection.AddSingleton<IContentDialogService, ContentDialogService>();
+            serviceCollection.AddSingleton<IPackageFactory, PackageFactory>();
+            serviceCollection.AddSingleton<IPyRunner, PyRunner>();
+            
             serviceCollection.AddTransient<MainWindow>();
             serviceCollection.AddTransient<SettingsPage>();
             serviceCollection.AddTransient<LaunchPage>();
             serviceCollection.AddTransient<InstallPage>();
             serviceCollection.AddTransient<TextToImagePage>();
+            
             serviceCollection.AddTransient<MainWindowViewModel>();
             serviceCollection.AddSingleton<SettingsViewModel>();
             serviceCollection.AddSingleton<LaunchViewModel>();
             serviceCollection.AddSingleton<InstallerViewModel>();
             serviceCollection.AddSingleton<TextToImageViewModel>();
             serviceCollection.AddSingleton<LaunchOptionsDialogViewModel>();
-            serviceCollection.AddSingleton<IContentDialogService, ContentDialogService>();
-            serviceCollection.AddSingleton<IPackageFactory, PackageFactory>();
+            
             serviceCollection.AddSingleton<BasePackage, A3WebUI>();
             serviceCollection.AddSingleton<BasePackage, DankDiffusion>();
             serviceCollection.AddSingleton<ISnackbarService, SnackbarService>();
diff --git a/StabilityMatrix/IPyRunner.cs b/StabilityMatrix/IPyRunner.cs
new file mode 100644
index 00000000..a6f164b9
--- /dev/null
+++ b/StabilityMatrix/IPyRunner.cs
@@ -0,0 +1,47 @@
+using System.IO;
+using System.Threading.Tasks;
+
+namespace StabilityMatrix;
+
+public interface IPyRunner
+{
+    /// <summary>
+    /// Initializes the Python runtime using the embedded dll.
+    /// Can be called with no effect after initialization.
+    /// </summary>
+    /// <exception cref="FileNotFoundException">Thrown if Python DLL not found.</exception>
+    Task Initialize();
+
+    /// <summary>
+    /// One-time setup for get-pip
+    /// </summary>
+    Task SetupPip();
+
+    /// <summary>
+    /// Install a Python package with pip
+    /// </summary>
+    Task InstallPackage(string package);
+
+    /// <summary>
+    /// Evaluate Python expression and return its value as a string
+    /// </summary>
+    /// <param name="expression"></param>
+    Task<string> Eval(string expression);
+
+    /// <summary>
+    /// Evaluate Python expression and return its value
+    /// </summary>
+    /// <param name="expression"></param>
+    Task<T> Eval<T>(string expression);
+
+    /// <summary>
+    /// Execute Python code without returning a value
+    /// </summary>
+    /// <param name="code"></param>
+    Task Exec(string code);
+
+    /// <summary>
+    /// Return the Python version as a PyVersionInfo struct
+    /// </summary>
+    Task<PyVersionInfo> GetVersionInfo();
+}
\ No newline at end of file
diff --git a/StabilityMatrix/PyIOStream.cs b/StabilityMatrix/PyIOStream.cs
index 0455e8bb..a0b771dc 100644
--- a/StabilityMatrix/PyIOStream.cs
+++ b/StabilityMatrix/PyIOStream.cs
@@ -10,7 +10,7 @@ namespace StabilityMatrix;
 /// Implement the interface of the sys.stdout redirection
 /// </summary>
 [SuppressMessage("ReSharper", "InconsistentNaming")]
-internal class PyIOStream
+public class PyIOStream
 {
     private readonly StringBuilder TextBuilder;
     private readonly StringWriter TextWriter;
diff --git a/StabilityMatrix/PyRunner.cs b/StabilityMatrix/PyRunner.cs
index 76f75898..cd406cdb 100644
--- a/StabilityMatrix/PyRunner.cs
+++ b/StabilityMatrix/PyRunner.cs
@@ -2,17 +2,19 @@
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.Extensions.Logging;
 using NLog;
 using Python.Runtime;
 using StabilityMatrix.Helper;
+using ILogger = NLog.ILogger;
 
 namespace StabilityMatrix;
 
-internal record struct PyVersionInfo(int Major, int Minor, int Micro, string ReleaseLevel, int Serial);
+public record struct PyVersionInfo(int Major, int Minor, int Micro, string ReleaseLevel, int Serial);
 
-internal static class PyRunner
+public class PyRunner : IPyRunner
 {
-    private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
+    private readonly ILogger<PyRunner> logger;
 
     private const string RelativeDllPath = @"Assets\Python310\python310.dll";
     private const string RelativeExePath = @"Assets\Python310\python.exe";
@@ -22,26 +24,32 @@ internal static class PyRunner
     public static string ExePath => Path.Combine(AppDomain.CurrentDomain.BaseDirectory, RelativeExePath);
     public static string PipExePath => Path.Combine(AppDomain.CurrentDomain.BaseDirectory, RelativePipExePath);
     public static string GetPipPath => Path.Combine(AppDomain.CurrentDomain.BaseDirectory, RelativeGetPipPath);
-
-    public static PyIOStream? StdOutStream;
-    public static PyIOStream? StdErrStream;
-
+    
     private static readonly SemaphoreSlim PyRunning = new(1, 1);
+    
+    private PyIOStream? StdOutStream;
+    private PyIOStream? StdErrStream;
+
+    public PyRunner(ILogger<PyRunner> logger)
+    {
+        this.logger = logger;
+    }
 
     /// <summary>
     /// Initializes the Python runtime using the embedded dll.
     /// Can be called with no effect after initialization.
     /// </summary>
     /// <exception cref="FileNotFoundException">Thrown if Python DLL not found.</exception>
-    public static async Task Initialize()
+    public async Task Initialize()
     {
         if (PythonEngine.IsInitialized) return;
 
-        Logger.Trace($"Initializing Python runtime with DLL '{DllPath}'");
+        logger.LogInformation("Initializing Python runtime with DLL: {DllPath}", DllPath);
 
         // Check PythonDLL exists
         if (!File.Exists(DllPath))
         {
+            logger.LogError("Python DLL not found");
             throw new FileNotFoundException("Python DLL not found", DllPath);
         }
         Runtime.PythonDLL = DllPath;
@@ -62,7 +70,7 @@ internal static class PyRunner
     /// <summary>
     /// One-time setup for get-pip
     /// </summary>
-    public static async Task SetupPip()
+    public async Task SetupPip()
     {
         if (!File.Exists(GetPipPath))
         {
@@ -75,7 +83,7 @@ internal static class PyRunner
     /// <summary>
     /// Install a Python package with pip
     /// </summary>
-    public static async Task InstallPackage(string package)
+    public async Task InstallPackage(string package)
     {
         if (!File.Exists(PipExePath))
         {
@@ -92,7 +100,7 @@ internal static class PyRunner
     /// <param name="waitTimeout">Time limit for waiting on PyRunning lock.</param>
     /// <param name="cancelToken">Cancellation token.</param>
     /// <exception cref="OperationCanceledException">cancelToken was canceled, or waitTimeout expired.</exception>
-    private static async Task<T> RunInThreadWithLock<T>(Func<T> func, TimeSpan? waitTimeout = null, CancellationToken cancelToken = default)
+    private async Task<T> RunInThreadWithLock<T>(Func<T> func, TimeSpan? waitTimeout = null, CancellationToken cancelToken = default)
     {
         // Wait to acquire PyRunning lock
         await PyRunning.WaitAsync(cancelToken).ConfigureAwait(false);
@@ -119,7 +127,7 @@ internal static class PyRunner
     /// <param name="waitTimeout">Time limit for waiting on PyRunning lock.</param>
     /// <param name="cancelToken">Cancellation token.</param>
     /// <exception cref="OperationCanceledException">cancelToken was canceled, or waitTimeout expired.</exception>
-    private static async Task RunInThreadWithLock(Action action, TimeSpan? waitTimeout = null, CancellationToken cancelToken = default)
+    private async Task RunInThreadWithLock(Action action, TimeSpan? waitTimeout = null, CancellationToken cancelToken = default)
     {
         // Wait to acquire PyRunning lock
         await PyRunning.WaitAsync(cancelToken).ConfigureAwait(false);
@@ -143,7 +151,7 @@ internal static class PyRunner
     /// Evaluate Python expression and return its value as a string
     /// </summary>
     /// <param name="expression"></param>
-    public static async Task<string> Eval(string expression)
+    public async Task<string> Eval(string expression)
     {
         return await Eval<string>(expression);
     }
@@ -152,7 +160,7 @@ internal static class PyRunner
     /// Evaluate Python expression and return its value
     /// </summary>
     /// <param name="expression"></param>
-    public static Task<T> Eval<T>(string expression)
+    public Task<T> Eval<T>(string expression)
     {
         return RunInThreadWithLock(() =>
         {
@@ -165,7 +173,7 @@ internal static class PyRunner
     /// Execute Python code without returning a value
     /// </summary>
     /// <param name="code"></param>
-    public static Task Exec(string code)
+    public Task Exec(string code)
     {
         return RunInThreadWithLock(() =>
         {
@@ -176,7 +184,7 @@ internal static class PyRunner
     /// <summary>
     /// Return the Python version as a PyVersionInfo struct
     /// </summary>
-    public static async Task<PyVersionInfo> GetVersionInfo()
+    public async Task<PyVersionInfo> GetVersionInfo()
     {
         var version = await RunInThreadWithLock(() =>
         {
diff --git a/StabilityMatrix/ViewModels/InstallerViewModel.cs b/StabilityMatrix/ViewModels/InstallerViewModel.cs
index e6fa972a..a60d0f89 100644
--- a/StabilityMatrix/ViewModels/InstallerViewModel.cs
+++ b/StabilityMatrix/ViewModels/InstallerViewModel.cs
@@ -19,6 +19,7 @@ public partial class InstallerViewModel : ObservableObject
 {
     private readonly ILogger<InstallerViewModel> logger;
     private readonly ISettingsManager settingsManager;
+    private readonly IPyRunner pyRunner;
 
     [ObservableProperty]
     [NotifyPropertyChangedFor(nameof(ProgressBarVisibility))]
@@ -47,10 +48,11 @@ public partial class InstallerViewModel : ObservableObject
     private bool updateAvailable;
 
     public InstallerViewModel(ILogger<InstallerViewModel> logger, ISettingsManager settingsManager,
-        IPackageFactory packageFactory)
+        IPackageFactory packageFactory, IPyRunner pyRunner)
     {
         this.logger = logger;
         this.settingsManager = settingsManager;
+        this.pyRunner = pyRunner;
 
         ProgressText = "shrug";
         InstallButtonText = "Install";
@@ -120,16 +122,16 @@ public partial class InstallerViewModel : ObservableObject
         await InstallPackage();
 
         ProgressText = "Installing dependencies...";
-        await PyRunner.Initialize();
+        await pyRunner.Initialize();
         if (!settingsManager.Settings.HasInstalledPip)
         {
-            await PyRunner.SetupPip();
+            await pyRunner.SetupPip();
             settingsManager.SetHasInstalledPip(true);
         }
 
         if (!settingsManager.Settings.HasInstalledVenv)
         {
-            await PyRunner.InstallPackage("virtualenv");
+            await pyRunner.InstallPackage("virtualenv");
             settingsManager.SetHasInstalledVenv(true);
         }
 
diff --git a/StabilityMatrix/ViewModels/LaunchViewModel.cs b/StabilityMatrix/ViewModels/LaunchViewModel.cs
index c8772713..7f352bbc 100644
--- a/StabilityMatrix/ViewModels/LaunchViewModel.cs
+++ b/StabilityMatrix/ViewModels/LaunchViewModel.cs
@@ -22,6 +22,8 @@ public partial class LaunchViewModel : ObservableObject
     private readonly IContentDialogService contentDialogService;
     private readonly LaunchOptionsDialogViewModel launchOptionsDialogViewModel;
     private readonly ILogger<LaunchViewModel> logger;
+    private readonly IPyRunner pyRunner;
+    
     private BasePackage? runningPackage;
     private bool clearingPackages = false;
 
@@ -61,8 +63,10 @@ public partial class LaunchViewModel : ObservableObject
         IPackageFactory packageFactory,
         IContentDialogService contentDialogService,
         LaunchOptionsDialogViewModel launchOptionsDialogViewModel,
-        ILogger<LaunchViewModel> logger)
+        ILogger<LaunchViewModel> logger,
+        IPyRunner pyRunner)
     {
+        this.pyRunner = pyRunner;
         this.contentDialogService = contentDialogService;
         this.launchOptionsDialogViewModel = launchOptionsDialogViewModel;
         this.logger = logger;
@@ -92,7 +96,7 @@ public partial class LaunchViewModel : ObservableObject
             return;
         }
 
-        await PyRunner.Initialize();
+        await pyRunner.Initialize();
 
         // Get path from package
         var packagePath = SelectedPackage.Path!;
@@ -117,14 +121,14 @@ public partial class LaunchViewModel : ObservableObject
         var name = SelectedPackage?.Name;
         if (name == null)
         {
-            Debug.WriteLine($"Selected package is null");
+            logger.LogWarning($"Selected package is null");
             return;
         }
 
         var package = packageFactory.FindPackageByName(name);
         if (package == null)
         {
-            Debug.WriteLine($"Package {name} not found");
+            logger.LogWarning("Package {Name} not found", name);
             return;
         }
 
@@ -152,16 +156,20 @@ public partial class LaunchViewModel : ObservableObject
     public void OnLoaded()
     {
         LoadPackages();
-        if (InstalledPackages.Any() && settingsManager.Settings.ActiveInstalledPackage != null)
+        lock (InstalledPackages)
         {
-            SelectedPackage =
-                InstalledPackages[
-                    InstalledPackages.IndexOf(InstalledPackages.FirstOrDefault(x =>
-                        x.Id == settingsManager.Settings.ActiveInstalledPackage))];
-        }
-        else if (InstalledPackages.Any())
-        {
-            SelectedPackage = InstalledPackages[0];
+            // Skip if no packages
+            if (!InstalledPackages.Any())
+            {
+                logger.LogTrace($"No packages for {nameof(LaunchViewModel)}");
+                return;
+            }
+            var activePackageId = settingsManager.Settings.ActiveInstalledPackage;
+            if (activePackageId != null)
+            {
+                SelectedPackage = InstalledPackages.FirstOrDefault(
+                    x => x.Id == activePackageId) ?? InstalledPackages[0];
+            }
         }
     }
 
diff --git a/StabilityMatrix/ViewModels/SettingsViewModel.cs b/StabilityMatrix/ViewModels/SettingsViewModel.cs
index f858cb50..403029e9 100644
--- a/StabilityMatrix/ViewModels/SettingsViewModel.cs
+++ b/StabilityMatrix/ViewModels/SettingsViewModel.cs
@@ -17,6 +17,7 @@ namespace StabilityMatrix.ViewModels;
 public partial class SettingsViewModel : ObservableObject
 {
     private readonly ISettingsManager settingsManager;
+    private readonly IPyRunner pyRunner;
 
     public ObservableCollection<string> AvailableThemes => new()
     {
@@ -27,11 +28,12 @@ public partial class SettingsViewModel : ObservableObject
     private readonly IContentDialogService contentDialogService;
     private readonly IA3WebApi a3WebApi;
 
-    public SettingsViewModel(ISettingsManager settingsManager, IContentDialogService contentDialogService, IA3WebApi a3WebApi)
+    public SettingsViewModel(ISettingsManager settingsManager, IContentDialogService contentDialogService, IA3WebApi a3WebApi, IPyRunner pyRunner)
     {
         this.settingsManager = settingsManager;
         this.contentDialogService = contentDialogService;
         this.a3WebApi = a3WebApi;
+        this.pyRunner = pyRunner;
         SelectedTheme = settingsManager.Settings.Theme ?? "Dark";
     }
 
@@ -66,8 +68,8 @@ public partial class SettingsViewModel : ObservableObject
     public AsyncRelayCommand PythonVersionCommand => new(async () =>
     {
         // Get python version
-        await PyRunner.Initialize();
-        var result = await PyRunner.GetVersionInfo();
+        await pyRunner.Initialize();
+        var result = await pyRunner.GetVersionInfo();
         // Show dialog box
         var dialog = contentDialogService.CreateDialog();
         dialog.Title = "Python version info";
@@ -78,9 +80,7 @@ public partial class SettingsViewModel : ObservableObject
 
     public RelayCommand AddInstallationCommand => new(() =>
     {
-        var initialDirectory = $"{Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData)}\\StabilityMatrix\\Packages";
         // Show dialog box to choose a folder
-
         var dialog = new VistaFolderBrowserDialog
         {
             Description = "Select a folder",

From f8216b71324f1526b2a73877ce8439fbe3fed7a7 Mon Sep 17 00:00:00 2001
From: Ionite <dev@ionite.io>
Date: Sun, 28 May 2023 18:10:58 -0400
Subject: [PATCH 06/15] Remove duplicate buttons and labels

---
 StabilityMatrix/LaunchOptionsDialog.xaml | 33 +-----------------------
 1 file changed, 1 insertion(+), 32 deletions(-)

diff --git a/StabilityMatrix/LaunchOptionsDialog.xaml b/StabilityMatrix/LaunchOptionsDialog.xaml
index c14fcdfa..3f2baea1 100644
--- a/StabilityMatrix/LaunchOptionsDialog.xaml
+++ b/StabilityMatrix/LaunchOptionsDialog.xaml
@@ -48,43 +48,12 @@
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />
-            <RowDefinition Height="*" />
-            <RowDefinition Height="Auto" />
         </Grid.RowDefinitions>
-        <TextBlock
-            Margin="8"
-            Text="Launch Options"
-            TextWrapping="WrapWithOverflow" />
-        <ScrollViewer Grid.Row="1" HorizontalScrollBarVisibility="Auto">
+        <ScrollViewer HorizontalScrollBarVisibility="Auto">
             <StackPanel Orientation="Vertical">
                 <!--  Options cards  -->
                 <ItemsControl ItemTemplate="{StaticResource LaunchOptionCardDataTemplate}" ItemsSource="{Binding Cards}" />
             </StackPanel>
         </ScrollViewer>
-        <StackPanel
-            Grid.Row="2"
-            Margin="16,8,16,8"
-            VerticalAlignment="Bottom">
-
-            <UniformGrid Columns="2" VerticalAlignment="Bottom">
-                <ui:Button
-                    Appearance="Primary"
-                    Content="Save"
-                    FontSize="16"
-                    HorizontalAlignment="Stretch"
-                    Margin="8"
-                    VerticalAlignment="Center"
-                    VerticalContentAlignment="Center" />
-                <ui:Button
-                    Appearance="Secondary"
-                    Content="Cancel"
-                    FontSize="16"
-                    HorizontalAlignment="Stretch"
-                    Margin="8"
-                    VerticalAlignment="Center"
-                    VerticalContentAlignment="Center" />
-            </UniformGrid>
-
-        </StackPanel>
     </Grid>
 </ui:ContentDialog>

From 7505c591e2ed5cb8e8b4751b8210522009aba295 Mon Sep 17 00:00:00 2001
From: Ionite <dev@ionite.io>
Date: Sun, 28 May 2023 18:13:18 -0400
Subject: [PATCH 07/15] Update SettingsViewModel.cs

---
 StabilityMatrix/ViewModels/SettingsViewModel.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/StabilityMatrix/ViewModels/SettingsViewModel.cs b/StabilityMatrix/ViewModels/SettingsViewModel.cs
index 403029e9..f04f1aaa 100644
--- a/StabilityMatrix/ViewModels/SettingsViewModel.cs
+++ b/StabilityMatrix/ViewModels/SettingsViewModel.cs
@@ -37,7 +37,7 @@ public partial class SettingsViewModel : ObservableObject
         SelectedTheme = settingsManager.Settings.Theme ?? "Dark";
     }
 
-    [ObservableProperty] 
+    [ObservableProperty]
     private string selectedTheme;
     
     partial void OnSelectedThemeChanged(string value)

From 27a37cfbca2ad5648e3a903487831e20d4858a29 Mon Sep 17 00:00:00 2001
From: Ionite <dev@ionite.io>
Date: Sun, 28 May 2023 20:03:43 -0400
Subject: [PATCH 08/15] Add error handling snackbar

---
 .../StabilityMatrix.Tests.csproj              |  1 +
 StabilityMatrix/App.xaml.cs                   |  3 +
 StabilityMatrix/Helper/DialogErrorHandler.cs  | 61 +++++++++++++++++++
 StabilityMatrix/Helper/IDialogErrorHandler.cs | 19 ++++++
 StabilityMatrix/MainWindow.xaml               | 12 ++--
 StabilityMatrix/MainWindow.xaml.cs            |  3 +-
 StabilityMatrix/StabilityMatrix.csproj        |  1 +
 .../ViewModels/SettingsViewModel.cs           | 21 ++++---
 .../ViewModels/SnackbarViewModel.cs           | 32 ++++++++++
 9 files changed, 141 insertions(+), 12 deletions(-)
 create mode 100644 StabilityMatrix/Helper/DialogErrorHandler.cs
 create mode 100644 StabilityMatrix/Helper/IDialogErrorHandler.cs
 create mode 100644 StabilityMatrix/ViewModels/SnackbarViewModel.cs

diff --git a/StabilityMatrix.Tests/StabilityMatrix.Tests.csproj b/StabilityMatrix.Tests/StabilityMatrix.Tests.csproj
index 96ae6f5c..9c1214e0 100644
--- a/StabilityMatrix.Tests/StabilityMatrix.Tests.csproj
+++ b/StabilityMatrix.Tests/StabilityMatrix.Tests.csproj
@@ -10,6 +10,7 @@
     </PropertyGroup>
 
     <ItemGroup>
+        <PackageReference Include="DotNext" Version="4.12.0" />
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
         <PackageReference Include="Moq" Version="4.18.4" />
         <PackageReference Include="MSTest.TestAdapter" Version="2.2.10" />
diff --git a/StabilityMatrix/App.xaml.cs b/StabilityMatrix/App.xaml.cs
index 4dcc6170..ee78e97a 100644
--- a/StabilityMatrix/App.xaml.cs
+++ b/StabilityMatrix/App.xaml.cs
@@ -39,6 +39,7 @@ namespace StabilityMatrix
             var serviceCollection = new ServiceCollection();
             serviceCollection.AddSingleton<IPageService, PageService>();
             serviceCollection.AddSingleton<IContentDialogService, ContentDialogService>();
+            serviceCollection.AddSingleton<ISnackbarService, SnackbarService>();
             serviceCollection.AddSingleton<IPackageFactory, PackageFactory>();
             serviceCollection.AddSingleton<IPyRunner, PyRunner>();
             
@@ -49,6 +50,7 @@ namespace StabilityMatrix
             serviceCollection.AddTransient<TextToImagePage>();
             
             serviceCollection.AddTransient<MainWindowViewModel>();
+            serviceCollection.AddTransient<SnackbarViewModel>();
             serviceCollection.AddSingleton<SettingsViewModel>();
             serviceCollection.AddSingleton<LaunchViewModel>();
             serviceCollection.AddSingleton<InstallerViewModel>();
@@ -59,6 +61,7 @@ namespace StabilityMatrix
             serviceCollection.AddSingleton<BasePackage, DankDiffusion>();
             serviceCollection.AddSingleton<ISnackbarService, SnackbarService>();
             serviceCollection.AddSingleton<ISettingsManager, SettingsManager>();
+            serviceCollection.AddSingleton<IDialogErrorHandler, DialogErrorHandler>();
             
             var jsonOptions = new JsonSerializerOptions
             {
diff --git a/StabilityMatrix/Helper/DialogErrorHandler.cs b/StabilityMatrix/Helper/DialogErrorHandler.cs
new file mode 100644
index 00000000..6fd4e8cc
--- /dev/null
+++ b/StabilityMatrix/Helper/DialogErrorHandler.cs
@@ -0,0 +1,61 @@
+using System.Threading.Tasks;
+using System;
+using DotNext;
+using Microsoft.Extensions.Logging;
+using StabilityMatrix.ViewModels;
+using Wpf.Ui.Common;
+using Wpf.Ui.Contracts;
+using Wpf.Ui.Controls;
+using Wpf.Ui.Controls.IconElements;
+
+namespace StabilityMatrix.Helper;
+
+/// <summary>
+/// Generic recoverable error handler using content dialogs.
+/// </summary>
+public class DialogErrorHandler : IDialogErrorHandler
+{
+    private readonly IContentDialogService contentDialogService;
+    private readonly ISnackbarService snackbarService;
+    private readonly SnackbarViewModel snackbarViewModel;
+    
+    public DialogErrorHandler(IContentDialogService contentDialogService, ISnackbarService snackbarService, SnackbarViewModel snackbarViewModel)
+    {
+        this.contentDialogService = contentDialogService;
+        this.snackbarService = snackbarService;
+        this.snackbarViewModel = snackbarViewModel;
+    }
+    
+    /// <summary>
+    /// Shows a generic error snackbar with the given message.
+    /// </summary>
+    public Task ShowSnackbarAsync(string message, LogLevel level = LogLevel.Error, int timeoutMilliseconds = 5000)
+    {
+        snackbarViewModel.SnackbarAppearance = level switch
+        {
+            LogLevel.Error => ControlAppearance.Danger,
+            LogLevel.Warning => ControlAppearance.Caution,
+            LogLevel.Information => ControlAppearance.Info,
+            _ => ControlAppearance.Secondary
+        };
+        // snackbarService.Timeout = timeoutMilliseconds;
+        var icon = new SymbolIcon(SymbolRegular.ErrorCircle24);
+        return snackbarService.ShowAsync("Error", message, icon, snackbarViewModel.SnackbarAppearance);
+    }
+    
+    /// <summary>
+    /// Attempt to run the given action, showing a generic error snackbar if it fails.
+    /// </summary>
+    public async Task<Result<T>> TryAsync<T>(Task<T> task, string message, LogLevel level = LogLevel.Error, int timeoutMilliseconds = 5000)
+    {
+        try
+        {
+            return await task;
+        }
+        catch (Exception e)
+        {
+            await ShowSnackbarAsync(message, level, timeoutMilliseconds);
+            return Result.FromException<T>(e);
+        }
+    }
+}
diff --git a/StabilityMatrix/Helper/IDialogErrorHandler.cs b/StabilityMatrix/Helper/IDialogErrorHandler.cs
new file mode 100644
index 00000000..2e05767d
--- /dev/null
+++ b/StabilityMatrix/Helper/IDialogErrorHandler.cs
@@ -0,0 +1,19 @@
+using System;
+using System.Threading.Tasks;
+using DotNext;
+using Microsoft.Extensions.Logging;
+
+namespace StabilityMatrix.Helper;
+
+public interface IDialogErrorHandler
+{
+    /// <summary>
+    /// Shows a generic error snackbar with the given message.
+    /// </summary>
+    Task ShowSnackbarAsync(string message, LogLevel level = LogLevel.Error, int timeoutSeconds = 5);
+
+    /// <summary>
+    /// Attempt to run the given action, showing a generic error snackbar if it fails.
+    /// </summary>
+    Task<Result<T>> TryAsync<T>(Task<T> task, string message, LogLevel level = LogLevel.Error, int timeoutSeconds = 5);
+}
diff --git a/StabilityMatrix/MainWindow.xaml b/StabilityMatrix/MainWindow.xaml
index 52b8d2b5..5e9a452a 100644
--- a/StabilityMatrix/MainWindow.xaml
+++ b/StabilityMatrix/MainWindow.xaml
@@ -19,12 +19,11 @@
     xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
     xmlns:viewModels="clr-namespace:StabilityMatrix.ViewModels"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    
+
     <ui:FluentWindow.TaskbarItemInfo>
-        <TaskbarItemInfo ProgressState="{Binding ProgressState}" 
-                         ProgressValue="{Binding ProgressValue}"/>
+        <TaskbarItemInfo ProgressState="{Binding ProgressState}" ProgressValue="{Binding ProgressValue}" />
     </ui:FluentWindow.TaskbarItemInfo>
-    
+
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />
@@ -75,6 +74,11 @@
                         </ui:NavigationViewItem.Icon>
                     </ui:NavigationViewItem>
                 </ui:NavigationView.FooterMenuItems>
+                <ui:NavigationView.ContentOverlay>
+                    <Grid>
+                        <ui:Snackbar x:Name="RootSnackbar" />
+                    </Grid>
+                </ui:NavigationView.ContentOverlay>
             </ui:NavigationView>
         </Grid>
         <Grid Grid.Row="1" Visibility="{Binding SimpleModeVisibility, FallbackValue=Hidden}">
diff --git a/StabilityMatrix/MainWindow.xaml.cs b/StabilityMatrix/MainWindow.xaml.cs
index ab5c8117..56a0180b 100644
--- a/StabilityMatrix/MainWindow.xaml.cs
+++ b/StabilityMatrix/MainWindow.xaml.cs
@@ -19,7 +19,7 @@ namespace StabilityMatrix
         private readonly ISettingsManager settingsManager;
 
         public MainWindow(IPageService pageService, IContentDialogService contentDialogService,
-            MainWindowViewModel mainWindowViewModel, ISettingsManager settingsManager)
+            MainWindowViewModel mainWindowViewModel, ISettingsManager settingsManager, ISnackbarService snackbarService)
         {
             InitializeComponent();
 
@@ -31,6 +31,7 @@ namespace StabilityMatrix
             RootNavigation.Navigating += (_, _) => Debug.WriteLine("Navigating");
             RootNavigation.SetPageService(pageService);
 
+            snackbarService.SetSnackbarControl(RootSnackbar);
             contentDialogService.SetContentPresenter(RootContentDialog);
             
             EventManager.Instance.PageChangeRequested += InstanceOnPageChangeRequested;
diff --git a/StabilityMatrix/StabilityMatrix.csproj b/StabilityMatrix/StabilityMatrix.csproj
index 97eadea2..8e4d7bd9 100644
--- a/StabilityMatrix/StabilityMatrix.csproj
+++ b/StabilityMatrix/StabilityMatrix.csproj
@@ -12,6 +12,7 @@
 
   <ItemGroup>
     <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.0" />
+    <PackageReference Include="DotNext" Version="4.12.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.1" />
     <PackageReference Include="Microsoft.Toolkit.Uwp.Notifications" Version="7.1.3" />
     <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.39" />
diff --git a/StabilityMatrix/ViewModels/SettingsViewModel.cs b/StabilityMatrix/ViewModels/SettingsViewModel.cs
index f04f1aaa..cdabe328 100644
--- a/StabilityMatrix/ViewModels/SettingsViewModel.cs
+++ b/StabilityMatrix/ViewModels/SettingsViewModel.cs
@@ -5,6 +5,7 @@ using System.Threading.Tasks;
 using System.Windows;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
+using DotNext.Threading.Tasks;
 using Ookii.Dialogs.Wpf;
 using StabilityMatrix.Api;
 using StabilityMatrix.Helper;
@@ -18,6 +19,7 @@ public partial class SettingsViewModel : ObservableObject
 {
     private readonly ISettingsManager settingsManager;
     private readonly IPyRunner pyRunner;
+    private readonly IDialogErrorHandler dialogErrorHandler;
 
     public ObservableCollection<string> AvailableThemes => new()
     {
@@ -28,10 +30,11 @@ public partial class SettingsViewModel : ObservableObject
     private readonly IContentDialogService contentDialogService;
     private readonly IA3WebApi a3WebApi;
 
-    public SettingsViewModel(ISettingsManager settingsManager, IContentDialogService contentDialogService, IA3WebApi a3WebApi, IPyRunner pyRunner)
+    public SettingsViewModel(ISettingsManager settingsManager, IContentDialogService contentDialogService, IA3WebApi a3WebApi, IPyRunner pyRunner, IDialogErrorHandler dialogErrorHandler)
     {
         this.settingsManager = settingsManager;
         this.contentDialogService = contentDialogService;
+        this.dialogErrorHandler = dialogErrorHandler;
         this.a3WebApi = a3WebApi;
         this.pyRunner = pyRunner;
         SelectedTheme = settingsManager.Settings.Theme ?? "Dark";
@@ -107,12 +110,16 @@ public partial class SettingsViewModel : ObservableObject
     [RelayCommand]
     private async Task PingWebApi()
     {
-        var result = await a3WebApi.GetPing();
-        var dialog = contentDialogService.CreateDialog();
-        dialog.Title = "Web API ping";
-        dialog.Content = result;
-        dialog.PrimaryButtonText = "Ok";
-        await dialog.ShowAsync();
+        var result = await dialogErrorHandler.TryAsync(a3WebApi.GetPing(), "Failed to ping web api");
+
+        if (result.IsSuccessful)
+        {
+            var dialog = contentDialogService.CreateDialog();
+            dialog.Title = "Web API ping";
+            dialog.Content = result;
+            dialog.PrimaryButtonText = "Ok";
+            await dialog.ShowAsync();
+        }
     }
 
     public async Task OnLoaded()
diff --git a/StabilityMatrix/ViewModels/SnackbarViewModel.cs b/StabilityMatrix/ViewModels/SnackbarViewModel.cs
new file mode 100644
index 00000000..eb92d0f9
--- /dev/null
+++ b/StabilityMatrix/ViewModels/SnackbarViewModel.cs
@@ -0,0 +1,32 @@
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
+using Wpf.Ui.Common;
+using Wpf.Ui.Contracts;
+using Wpf.Ui.Controls;
+using Wpf.Ui.Controls.IconElements;
+using SymbolIcon = Wpf.Ui.Controls.IconElements.SymbolIcon;
+
+namespace StabilityMatrix.ViewModels;
+
+public partial class SnackbarViewModel : ObservableObject
+{
+    private readonly ISnackbarService snackbarService;
+
+    [ObservableProperty]
+    private ControlAppearance snackbarAppearance = ControlAppearance.Secondary;
+
+    [ObservableProperty]
+    private int snackbarTimeout = 2000;
+
+    public SnackbarViewModel(ISnackbarService snackbarService)
+    {
+        this.snackbarService = snackbarService;
+    }
+
+    [RelayCommand]
+    private void OnOpenSnackbar(object sender)
+    {
+        snackbarService.Timeout = SnackbarTimeout;
+        snackbarService.Show("Some title.", "Some message.", new SymbolIcon(SymbolRegular.Fluent24), SnackbarAppearance);
+    }
+}

From 5ce801dfb590646055d52061aefb9125f72d1148 Mon Sep 17 00:00:00 2001
From: JT <mohnjiles@gmail.com>
Date: Sun, 28 May 2023 17:14:53 -0700
Subject: [PATCH 09/15] Added TaskResult class to handle TryAsync ourselves

---
 StabilityMatrix/Helper/DialogErrorHandler.cs    | 14 ++++++++++----
 StabilityMatrix/Helper/IDialogErrorHandler.cs   |  7 +++----
 StabilityMatrix/Models/TaskResult.cs            | 11 +++++++++++
 StabilityMatrix/StabilityMatrix.csproj          |  1 -
 StabilityMatrix/ViewModels/SettingsViewModel.cs |  1 -
 5 files changed, 24 insertions(+), 10 deletions(-)
 create mode 100644 StabilityMatrix/Models/TaskResult.cs

diff --git a/StabilityMatrix/Helper/DialogErrorHandler.cs b/StabilityMatrix/Helper/DialogErrorHandler.cs
index 6fd4e8cc..a74c905d 100644
--- a/StabilityMatrix/Helper/DialogErrorHandler.cs
+++ b/StabilityMatrix/Helper/DialogErrorHandler.cs
@@ -1,7 +1,7 @@
 using System.Threading.Tasks;
 using System;
-using DotNext;
 using Microsoft.Extensions.Logging;
+using StabilityMatrix.Models;
 using StabilityMatrix.ViewModels;
 using Wpf.Ui.Common;
 using Wpf.Ui.Contracts;
@@ -46,16 +46,22 @@ public class DialogErrorHandler : IDialogErrorHandler
     /// <summary>
     /// Attempt to run the given action, showing a generic error snackbar if it fails.
     /// </summary>
-    public async Task<Result<T>> TryAsync<T>(Task<T> task, string message, LogLevel level = LogLevel.Error, int timeoutMilliseconds = 5000)
+    public async Task<TaskResult<T>> TryAsync<T>(Task<T> task, string message, LogLevel level = LogLevel.Error, int timeoutMilliseconds = 5000)
     {
         try
         {
-            return await task;
+            return new TaskResult<T>
+            {
+                Result = await task
+            };
         }
         catch (Exception e)
         {
             await ShowSnackbarAsync(message, level, timeoutMilliseconds);
-            return Result.FromException<T>(e);
+            return new TaskResult<T>
+            {
+                Exception = e
+            };
         }
     }
 }
diff --git a/StabilityMatrix/Helper/IDialogErrorHandler.cs b/StabilityMatrix/Helper/IDialogErrorHandler.cs
index 2e05767d..5ac437d4 100644
--- a/StabilityMatrix/Helper/IDialogErrorHandler.cs
+++ b/StabilityMatrix/Helper/IDialogErrorHandler.cs
@@ -1,7 +1,6 @@
-using System;
-using System.Threading.Tasks;
-using DotNext;
+using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
+using StabilityMatrix.Models;
 
 namespace StabilityMatrix.Helper;
 
@@ -15,5 +14,5 @@ public interface IDialogErrorHandler
     /// <summary>
     /// Attempt to run the given action, showing a generic error snackbar if it fails.
     /// </summary>
-    Task<Result<T>> TryAsync<T>(Task<T> task, string message, LogLevel level = LogLevel.Error, int timeoutSeconds = 5);
+    Task<TaskResult<T>> TryAsync<T>(Task<T> task, string message, LogLevel level = LogLevel.Error, int timeoutSeconds = 5);
 }
diff --git a/StabilityMatrix/Models/TaskResult.cs b/StabilityMatrix/Models/TaskResult.cs
new file mode 100644
index 00000000..15349346
--- /dev/null
+++ b/StabilityMatrix/Models/TaskResult.cs
@@ -0,0 +1,11 @@
+using System;
+
+namespace StabilityMatrix.Models;
+
+public class TaskResult<T>
+{
+    public T? Result { get; set; }
+    public Exception? Exception { get; set; }
+
+    public bool IsSuccessful => Exception is null && Result != null;
+}
diff --git a/StabilityMatrix/StabilityMatrix.csproj b/StabilityMatrix/StabilityMatrix.csproj
index 8e4d7bd9..97eadea2 100644
--- a/StabilityMatrix/StabilityMatrix.csproj
+++ b/StabilityMatrix/StabilityMatrix.csproj
@@ -12,7 +12,6 @@
 
   <ItemGroup>
     <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.0" />
-    <PackageReference Include="DotNext" Version="4.12.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.1" />
     <PackageReference Include="Microsoft.Toolkit.Uwp.Notifications" Version="7.1.3" />
     <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.39" />
diff --git a/StabilityMatrix/ViewModels/SettingsViewModel.cs b/StabilityMatrix/ViewModels/SettingsViewModel.cs
index cdabe328..9e32be07 100644
--- a/StabilityMatrix/ViewModels/SettingsViewModel.cs
+++ b/StabilityMatrix/ViewModels/SettingsViewModel.cs
@@ -5,7 +5,6 @@ using System.Threading.Tasks;
 using System.Windows;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
-using DotNext.Threading.Tasks;
 using Ookii.Dialogs.Wpf;
 using StabilityMatrix.Api;
 using StabilityMatrix.Helper;

From 2c6742b98a35c5b56e84b835ae8163767d1a20de Mon Sep 17 00:00:00 2001
From: Ionite <dev@ionite.io>
Date: Sun, 28 May 2023 20:28:10 -0400
Subject: [PATCH 10/15] Change ShowSnackbarAsync to void

---
 StabilityMatrix/Helper/DialogErrorHandler.cs  | 6 +++---
 StabilityMatrix/Helper/IDialogErrorHandler.cs | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/StabilityMatrix/Helper/DialogErrorHandler.cs b/StabilityMatrix/Helper/DialogErrorHandler.cs
index a74c905d..6648ea5d 100644
--- a/StabilityMatrix/Helper/DialogErrorHandler.cs
+++ b/StabilityMatrix/Helper/DialogErrorHandler.cs
@@ -29,7 +29,7 @@ public class DialogErrorHandler : IDialogErrorHandler
     /// <summary>
     /// Shows a generic error snackbar with the given message.
     /// </summary>
-    public Task ShowSnackbarAsync(string message, LogLevel level = LogLevel.Error, int timeoutMilliseconds = 5000)
+    public void ShowSnackbarAsync(string message, LogLevel level = LogLevel.Error, int timeoutMilliseconds = 5000)
     {
         snackbarViewModel.SnackbarAppearance = level switch
         {
@@ -40,7 +40,7 @@ public class DialogErrorHandler : IDialogErrorHandler
         };
         // snackbarService.Timeout = timeoutMilliseconds;
         var icon = new SymbolIcon(SymbolRegular.ErrorCircle24);
-        return snackbarService.ShowAsync("Error", message, icon, snackbarViewModel.SnackbarAppearance);
+        snackbarService.ShowAsync("Error", message, icon, snackbarViewModel.SnackbarAppearance);
     }
     
     /// <summary>
@@ -57,7 +57,7 @@ public class DialogErrorHandler : IDialogErrorHandler
         }
         catch (Exception e)
         {
-            await ShowSnackbarAsync(message, level, timeoutMilliseconds);
+            ShowSnackbarAsync(message, level, timeoutMilliseconds);
             return new TaskResult<T>
             {
                 Exception = e
diff --git a/StabilityMatrix/Helper/IDialogErrorHandler.cs b/StabilityMatrix/Helper/IDialogErrorHandler.cs
index 5ac437d4..b2c6a43c 100644
--- a/StabilityMatrix/Helper/IDialogErrorHandler.cs
+++ b/StabilityMatrix/Helper/IDialogErrorHandler.cs
@@ -9,7 +9,7 @@ public interface IDialogErrorHandler
     /// <summary>
     /// Shows a generic error snackbar with the given message.
     /// </summary>
-    Task ShowSnackbarAsync(string message, LogLevel level = LogLevel.Error, int timeoutSeconds = 5);
+    void ShowSnackbarAsync(string message, LogLevel level = LogLevel.Error, int timeoutSeconds = 5);
 
     /// <summary>
     /// Attempt to run the given action, showing a generic error snackbar if it fails.

From cdc2ffd149aaa4db06c5f1d92e6204f7953f2dea Mon Sep 17 00:00:00 2001
From: Ionite <dev@ionite.io>
Date: Sun, 28 May 2023 20:34:05 -0400
Subject: [PATCH 11/15] Fix DialogErrorHandler interface defaults

---
 StabilityMatrix/Helper/DialogErrorHandler.cs  | 2 +-
 StabilityMatrix/Helper/IDialogErrorHandler.cs | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/StabilityMatrix/Helper/DialogErrorHandler.cs b/StabilityMatrix/Helper/DialogErrorHandler.cs
index 6648ea5d..bcda1d3f 100644
--- a/StabilityMatrix/Helper/DialogErrorHandler.cs
+++ b/StabilityMatrix/Helper/DialogErrorHandler.cs
@@ -38,7 +38,7 @@ public class DialogErrorHandler : IDialogErrorHandler
             LogLevel.Information => ControlAppearance.Info,
             _ => ControlAppearance.Secondary
         };
-        // snackbarService.Timeout = timeoutMilliseconds;
+        snackbarService.Timeout = timeoutMilliseconds;
         var icon = new SymbolIcon(SymbolRegular.ErrorCircle24);
         snackbarService.ShowAsync("Error", message, icon, snackbarViewModel.SnackbarAppearance);
     }
diff --git a/StabilityMatrix/Helper/IDialogErrorHandler.cs b/StabilityMatrix/Helper/IDialogErrorHandler.cs
index b2c6a43c..6769a35e 100644
--- a/StabilityMatrix/Helper/IDialogErrorHandler.cs
+++ b/StabilityMatrix/Helper/IDialogErrorHandler.cs
@@ -9,10 +9,10 @@ public interface IDialogErrorHandler
     /// <summary>
     /// Shows a generic error snackbar with the given message.
     /// </summary>
-    void ShowSnackbarAsync(string message, LogLevel level = LogLevel.Error, int timeoutSeconds = 5);
+    void ShowSnackbarAsync(string message, LogLevel level = LogLevel.Error, int timeoutMilliseconds = 5000);
 
     /// <summary>
     /// Attempt to run the given action, showing a generic error snackbar if it fails.
     /// </summary>
-    Task<TaskResult<T>> TryAsync<T>(Task<T> task, string message, LogLevel level = LogLevel.Error, int timeoutSeconds = 5);
+    Task<TaskResult<T>> TryAsync<T>(Task<T> task, string message, LogLevel level = LogLevel.Error, int timeoutMilliseconds = 5000);
 }

From 21076bebcbbb2d7e3435712cca633c7aad4a5aa7 Mon Sep 17 00:00:00 2001
From: JT <mohnjiles@gmail.com>
Date: Sun, 28 May 2023 18:04:44 -0700
Subject: [PATCH 12/15] safety :tm:

---
 .../EventManagerTests.cs}                     |  2 +-
 StabilityMatrix/App.xaml.cs                   |  3 ++-
 StabilityMatrix/Helper/DialogFactory.cs       | 21 +++++++++++++++++++
 StabilityMatrix/Helper/IDialogFactory.cs      |  6 ++++++
 StabilityMatrix/LaunchOptionsDialog.xaml      |  1 +
 StabilityMatrix/LaunchOptionsDialog.xaml.cs   | 15 +++++++++++--
 .../LaunchOptionsDialogViewModel.cs           |  4 ++--
 StabilityMatrix/ViewModels/LaunchViewModel.cs | 18 ++++++++--------
 8 files changed, 55 insertions(+), 15 deletions(-)
 rename StabilityMatrix.Tests/{UnitTest1.cs => Helper/EventManagerTests.cs} (83%)
 create mode 100644 StabilityMatrix/Helper/DialogFactory.cs
 create mode 100644 StabilityMatrix/Helper/IDialogFactory.cs

diff --git a/StabilityMatrix.Tests/UnitTest1.cs b/StabilityMatrix.Tests/Helper/EventManagerTests.cs
similarity index 83%
rename from StabilityMatrix.Tests/UnitTest1.cs
rename to StabilityMatrix.Tests/Helper/EventManagerTests.cs
index e0c0b6c8..a6901304 100644
--- a/StabilityMatrix.Tests/UnitTest1.cs
+++ b/StabilityMatrix.Tests/Helper/EventManagerTests.cs
@@ -3,7 +3,7 @@ using StabilityMatrix;
 namespace StabilityMatrix.Tests;
 
 [TestClass]
-public class UnitTest1
+public class EventManagerTests
 {
     [TestMethod]
     public void TestMethod1()
diff --git a/StabilityMatrix/App.xaml.cs b/StabilityMatrix/App.xaml.cs
index ee78e97a..5ce170cd 100644
--- a/StabilityMatrix/App.xaml.cs
+++ b/StabilityMatrix/App.xaml.cs
@@ -42,6 +42,7 @@ namespace StabilityMatrix
             serviceCollection.AddSingleton<ISnackbarService, SnackbarService>();
             serviceCollection.AddSingleton<IPackageFactory, PackageFactory>();
             serviceCollection.AddSingleton<IPyRunner, PyRunner>();
+            serviceCollection.AddTransient<IDialogFactory, DialogFactory>();
             
             serviceCollection.AddTransient<MainWindow>();
             serviceCollection.AddTransient<SettingsPage>();
@@ -51,11 +52,11 @@ namespace StabilityMatrix
             
             serviceCollection.AddTransient<MainWindowViewModel>();
             serviceCollection.AddTransient<SnackbarViewModel>();
+            serviceCollection.AddTransient<LaunchOptionsDialogViewModel>();
             serviceCollection.AddSingleton<SettingsViewModel>();
             serviceCollection.AddSingleton<LaunchViewModel>();
             serviceCollection.AddSingleton<InstallerViewModel>();
             serviceCollection.AddSingleton<TextToImageViewModel>();
-            serviceCollection.AddSingleton<LaunchOptionsDialogViewModel>();
             
             serviceCollection.AddSingleton<BasePackage, A3WebUI>();
             serviceCollection.AddSingleton<BasePackage, DankDiffusion>();
diff --git a/StabilityMatrix/Helper/DialogFactory.cs b/StabilityMatrix/Helper/DialogFactory.cs
new file mode 100644
index 00000000..a9b4ae2d
--- /dev/null
+++ b/StabilityMatrix/Helper/DialogFactory.cs
@@ -0,0 +1,21 @@
+using StabilityMatrix.ViewModels;
+using Wpf.Ui.Contracts;
+
+namespace StabilityMatrix.Helper;
+
+public class DialogFactory : IDialogFactory
+{
+    private readonly IContentDialogService contentDialogService;
+    private readonly LaunchOptionsDialogViewModel launchOptionsDialogViewModel;
+
+    public DialogFactory(IContentDialogService contentDialogService, LaunchOptionsDialogViewModel launchOptionsDialogViewModel)
+    {
+        this.contentDialogService = contentDialogService;
+        this.launchOptionsDialogViewModel = launchOptionsDialogViewModel;
+    }
+    
+    public LaunchOptionsDialog CreateLaunchOptionsDialog()
+    {
+        return new LaunchOptionsDialog(contentDialogService, launchOptionsDialogViewModel);
+    }
+}
diff --git a/StabilityMatrix/Helper/IDialogFactory.cs b/StabilityMatrix/Helper/IDialogFactory.cs
new file mode 100644
index 00000000..951f88f4
--- /dev/null
+++ b/StabilityMatrix/Helper/IDialogFactory.cs
@@ -0,0 +1,6 @@
+namespace StabilityMatrix.Helper;
+
+public interface IDialogFactory
+{
+    LaunchOptionsDialog CreateLaunchOptionsDialog();
+}
\ No newline at end of file
diff --git a/StabilityMatrix/LaunchOptionsDialog.xaml b/StabilityMatrix/LaunchOptionsDialog.xaml
index 3f2baea1..d5d8d0ac 100644
--- a/StabilityMatrix/LaunchOptionsDialog.xaml
+++ b/StabilityMatrix/LaunchOptionsDialog.xaml
@@ -9,6 +9,7 @@
     ui:Design.Background="{DynamicResource ApplicationBackgroundBrush}"
     ui:Design.Foreground="{DynamicResource TextFillColorPrimaryBrush}"
     x:Class="StabilityMatrix.LaunchOptionsDialog"
+    Loaded="LaunchOptionsDialog_OnLoaded"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="clr-namespace:StabilityMatrix"
diff --git a/StabilityMatrix/LaunchOptionsDialog.xaml.cs b/StabilityMatrix/LaunchOptionsDialog.xaml.cs
index 7bd9f457..d6c3817f 100644
--- a/StabilityMatrix/LaunchOptionsDialog.xaml.cs
+++ b/StabilityMatrix/LaunchOptionsDialog.xaml.cs
@@ -1,13 +1,24 @@
-using System.Windows.Controls;
+using System.Windows;
+using System.Windows.Controls;
 using StabilityMatrix.ViewModels;
+using Wpf.Ui.Contracts;
 using Wpf.Ui.Controls.ContentDialogControl;
 
 namespace StabilityMatrix;
 
 public partial class LaunchOptionsDialog : ContentDialog
 {
-    public LaunchOptionsDialog(ContentPresenter contentPresenter) : base(contentPresenter)
+    private readonly LaunchOptionsDialogViewModel viewModel;
+
+    public LaunchOptionsDialog(IContentDialogService dialogService, LaunchOptionsDialogViewModel viewModel) : base(
+        dialogService.GetContentPresenter())
     {
+        this.viewModel = viewModel;
         InitializeComponent();
     }
+
+    private void LaunchOptionsDialog_OnLoaded(object sender, RoutedEventArgs e)
+    {
+        viewModel.OnLoad(); 
+    }
 }
diff --git a/StabilityMatrix/ViewModels/LaunchOptionsDialogViewModel.cs b/StabilityMatrix/ViewModels/LaunchOptionsDialogViewModel.cs
index ffdfe57b..21fe7200 100644
--- a/StabilityMatrix/ViewModels/LaunchOptionsDialogViewModel.cs
+++ b/StabilityMatrix/ViewModels/LaunchOptionsDialogViewModel.cs
@@ -12,11 +12,11 @@ public partial class LaunchOptionsDialogViewModel : ObservableObject
 
     [ObservableProperty]
     private BasePackage? selectedPackage;
-
+    
     public void OnLoad()
     {
         // Populate Cards using the selected package
         
-
+        
     }
 }
diff --git a/StabilityMatrix/ViewModels/LaunchViewModel.cs b/StabilityMatrix/ViewModels/LaunchViewModel.cs
index 7f352bbc..de41da5d 100644
--- a/StabilityMatrix/ViewModels/LaunchViewModel.cs
+++ b/StabilityMatrix/ViewModels/LaunchViewModel.cs
@@ -23,7 +23,8 @@ public partial class LaunchViewModel : ObservableObject
     private readonly LaunchOptionsDialogViewModel launchOptionsDialogViewModel;
     private readonly ILogger<LaunchViewModel> logger;
     private readonly IPyRunner pyRunner;
-    
+    private readonly IDialogFactory dialogFactory;
+
     private BasePackage? runningPackage;
     private bool clearingPackages = false;
 
@@ -64,9 +65,11 @@ public partial class LaunchViewModel : ObservableObject
         IContentDialogService contentDialogService,
         LaunchOptionsDialogViewModel launchOptionsDialogViewModel,
         ILogger<LaunchViewModel> logger,
-        IPyRunner pyRunner)
+        IPyRunner pyRunner,
+        IDialogFactory dialogFactory)
     {
         this.pyRunner = pyRunner;
+        this.dialogFactory = dialogFactory;
         this.contentDialogService = contentDialogService;
         this.launchOptionsDialogViewModel = launchOptionsDialogViewModel;
         this.logger = logger;
@@ -135,13 +138,10 @@ public partial class LaunchViewModel : ObservableObject
         vm.SelectedPackage = package;
 
         // Open a config page
-        var dialog = new LaunchOptionsDialog(contentDialogService.GetContentPresenter())
-        {
-            DataContext = vm,
-            IsPrimaryButtonEnabled = true,
-            PrimaryButtonText = "Save",
-            CloseButtonText = "Cancel",
-        };
+        var dialog = dialogFactory.CreateLaunchOptionsDialog();
+        dialog.IsPrimaryButtonEnabled = true;
+        dialog.PrimaryButtonText = "Save";
+        dialog.CloseButtonText = "Cancel";
         await dialog.ShowAsync();
     }
 

From d1da40519e6b808db4c1745f1bfa3921f9685af4 Mon Sep 17 00:00:00 2001
From: Ionite <dev@ionite.io>
Date: Sun, 28 May 2023 21:32:24 -0400
Subject: [PATCH 13/15] Added launch options dialog cards

---
 StabilityMatrix/Helper/DialogFactory.cs       | 10 +++++++--
 StabilityMatrix/Helper/IDialogFactory.cs      |  8 ++++---
 StabilityMatrix/LaunchOptionsDialog.xaml      |  9 ++++----
 StabilityMatrix/LaunchOptionsDialog.xaml.cs   |  1 +
 StabilityMatrix/Models/LaunchOptionCard.cs    |  6 +++++
 .../LaunchOptionsDialogViewModel.cs           | 22 ++++++++++++++++++-
 StabilityMatrix/ViewModels/LaunchViewModel.cs |  5 +----
 7 files changed, 46 insertions(+), 15 deletions(-)

diff --git a/StabilityMatrix/Helper/DialogFactory.cs b/StabilityMatrix/Helper/DialogFactory.cs
index a9b4ae2d..bd3eb55c 100644
--- a/StabilityMatrix/Helper/DialogFactory.cs
+++ b/StabilityMatrix/Helper/DialogFactory.cs
@@ -1,4 +1,6 @@
-using StabilityMatrix.ViewModels;
+using System;
+using StabilityMatrix.Models;
+using StabilityMatrix.ViewModels;
 using Wpf.Ui.Contracts;
 
 namespace StabilityMatrix.Helper;
@@ -7,6 +9,8 @@ public class DialogFactory : IDialogFactory
 {
     private readonly IContentDialogService contentDialogService;
     private readonly LaunchOptionsDialogViewModel launchOptionsDialogViewModel;
+    private readonly LaunchViewModel launchViewModel;
+    private readonly IPackageFactory packageFactory;
 
     public DialogFactory(IContentDialogService contentDialogService, LaunchOptionsDialogViewModel launchOptionsDialogViewModel)
     {
@@ -14,8 +18,10 @@ public class DialogFactory : IDialogFactory
         this.launchOptionsDialogViewModel = launchOptionsDialogViewModel;
     }
     
-    public LaunchOptionsDialog CreateLaunchOptionsDialog()
+    public LaunchOptionsDialog CreateLaunchOptionsDialog(BasePackage selectedPackage)
     {
+        launchOptionsDialogViewModel.SelectedPackage = selectedPackage;
+        
         return new LaunchOptionsDialog(contentDialogService, launchOptionsDialogViewModel);
     }
 }
diff --git a/StabilityMatrix/Helper/IDialogFactory.cs b/StabilityMatrix/Helper/IDialogFactory.cs
index 951f88f4..acdcfb61 100644
--- a/StabilityMatrix/Helper/IDialogFactory.cs
+++ b/StabilityMatrix/Helper/IDialogFactory.cs
@@ -1,6 +1,8 @@
-namespace StabilityMatrix.Helper;
+using StabilityMatrix.Models;
+
+namespace StabilityMatrix.Helper;
 
 public interface IDialogFactory
 {
-    LaunchOptionsDialog CreateLaunchOptionsDialog();
-}
\ No newline at end of file
+    LaunchOptionsDialog CreateLaunchOptionsDialog(BasePackage selectedPackage);
+}
diff --git a/StabilityMatrix/LaunchOptionsDialog.xaml b/StabilityMatrix/LaunchOptionsDialog.xaml
index d5d8d0ac..6b800f2d 100644
--- a/StabilityMatrix/LaunchOptionsDialog.xaml
+++ b/StabilityMatrix/LaunchOptionsDialog.xaml
@@ -1,5 +1,8 @@
 <ui:ContentDialog
     CloseButtonText="Close"
+    DialogHeight="600"
+    DialogWidth="600"
+    Loaded="LaunchOptionsDialog_OnLoaded"
     Title="Launch Options"
     d:DataContext="{d:DesignInstance Type=viewModels:LaunchOptionsDialogViewModel,
                                      IsDesignTimeCreatable=True}"
@@ -9,7 +12,6 @@
     ui:Design.Background="{DynamicResource ApplicationBackgroundBrush}"
     ui:Design.Foreground="{DynamicResource TextFillColorPrimaryBrush}"
     x:Class="StabilityMatrix.LaunchOptionsDialog"
-    Loaded="LaunchOptionsDialog_OnLoaded"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="clr-namespace:StabilityMatrix"
@@ -46,10 +48,7 @@
         </DataTemplate>
     </ui:ContentDialog.Resources>
 
-    <Grid>
-        <Grid.RowDefinitions>
-            <RowDefinition Height="Auto" />
-        </Grid.RowDefinitions>
+    <Grid Height="700" Width="700">
         <ScrollViewer HorizontalScrollBarVisibility="Auto">
             <StackPanel Orientation="Vertical">
                 <!--  Options cards  -->
diff --git a/StabilityMatrix/LaunchOptionsDialog.xaml.cs b/StabilityMatrix/LaunchOptionsDialog.xaml.cs
index d6c3817f..6efbbf38 100644
--- a/StabilityMatrix/LaunchOptionsDialog.xaml.cs
+++ b/StabilityMatrix/LaunchOptionsDialog.xaml.cs
@@ -15,6 +15,7 @@ public partial class LaunchOptionsDialog : ContentDialog
     {
         this.viewModel = viewModel;
         InitializeComponent();
+        DataContext = viewModel;
     }
 
     private void LaunchOptionsDialog_OnLoaded(object sender, RoutedEventArgs e)
diff --git a/StabilityMatrix/Models/LaunchOptionCard.cs b/StabilityMatrix/Models/LaunchOptionCard.cs
index 3401d891..96eb2e11 100644
--- a/StabilityMatrix/Models/LaunchOptionCard.cs
+++ b/StabilityMatrix/Models/LaunchOptionCard.cs
@@ -8,4 +8,10 @@ public class LaunchOptionCard
     public string Title { get; set; }
     public string? Description { get; set; }
     public List<string> Options { get; set; }
+    
+    public LaunchOptionCard(LaunchOptionDefinition definition)
+    {
+        Title = definition.Name;
+        Options = definition.Options;
+    }
 }
diff --git a/StabilityMatrix/ViewModels/LaunchOptionsDialogViewModel.cs b/StabilityMatrix/ViewModels/LaunchOptionsDialogViewModel.cs
index 21fe7200..6b3668e3 100644
--- a/StabilityMatrix/ViewModels/LaunchOptionsDialogViewModel.cs
+++ b/StabilityMatrix/ViewModels/LaunchOptionsDialogViewModel.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.ObjectModel;
+using System.Diagnostics;
 using CommunityToolkit.Mvvm.ComponentModel;
 using StabilityMatrix.Helper;
 using StabilityMatrix.Models;
@@ -15,8 +16,27 @@ public partial class LaunchOptionsDialogViewModel : ObservableObject
     
     public void OnLoad()
     {
+        Debug.WriteLine("In LaunchOptions OnLoad");
         // Populate Cards using the selected package
+        Cards.Clear();
+
+        var package = SelectedPackage;
+        if (package == null)
+        {
+            Debug.WriteLine($"selectedPackage is null");
+            return;
+        }
+        var definitions = package.LaunchOptions;
+        if (definitions == null)
+        {
+            Debug.WriteLine($"definitions is null");
+            return;
+        }
         
-        
+        foreach (var definition in definitions)
+        {
+            Cards.Add(new LaunchOptionCard(definition));
+        }
+        Debug.WriteLine($"Cards: {Cards.Count}");
     }
 }
diff --git a/StabilityMatrix/ViewModels/LaunchViewModel.cs b/StabilityMatrix/ViewModels/LaunchViewModel.cs
index de41da5d..28cdf103 100644
--- a/StabilityMatrix/ViewModels/LaunchViewModel.cs
+++ b/StabilityMatrix/ViewModels/LaunchViewModel.cs
@@ -120,7 +120,6 @@ public partial class LaunchViewModel : ObservableObject
     [RelayCommand]
     public async Task ConfigAsync()
     {
-        var vm = launchOptionsDialogViewModel;
         var name = SelectedPackage?.Name;
         if (name == null)
         {
@@ -135,10 +134,8 @@ public partial class LaunchViewModel : ObservableObject
             return;
         }
 
-        vm.SelectedPackage = package;
-
         // Open a config page
-        var dialog = dialogFactory.CreateLaunchOptionsDialog();
+        var dialog = dialogFactory.CreateLaunchOptionsDialog(package);
         dialog.IsPrimaryButtonEnabled = true;
         dialog.PrimaryButtonText = "Save";
         dialog.CloseButtonText = "Cancel";

From a198916f97fd6d5e68018ef258ec5c8de20a4530 Mon Sep 17 00:00:00 2001
From: JT <mohnjiles@gmail.com>
Date: Sun, 28 May 2023 18:38:49 -0700
Subject: [PATCH 14/15] tests :3

---
 .../Helper/EventManagerTests.cs               | 38 ++++++++++++++--
 .../Helper/PackageFactoryTests.cs             | 43 +++++++++++++++++++
 StabilityMatrix/Helper/DialogErrorHandler.cs  |  9 ++--
 3 files changed, 81 insertions(+), 9 deletions(-)
 create mode 100644 StabilityMatrix.Tests/Helper/PackageFactoryTests.cs

diff --git a/StabilityMatrix.Tests/Helper/EventManagerTests.cs b/StabilityMatrix.Tests/Helper/EventManagerTests.cs
index a6901304..d51fb541 100644
--- a/StabilityMatrix.Tests/Helper/EventManagerTests.cs
+++ b/StabilityMatrix.Tests/Helper/EventManagerTests.cs
@@ -1,13 +1,43 @@
-using StabilityMatrix;
+using StabilityMatrix.Helper;
 
-namespace StabilityMatrix.Tests;
+namespace StabilityMatrix.Tests.Helper;
 
 [TestClass]
 public class EventManagerTests
 {
+    private EventManager eventManager; 
+        
+    [TestInitialize]
+    public void TestInitialize()
+    {
+        eventManager = EventManager.Instance;
+    }
+    
+    [TestMethod]
+    public void GlobalProgressChanged_ShouldBeInvoked()
+    {
+        // Arrange
+        var progress = 0;
+        eventManager.GlobalProgressChanged += (sender, args) => progress = args;
+        
+        // Act
+        eventManager.OnGlobalProgressChanged(100);
+        
+        // Assert
+        Assert.AreEqual(100, progress);
+    }
+    
     [TestMethod]
-    public void TestMethod1()
+    public void RequestPageChange_ShouldBeInvoked()
     {
-        Assert.IsTrue(true);
+        // Arrange
+        var pageType = typeof(object);
+        eventManager.PageChangeRequested += (sender, args) => pageType = args;
+        
+        // Act
+        eventManager.RequestPageChange(typeof(int));
+        
+        // Assert
+        Assert.AreEqual(typeof(int), pageType);
     }
 }
diff --git a/StabilityMatrix.Tests/Helper/PackageFactoryTests.cs b/StabilityMatrix.Tests/Helper/PackageFactoryTests.cs
new file mode 100644
index 00000000..062bf24e
--- /dev/null
+++ b/StabilityMatrix.Tests/Helper/PackageFactoryTests.cs
@@ -0,0 +1,43 @@
+using StabilityMatrix.Helper;
+using StabilityMatrix.Models;
+using StabilityMatrix.Models.Packages;
+
+namespace StabilityMatrix.Tests.Helper;
+
+[TestClass]
+public class PackageFactoryTests
+{
+    private PackageFactory packageFactory;
+    private IEnumerable<BasePackage> fakeBasePackages;
+    
+    [TestInitialize]
+    public void Setup()
+    {
+        fakeBasePackages = new List<BasePackage>
+        {
+            new DankDiffusion()
+        };
+        packageFactory = new PackageFactory(fakeBasePackages);
+    }
+    
+    [TestMethod]
+    public void GetAllAvailablePackages_ReturnsAllPackages()
+    {
+        var result = packageFactory.GetAllAvailablePackages();
+        Assert.AreEqual(1, result.Count());
+    }
+    
+    [TestMethod]
+    public void FindPackageByName_ReturnsPackage()
+    {
+        var result = packageFactory.FindPackageByName("dank-diffusion");
+        Assert.IsNotNull(result);
+    }
+    
+    [TestMethod]
+    public void FindPackageByName_ReturnsNull()
+    {
+        var result = packageFactory.FindPackageByName("not-a-package");
+        Assert.IsNull(result);
+    }
+}
diff --git a/StabilityMatrix/Helper/DialogErrorHandler.cs b/StabilityMatrix/Helper/DialogErrorHandler.cs
index bcda1d3f..db594bda 100644
--- a/StabilityMatrix/Helper/DialogErrorHandler.cs
+++ b/StabilityMatrix/Helper/DialogErrorHandler.cs
@@ -1,5 +1,6 @@
 using System.Threading.Tasks;
 using System;
+using System.Windows.Threading;
 using Microsoft.Extensions.Logging;
 using StabilityMatrix.Models;
 using StabilityMatrix.ViewModels;
@@ -15,17 +16,15 @@ namespace StabilityMatrix.Helper;
 /// </summary>
 public class DialogErrorHandler : IDialogErrorHandler
 {
-    private readonly IContentDialogService contentDialogService;
     private readonly ISnackbarService snackbarService;
     private readonly SnackbarViewModel snackbarViewModel;
-    
-    public DialogErrorHandler(IContentDialogService contentDialogService, ISnackbarService snackbarService, SnackbarViewModel snackbarViewModel)
+
+    public DialogErrorHandler(ISnackbarService snackbarService, SnackbarViewModel snackbarViewModel)
     {
-        this.contentDialogService = contentDialogService;
         this.snackbarService = snackbarService;
         this.snackbarViewModel = snackbarViewModel;
     }
-    
+
     /// <summary>
     /// Shows a generic error snackbar with the given message.
     /// </summary>

From e5188a4fa9044cd5c220f45fc1ff438d60d199f0 Mon Sep 17 00:00:00 2001
From: Ionite <dev@ionite.io>
Date: Mon, 29 May 2023 00:32:47 -0400
Subject: [PATCH 15/15] Launch options save / load to user settings

---
 StabilityMatrix/Helper/DialogFactory.cs       | 17 ++++--
 StabilityMatrix/Helper/IDialogFactory.cs      |  2 +-
 StabilityMatrix/Helper/ISettingsManager.cs    |  6 +-
 StabilityMatrix/Helper/SettingsManager.cs     | 19 +++++++
 StabilityMatrix/LaunchOptionsDialog.xaml      |  2 +-
 StabilityMatrix/LaunchOptionsDialog.xaml.cs   |  6 +-
 StabilityMatrix/Models/InstalledPackage.cs    |  3 +-
 StabilityMatrix/Models/LaunchOption.cs        | 10 ++++
 StabilityMatrix/Models/LaunchOptionCard.cs    | 11 +++-
 .../LaunchOptionsDialogViewModel.cs           | 56 ++++++++++++-------
 StabilityMatrix/ViewModels/LaunchViewModel.cs | 17 ++++--
 11 files changed, 112 insertions(+), 37 deletions(-)
 create mode 100644 StabilityMatrix/Models/LaunchOption.cs

diff --git a/StabilityMatrix/Helper/DialogFactory.cs b/StabilityMatrix/Helper/DialogFactory.cs
index bd3eb55c..b3fe51ba 100644
--- a/StabilityMatrix/Helper/DialogFactory.cs
+++ b/StabilityMatrix/Helper/DialogFactory.cs
@@ -9,19 +9,26 @@ public class DialogFactory : IDialogFactory
 {
     private readonly IContentDialogService contentDialogService;
     private readonly LaunchOptionsDialogViewModel launchOptionsDialogViewModel;
-    private readonly LaunchViewModel launchViewModel;
-    private readonly IPackageFactory packageFactory;
+    private readonly ISettingsManager settingsManager;
 
-    public DialogFactory(IContentDialogService contentDialogService, LaunchOptionsDialogViewModel launchOptionsDialogViewModel)
+    public DialogFactory(IContentDialogService contentDialogService, LaunchOptionsDialogViewModel launchOptionsDialogViewModel, ISettingsManager settingsManager)
     {
         this.contentDialogService = contentDialogService;
         this.launchOptionsDialogViewModel = launchOptionsDialogViewModel;
+        this.settingsManager = settingsManager;
     }
     
-    public LaunchOptionsDialog CreateLaunchOptionsDialog(BasePackage selectedPackage)
+    public LaunchOptionsDialog CreateLaunchOptionsDialog(BasePackage selectedPackage, InstalledPackage installedPackage)
     {
+        var definitions = selectedPackage.LaunchOptions;
         launchOptionsDialogViewModel.SelectedPackage = selectedPackage;
-        
+        launchOptionsDialogViewModel.Cards.Clear();
+        // Create cards
+        launchOptionsDialogViewModel.CardsFromDefinitions(definitions);
+        // Load user settings
+        var userLaunchArgs = settingsManager.GetLaunchArgs(installedPackage.Id);
+        launchOptionsDialogViewModel.LoadFromLaunchArgs(userLaunchArgs);
+
         return new LaunchOptionsDialog(contentDialogService, launchOptionsDialogViewModel);
     }
 }
diff --git a/StabilityMatrix/Helper/IDialogFactory.cs b/StabilityMatrix/Helper/IDialogFactory.cs
index acdcfb61..bbeb00bc 100644
--- a/StabilityMatrix/Helper/IDialogFactory.cs
+++ b/StabilityMatrix/Helper/IDialogFactory.cs
@@ -4,5 +4,5 @@ namespace StabilityMatrix.Helper;
 
 public interface IDialogFactory
 {
-    LaunchOptionsDialog CreateLaunchOptionsDialog(BasePackage selectedPackage);
+    LaunchOptionsDialog CreateLaunchOptionsDialog(BasePackage selectedPackage, InstalledPackage installedPackage);
 }
diff --git a/StabilityMatrix/Helper/ISettingsManager.cs b/StabilityMatrix/Helper/ISettingsManager.cs
index c342c0c6..05c526c7 100644
--- a/StabilityMatrix/Helper/ISettingsManager.cs
+++ b/StabilityMatrix/Helper/ISettingsManager.cs
@@ -1,4 +1,6 @@
-using StabilityMatrix.Models;
+using System;
+using System.Collections.Generic;
+using StabilityMatrix.Models;
 
 namespace StabilityMatrix.Helper;
 
@@ -12,4 +14,6 @@ public interface ISettingsManager
     void SetHasInstalledVenv(bool hasInstalledVenv);
     void SetNavExpanded(bool navExpanded);
     void UpdatePackageVersionNumber(string packageName, string newVersion);
+    List<string> GetLaunchArgs(Guid packageId);
+    void SaveLaunchArgs(Guid packageId, List<string> launchArgs);
 }
diff --git a/StabilityMatrix/Helper/SettingsManager.cs b/StabilityMatrix/Helper/SettingsManager.cs
index 7d4dcf2c..e3bfb5a9 100644
--- a/StabilityMatrix/Helper/SettingsManager.cs
+++ b/StabilityMatrix/Helper/SettingsManager.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Text.Json;
@@ -86,6 +87,24 @@ public class SettingsManager : ISettingsManager
         package.PackageVersion = newVersion;
         SaveSettings();
     }
+    
+    public List<string> GetLaunchArgs(Guid packageId)
+    {
+        var packageData = Settings.InstalledPackages.FirstOrDefault(x => x.Id == packageId);
+        return packageData?.LaunchArgs ?? new List<string>();
+    }
+    
+    public void SaveLaunchArgs(Guid packageId, List<string> launchArgs)
+    {
+        var packageData = Settings.InstalledPackages.FirstOrDefault(x => x.Id == packageId);
+        if (packageData == null)
+        {
+            return;
+        }
+        
+        packageData.LaunchArgs = launchArgs;
+        SaveSettings();
+    }
 
     private void LoadSettings()
     {
diff --git a/StabilityMatrix/LaunchOptionsDialog.xaml b/StabilityMatrix/LaunchOptionsDialog.xaml
index 6b800f2d..7e125230 100644
--- a/StabilityMatrix/LaunchOptionsDialog.xaml
+++ b/StabilityMatrix/LaunchOptionsDialog.xaml
@@ -38,7 +38,7 @@
                         <ItemsControl ItemsSource="{Binding Options}">
                             <ItemsControl.ItemTemplate>
                                 <DataTemplate>
-                                    <CheckBox Content="{Binding}" />
+                                    <CheckBox Content="{Binding Name}" IsChecked="{Binding Selected}" />
                                 </DataTemplate>
                             </ItemsControl.ItemTemplate>
                         </ItemsControl>
diff --git a/StabilityMatrix/LaunchOptionsDialog.xaml.cs b/StabilityMatrix/LaunchOptionsDialog.xaml.cs
index 6efbbf38..afafecd7 100644
--- a/StabilityMatrix/LaunchOptionsDialog.xaml.cs
+++ b/StabilityMatrix/LaunchOptionsDialog.xaml.cs
@@ -1,5 +1,7 @@
-using System.Windows;
+using System.Collections.Generic;
+using System.Windows;
 using System.Windows.Controls;
+using System.Windows.Documents;
 using StabilityMatrix.ViewModels;
 using Wpf.Ui.Contracts;
 using Wpf.Ui.Controls.ContentDialogControl;
@@ -10,6 +12,8 @@ public partial class LaunchOptionsDialog : ContentDialog
 {
     private readonly LaunchOptionsDialogViewModel viewModel;
 
+    public List<string> AsLaunchArgs() => viewModel.AsLaunchArgs();
+
     public LaunchOptionsDialog(IContentDialogService dialogService, LaunchOptionsDialogViewModel viewModel) : base(
         dialogService.GetContentPresenter())
     {
diff --git a/StabilityMatrix/Models/InstalledPackage.cs b/StabilityMatrix/Models/InstalledPackage.cs
index 98232020..1d4d50c6 100644
--- a/StabilityMatrix/Models/InstalledPackage.cs
+++ b/StabilityMatrix/Models/InstalledPackage.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Windows.Documents;
 
 namespace StabilityMatrix.Models;
 
@@ -20,5 +19,5 @@ public class InstalledPackage
     // Install path
     public string? Path { get; set; }
     public string? LaunchCommand { get; set; }
-    public HashSet<string>? LaunchArgs { get; set; }
+    public List<string>? LaunchArgs { get; set; }
 }
diff --git a/StabilityMatrix/Models/LaunchOption.cs b/StabilityMatrix/Models/LaunchOption.cs
new file mode 100644
index 00000000..df58b5d7
--- /dev/null
+++ b/StabilityMatrix/Models/LaunchOption.cs
@@ -0,0 +1,10 @@
+using CommunityToolkit.Mvvm.ComponentModel;
+
+namespace StabilityMatrix.Models;
+
+public partial class LaunchOption : ObservableObject
+{
+    public string Name { get; set; }
+
+    [ObservableProperty] private bool selected = false;
+}
diff --git a/StabilityMatrix/Models/LaunchOptionCard.cs b/StabilityMatrix/Models/LaunchOptionCard.cs
index 96eb2e11..40a34252 100644
--- a/StabilityMatrix/Models/LaunchOptionCard.cs
+++ b/StabilityMatrix/Models/LaunchOptionCard.cs
@@ -1,5 +1,8 @@
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.Windows.Documents;
+using ABI.Windows.Data.Xml.Dom;
+using StabilityMatrix.Helper;
 
 namespace StabilityMatrix.Models;
 
@@ -7,11 +10,15 @@ public class LaunchOptionCard
 {
     public string Title { get; set; }
     public string? Description { get; set; }
-    public List<string> Options { get; set; }
+    public ObservableCollection<LaunchOption> Options { get; set; } = new();
     
     public LaunchOptionCard(LaunchOptionDefinition definition)
     {
         Title = definition.Name;
-        Options = definition.Options;
+        foreach (var optionName in definition.Options)
+        {
+            var option = new LaunchOption {Name = optionName};
+            Options.Add(option);
+        }
     }
 }
diff --git a/StabilityMatrix/ViewModels/LaunchOptionsDialogViewModel.cs b/StabilityMatrix/ViewModels/LaunchOptionsDialogViewModel.cs
index 6b3668e3..fe5f7448 100644
--- a/StabilityMatrix/ViewModels/LaunchOptionsDialogViewModel.cs
+++ b/StabilityMatrix/ViewModels/LaunchOptionsDialogViewModel.cs
@@ -1,8 +1,9 @@
 using System;
+using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Diagnostics;
+using System.Linq;
 using CommunityToolkit.Mvvm.ComponentModel;
-using StabilityMatrix.Helper;
 using StabilityMatrix.Models;
 
 namespace StabilityMatrix.ViewModels;
@@ -13,30 +14,45 @@ public partial class LaunchOptionsDialogViewModel : ObservableObject
 
     [ObservableProperty]
     private BasePackage? selectedPackage;
+
+    /// <summary>
+    /// Export the current cards options to a list of strings
+    /// </summary>
+    public List<string> AsLaunchArgs()
+    {
+        return (
+            from card in Cards from option in card.Options 
+            where option.Selected select option.Name).ToList();
+    }
     
-    public void OnLoad()
+    /// <summary>
+    /// Create cards using definitions
+    /// </summary>
+    public void CardsFromDefinitions(List<LaunchOptionDefinition> definitions)
     {
-        Debug.WriteLine("In LaunchOptions OnLoad");
-        // Populate Cards using the selected package
-        Cards.Clear();
-
-        var package = SelectedPackage;
-        if (package == null)
-        {
-            Debug.WriteLine($"selectedPackage is null");
-            return;
-        }
-        var definitions = package.LaunchOptions;
-        if (definitions == null)
-        {
-            Debug.WriteLine($"definitions is null");
-            return;
-        }
-        
         foreach (var definition in definitions)
         {
             Cards.Add(new LaunchOptionCard(definition));
         }
-        Debug.WriteLine($"Cards: {Cards.Count}");
+    }
+    
+    /// <summary>
+    /// Import the current cards options from a list of strings
+    /// </summary>
+    public void LoadFromLaunchArgs(IEnumerable<string> launchArgs)
+    {
+        var launchArgsSet = new HashSet<string>(launchArgs);
+        foreach (var card in Cards)
+        {
+            foreach (var option in card.Options)
+            {
+                option.Selected = launchArgsSet.Contains(option.Name);
+            }
+        }
+    }
+    
+    public void OnLoad()
+    {
+        Debug.WriteLine("In LaunchOptions OnLoad");
     }
 }
diff --git a/StabilityMatrix/ViewModels/LaunchViewModel.cs b/StabilityMatrix/ViewModels/LaunchViewModel.cs
index 28cdf103..d0d2b59d 100644
--- a/StabilityMatrix/ViewModels/LaunchViewModel.cs
+++ b/StabilityMatrix/ViewModels/LaunchViewModel.cs
@@ -12,6 +12,7 @@ using Microsoft.Toolkit.Uwp.Notifications;
 using StabilityMatrix.Helper;
 using StabilityMatrix.Models;
 using Wpf.Ui.Contracts;
+using Wpf.Ui.Controls.ContentDialogControl;
 
 namespace StabilityMatrix.ViewModels;
 
@@ -120,8 +121,9 @@ public partial class LaunchViewModel : ObservableObject
     [RelayCommand]
     public async Task ConfigAsync()
     {
-        var name = SelectedPackage?.Name;
-        if (name == null)
+        var activeInstall = SelectedPackage;
+        var name = activeInstall?.Name;
+        if (name == null || activeInstall == null)
         {
             logger.LogWarning($"Selected package is null");
             return;
@@ -135,11 +137,18 @@ public partial class LaunchViewModel : ObservableObject
         }
 
         // Open a config page
-        var dialog = dialogFactory.CreateLaunchOptionsDialog(package);
+        var dialog = dialogFactory.CreateLaunchOptionsDialog(package, activeInstall);
         dialog.IsPrimaryButtonEnabled = true;
         dialog.PrimaryButtonText = "Save";
         dialog.CloseButtonText = "Cancel";
-        await dialog.ShowAsync();
+        var result = await dialog.ShowAsync();
+        
+        if (result == ContentDialogResult.Primary)
+        {
+            // Save config
+            var args = dialog.AsLaunchArgs();
+            settingsManager.SaveLaunchArgs(activeInstall.Id, args);
+        }
     }
 
     private void RunningPackageOnStartupComplete(object? sender, string url)