From bf263f141b2f2f0ba54ca632cfb6ffd9460fb4b7 Mon Sep 17 00:00:00 2001
From: Ionite <dev@ionite.io>
Date: Sun, 16 Jul 2023 16:15:44 -0400
Subject: [PATCH] Nullability and using fixes

---
 .../Controls/BetterAdvancedImage.cs                |  1 +
 .../Controls/BetterContentDialog.cs                |  1 -
 .../Controls/FASymbolIconSource.cs                 |  1 -
 StabilityMatrix.Avalonia/Controls/ProgressRing.cs  | 14 +++++++-------
 .../Controls/RefreshBadge.axaml                    |  2 +-
 .../Controls/UserControlBase.cs                    |  4 +---
 .../Converters/LaunchOptionConverter.cs            |  4 ++--
 .../Converters/ValueConverterGroup.cs              |  5 +++--
 .../DesignData/MockHttpClientFactory.cs            |  5 +++--
 .../DesignData/MockLiteDbContext.cs                |  8 ++++----
 StabilityMatrix.Avalonia/DialogHelper.cs           |  7 +------
 .../Models/ObservableDictionary.cs                 |  1 -
 StabilityMatrix.Avalonia/Program.cs                |  4 ++--
 .../Services/INotificationService.cs               |  3 +--
 .../Services/NavigationService.cs                  |  3 ++-
 .../Services/ServiceManager.cs                     |  2 ++
 StabilityMatrix.Avalonia/Styles/ProgressRing.axaml |  4 ++--
 .../ViewModels/CheckpointBrowserViewModel.cs       |  3 +--
 .../ViewModels/CheckpointFile.cs                   |  3 ++-
 .../ViewModels/CheckpointsPageViewModel.cs         |  4 +---
 .../ViewModels/Dialogs/InstallerViewModel.cs       |  1 -
 .../ViewModels/Dialogs/LaunchOptionsViewModel.cs   |  3 ++-
 .../ViewModels/LaunchPageViewModel.cs              |  2 +-
 .../ViewModels/MainWindowViewModel.cs              |  2 --
 .../ViewModels/PageViewModelBase.cs                |  1 -
 .../ViewModels/ProgressManagerViewModel.cs         |  4 ----
 .../ViewModels/SettingsViewModel.cs                |  3 +--
 .../Views/CheckpointBrowserPage.axaml.cs           |  3 +--
 .../Views/CheckpointsPage.axaml                    |  2 --
 .../Views/Dialogs/InstallerDialog.axaml            |  3 ---
 .../Views/Dialogs/LaunchOptionsDialog.axaml        |  2 --
 .../Views/Dialogs/LaunchOptionsDialog.axaml.cs     |  3 +--
 .../Views/Dialogs/OneClickInstallDialog.axaml      |  1 -
 .../Views/Dialogs/OneClickInstallDialog.axaml.cs   |  3 +--
 .../Views/Dialogs/SelectDataDirectoryDialog.axaml  |  1 -
 .../Views/Dialogs/SelectModelVersionDialog.axaml   |  1 -
 .../Views/Dialogs/UpdateDialog.axaml               |  2 --
 .../Views/Dialogs/UpdateDialog.axaml.cs            |  3 +--
 StabilityMatrix.Avalonia/Views/MainWindow.axaml    |  2 --
 .../Views/ProgressManagerPage.axaml.cs             |  4 +---
 .../Helper/Factory/IPackageFactory.cs              |  2 +-
 .../Helper/Factory/PackageFactory.cs               |  5 +++--
 .../Models/Packages/BaseGitPackage.cs              |  8 +++-----
 .../Models/Packages/BasePackage.cs                 |  2 +-
 44 files changed, 53 insertions(+), 89 deletions(-)

diff --git a/StabilityMatrix.Avalonia/Controls/BetterAdvancedImage.cs b/StabilityMatrix.Avalonia/Controls/BetterAdvancedImage.cs
index 9e9c1545..8f5f4502 100644
--- a/StabilityMatrix.Avalonia/Controls/BetterAdvancedImage.cs
+++ b/StabilityMatrix.Avalonia/Controls/BetterAdvancedImage.cs
@@ -9,6 +9,7 @@ using Avalonia.Media;
 namespace StabilityMatrix.Avalonia.Controls;
 
 [SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
+[SuppressMessage("ReSharper", "UnusedMember.Local")]
 public class BetterAdvancedImage : AdvancedImage
 {
     #region Reflection Shenanigans to access private parent fields
diff --git a/StabilityMatrix.Avalonia/Controls/BetterContentDialog.cs b/StabilityMatrix.Avalonia/Controls/BetterContentDialog.cs
index bfbf1e4b..dd444ab3 100644
--- a/StabilityMatrix.Avalonia/Controls/BetterContentDialog.cs
+++ b/StabilityMatrix.Avalonia/Controls/BetterContentDialog.cs
@@ -5,7 +5,6 @@ using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.Primitives;
 using Avalonia.Interactivity;
-using Avalonia.Styling;
 using Avalonia.Threading;
 using FluentAvalonia.UI.Controls;
 using StabilityMatrix.Avalonia.ViewModels;
diff --git a/StabilityMatrix.Avalonia/Controls/FASymbolIconSource.cs b/StabilityMatrix.Avalonia/Controls/FASymbolIconSource.cs
index 84ff75ca..bc5c84e6 100644
--- a/StabilityMatrix.Avalonia/Controls/FASymbolIconSource.cs
+++ b/StabilityMatrix.Avalonia/Controls/FASymbolIconSource.cs
@@ -1,6 +1,5 @@
 using System;
 using System.ComponentModel;
-using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
 using Avalonia;
diff --git a/StabilityMatrix.Avalonia/Controls/ProgressRing.cs b/StabilityMatrix.Avalonia/Controls/ProgressRing.cs
index d7c1daf0..f1a5b56c 100644
--- a/StabilityMatrix.Avalonia/Controls/ProgressRing.cs
+++ b/StabilityMatrix.Avalonia/Controls/ProgressRing.cs
@@ -20,10 +20,10 @@ public class ProgressRing : RangeBase
         AvaloniaProperty.Register<ProgressRing, bool>(nameof(PreserveAspect), true);
 
     public static readonly StyledProperty<double> ValueAngleProperty =
-        AvaloniaProperty.Register<ProgressRing, double>(nameof(ValueAngle), 0);
+        AvaloniaProperty.Register<ProgressRing, double>(nameof(ValueAngle));
 
     public static readonly StyledProperty<double> StartAngleProperty =
-        AvaloniaProperty.Register<ProgressRing, double>(nameof(StartAngle), 0);
+        AvaloniaProperty.Register<ProgressRing, double>(nameof(StartAngle));
 
     public static readonly StyledProperty<double> EndAngleProperty =
         AvaloniaProperty.Register<ProgressRing, double>(nameof(EndAngle), 360);
@@ -105,26 +105,26 @@ public class ProgressRing : RangeBase
 
     private static void OnMinimumPropertyChanged(ProgressRing sender, AvaloniaPropertyChangedEventArgs e)
     {
-        sender.Minimum = (double)e.NewValue;
+        sender.Minimum = (double) e.NewValue!;
     }
 
     private static void OnMaximumPropertyChanged(ProgressRing sender, AvaloniaPropertyChangedEventArgs e)
     {
-        sender.Maximum = (double)e.NewValue;
+        sender.Maximum = (double) e.NewValue!;
     }
 
     private static void OnValuePropertyChanged(ProgressRing sender, AvaloniaPropertyChangedEventArgs e)
     {
-        sender.ValueAngle = ((double)e.NewValue - sender.Minimum) * (sender.EndAngle - sender.StartAngle) / (sender.Maximum - sender.Minimum);
+        sender.ValueAngle = ((double) e.NewValue! - sender.Minimum) * (sender.EndAngle - sender.StartAngle) / (sender.Maximum - sender.Minimum);
     }
 
     private static void OnStartAnglePropertyChanged(ProgressRing sender, AvaloniaPropertyChangedEventArgs e)
     {
-        sender.StartAngle = (double)e.NewValue;
+        sender.StartAngle = (double) e.NewValue!;
     }
 
     private static void OnEndAnglePropertyChanged(ProgressRing sender, AvaloniaPropertyChangedEventArgs e)
     {
-        sender.EndAngle = (double)e.NewValue;
+        sender.EndAngle = (double) e.NewValue!;
     }
 }
diff --git a/StabilityMatrix.Avalonia/Controls/RefreshBadge.axaml b/StabilityMatrix.Avalonia/Controls/RefreshBadge.axaml
index 4a83417a..0a286771 100644
--- a/StabilityMatrix.Avalonia/Controls/RefreshBadge.axaml
+++ b/StabilityMatrix.Avalonia/Controls/RefreshBadge.axaml
@@ -11,7 +11,7 @@
                           mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
                           x:Class="StabilityMatrix.Avalonia.Controls.RefreshBadge">
     <Grid>
-        <TextBlock Text="Test"></TextBlock>
+        <TextBlock Text="Test" />
         <Button
             BorderThickness="0"
             Command="{Binding RefreshCommand}"
diff --git a/StabilityMatrix.Avalonia/Controls/UserControlBase.cs b/StabilityMatrix.Avalonia/Controls/UserControlBase.cs
index 3ffafe3e..6bf56e15 100644
--- a/StabilityMatrix.Avalonia/Controls/UserControlBase.cs
+++ b/StabilityMatrix.Avalonia/Controls/UserControlBase.cs
@@ -1,6 +1,4 @@
-using System.Threading.Tasks;
-using AsyncAwaitBestPractices;
-using Avalonia.Controls;
+using Avalonia.Controls;
 using Avalonia.Interactivity;
 using Avalonia.Threading;
 using StabilityMatrix.Avalonia.ViewModels;
diff --git a/StabilityMatrix.Avalonia/Converters/LaunchOptionConverter.cs b/StabilityMatrix.Avalonia/Converters/LaunchOptionConverter.cs
index ceb8d6c0..ba48b904 100644
--- a/StabilityMatrix.Avalonia/Converters/LaunchOptionConverter.cs
+++ b/StabilityMatrix.Avalonia/Converters/LaunchOptionConverter.cs
@@ -24,7 +24,7 @@ public class LaunchOptionConverter : IValueConverter
             {
                 return null;
             }
-            return double.TryParse(value?.ToString(), out var doubleValue) ? doubleValue : 0;
+            return double.TryParse(value.ToString(), out var doubleValue) ? doubleValue : 0;
         }
         
         if (targetType == typeof(int?))
@@ -33,7 +33,7 @@ public class LaunchOptionConverter : IValueConverter
             {
                 return null;
             }
-            return int.TryParse(value?.ToString(), out var intValue) ? intValue : 0;
+            return int.TryParse(value.ToString(), out var intValue) ? intValue : 0;
         }
 
         throw new ArgumentException("Unsupported type");
diff --git a/StabilityMatrix.Avalonia/Converters/ValueConverterGroup.cs b/StabilityMatrix.Avalonia/Converters/ValueConverterGroup.cs
index 3abd61be..fdd0336c 100644
--- a/StabilityMatrix.Avalonia/Converters/ValueConverterGroup.cs
+++ b/StabilityMatrix.Avalonia/Converters/ValueConverterGroup.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Linq;
 using Avalonia.Data.Converters;
 
@@ -7,12 +8,12 @@ namespace StabilityMatrix.Avalonia.Converters;
 
 public class ValueConverterGroup : List<IValueConverter>, IValueConverter
 {
-    public object? Convert(object? value, Type targetType, object? parameter, System.Globalization.CultureInfo culture)
+    public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
     {
         return this.Aggregate(value, (current, converter) => converter.Convert(current, targetType, parameter, culture));
     }
 
-    public object ConvertBack(object? value, Type targetType, object? parameter, System.Globalization.CultureInfo culture)
+    public object ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
     {
         throw new NotImplementedException();
     }
diff --git a/StabilityMatrix.Avalonia/DesignData/MockHttpClientFactory.cs b/StabilityMatrix.Avalonia/DesignData/MockHttpClientFactory.cs
index dd0f19b8..452af8c4 100644
--- a/StabilityMatrix.Avalonia/DesignData/MockHttpClientFactory.cs
+++ b/StabilityMatrix.Avalonia/DesignData/MockHttpClientFactory.cs
@@ -1,4 +1,5 @@
-using System.Net.Http;
+using System;
+using System.Net.Http;
 
 namespace StabilityMatrix.Avalonia.DesignData;
 
@@ -6,6 +7,6 @@ public class MockHttpClientFactory : IHttpClientFactory
 {
     public HttpClient CreateClient(string name)
     {
-        throw new System.NotImplementedException();
+        throw new NotImplementedException();
     }
 }
diff --git a/StabilityMatrix.Avalonia/DesignData/MockLiteDbContext.cs b/StabilityMatrix.Avalonia/DesignData/MockLiteDbContext.cs
index f701e1cb..8b086621 100644
--- a/StabilityMatrix.Avalonia/DesignData/MockLiteDbContext.cs
+++ b/StabilityMatrix.Avalonia/DesignData/MockLiteDbContext.cs
@@ -9,10 +9,10 @@ namespace StabilityMatrix.Avalonia.DesignData;
 
 public class MockLiteDbContext : ILiteDbContext
 {
-    public LiteDatabaseAsync Database { get; }
-    public ILiteCollectionAsync<CivitModel> CivitModels { get; }
-    public ILiteCollectionAsync<CivitModelVersion> CivitModelVersions { get; }
-    public ILiteCollectionAsync<CivitModelQueryCacheEntry> CivitModelQueryCache { get; }
+    public LiteDatabaseAsync Database => throw new NotImplementedException();
+    public ILiteCollectionAsync<CivitModel> CivitModels => throw new NotImplementedException();
+    public ILiteCollectionAsync<CivitModelVersion> CivitModelVersions => throw new NotImplementedException();
+    public ILiteCollectionAsync<CivitModelQueryCacheEntry> CivitModelQueryCache => throw new NotImplementedException();
     public Task<(CivitModel?, CivitModelVersion?)> FindCivitModelFromFileHashAsync(string hashBlake3)
     {
         return Task.FromResult<(CivitModel?, CivitModelVersion?)>((null, null));
diff --git a/StabilityMatrix.Avalonia/DialogHelper.cs b/StabilityMatrix.Avalonia/DialogHelper.cs
index bcf9b02d..331d869d 100644
--- a/StabilityMatrix.Avalonia/DialogHelper.cs
+++ b/StabilityMatrix.Avalonia/DialogHelper.cs
@@ -3,12 +3,7 @@ using System.Collections.Generic;
 using System.ComponentModel;
 using System.Diagnostics;
 using System.Linq;
-using System.Reactive.Linq;
-using System.Reactive.Subjects;
 using System.Runtime.CompilerServices;
-using System.Threading;
-using System.Threading.Tasks;
-using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Data;
 using Avalonia.Threading;
@@ -75,7 +70,7 @@ public static class DialogHelper
             stackPanel.Children.Add(textBox);
             
             // When IsValid property changes, update invalid count and primary button
-            field.PropertyChanged += (sender, args) =>
+            field.PropertyChanged += (_, args) =>
             {
                 if (args.PropertyName == nameof(TextBoxField.IsValid))
                 {
diff --git a/StabilityMatrix.Avalonia/Models/ObservableDictionary.cs b/StabilityMatrix.Avalonia/Models/ObservableDictionary.cs
index a9b8ba90..49ccde95 100644
--- a/StabilityMatrix.Avalonia/Models/ObservableDictionary.cs
+++ b/StabilityMatrix.Avalonia/Models/ObservableDictionary.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.ComponentModel;
-using System.Linq;
 
 namespace StabilityMatrix.Avalonia.Models;
 
diff --git a/StabilityMatrix.Avalonia/Program.cs b/StabilityMatrix.Avalonia/Program.cs
index 318133a1..134a394b 100644
--- a/StabilityMatrix.Avalonia/Program.cs
+++ b/StabilityMatrix.Avalonia/Program.cs
@@ -1,6 +1,6 @@
-using Avalonia;
-using System;
+using System;
 using System.Diagnostics.CodeAnalysis;
+using Avalonia;
 using Projektanker.Icons.Avalonia;
 using Projektanker.Icons.Avalonia.FontAwesome;
 
diff --git a/StabilityMatrix.Avalonia/Services/INotificationService.cs b/StabilityMatrix.Avalonia/Services/INotificationService.cs
index 4d9eea64..57664bd4 100644
--- a/StabilityMatrix.Avalonia/Services/INotificationService.cs
+++ b/StabilityMatrix.Avalonia/Services/INotificationService.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using Avalonia;
 using Avalonia.Controls.Notifications;
 using StabilityMatrix.Core.Models;
diff --git a/StabilityMatrix.Avalonia/Services/NavigationService.cs b/StabilityMatrix.Avalonia/Services/NavigationService.cs
index 86e31612..856ff0a2 100644
--- a/StabilityMatrix.Avalonia/Services/NavigationService.cs
+++ b/StabilityMatrix.Avalonia/Services/NavigationService.cs
@@ -2,6 +2,7 @@
 using Avalonia.Controls;
 using FluentAvalonia.UI.Controls;
 using FluentAvalonia.UI.Media.Animation;
+using FluentAvalonia.UI.Navigation;
 
 namespace StabilityMatrix.Avalonia.Services;
 
@@ -34,7 +35,7 @@ public class NavigationService
     public void NavigateFromContext(object dataContext, NavigationTransitionInfo transitionInfo = null)
     {
         _frame.NavigateFromObject(dataContext,
-            new FluentAvalonia.UI.Navigation.FrameNavigationOptions
+            new FrameNavigationOptions
             {
                 IsNavigationStackEnabled = true,
                 TransitionInfoOverride = transitionInfo ?? new SuppressNavigationTransitionInfo()
diff --git a/StabilityMatrix.Avalonia/Services/ServiceManager.cs b/StabilityMatrix.Avalonia/Services/ServiceManager.cs
index 06f25e6b..e636bdd8 100644
--- a/StabilityMatrix.Avalonia/Services/ServiceManager.cs
+++ b/StabilityMatrix.Avalonia/Services/ServiceManager.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace StabilityMatrix.Avalonia.Services;
@@ -77,6 +78,7 @@ public class ServiceManager<T>
     /// <summary>
     /// Get a view model instance
     /// </summary>
+    [SuppressMessage("ReSharper", "InconsistentlySynchronizedField")]
     public TService Get<TService>() where TService : T
     {
         if (instances.TryGetValue(typeof(TService), out var instance))
diff --git a/StabilityMatrix.Avalonia/Styles/ProgressRing.axaml b/StabilityMatrix.Avalonia/Styles/ProgressRing.axaml
index 89294bb5..0df1c031 100644
--- a/StabilityMatrix.Avalonia/Styles/ProgressRing.axaml
+++ b/StabilityMatrix.Avalonia/Styles/ProgressRing.axaml
@@ -7,10 +7,10 @@
   <Design.PreviewWith>
     <StackPanel>
       <Border Padding="20">
-        <controls:ProgressRing StartAngle="90" EndAngle="270" Value="50" Foreground="Red" BorderThickness="5" Width="100" Height="100"></controls:ProgressRing>
+        <controls:ProgressRing StartAngle="90" EndAngle="270" Value="50" Foreground="Red" BorderThickness="5" Width="100" Height="100" />
       </Border>
       <Border Padding="20">
-        <controls:ProgressRing IsIndeterminate="True" BorderThickness="10" Width="100" Height="100"></controls:ProgressRing>
+        <controls:ProgressRing IsIndeterminate="True" BorderThickness="10" Width="100" Height="100" />
       </Border>
     </StackPanel>
   </Design.PreviewWith>
diff --git a/StabilityMatrix.Avalonia/ViewModels/CheckpointBrowserViewModel.cs b/StabilityMatrix.Avalonia/ViewModels/CheckpointBrowserViewModel.cs
index c081e2f8..1c786661 100644
--- a/StabilityMatrix.Avalonia/ViewModels/CheckpointBrowserViewModel.cs
+++ b/StabilityMatrix.Avalonia/ViewModels/CheckpointBrowserViewModel.cs
@@ -12,8 +12,8 @@ using Avalonia.Controls.Notifications;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using FluentAvalonia.UI.Controls;
-using FluentAvalonia.UI.Data;
 using NLog;
+using Refit;
 using StabilityMatrix.Avalonia.Services;
 using StabilityMatrix.Avalonia.Views;
 using StabilityMatrix.Core.Api;
@@ -25,7 +25,6 @@ using StabilityMatrix.Core.Models;
 using StabilityMatrix.Core.Models.Api;
 using StabilityMatrix.Core.Models.Settings;
 using StabilityMatrix.Core.Services;
-using ApiException = Refit.ApiException;
 using Symbol = FluentIcons.Common.Symbol;
 using SymbolIconSource = FluentIcons.FluentAvalonia.SymbolIconSource;
 
diff --git a/StabilityMatrix.Avalonia/ViewModels/CheckpointFile.cs b/StabilityMatrix.Avalonia/ViewModels/CheckpointFile.cs
index 6efb2764..e58aee59 100644
--- a/StabilityMatrix.Avalonia/ViewModels/CheckpointFile.cs
+++ b/StabilityMatrix.Avalonia/ViewModels/CheckpointFile.cs
@@ -50,7 +50,7 @@ public partial class CheckpointFile : ViewModelBase
 
     [ObservableProperty] private bool isLoading;
     
-    public string FileName => Path.GetFileName((string?) FilePath);
+    public string FileName => Path.GetFileName(FilePath);
 
     public ObservableCollection<string> Badges { get; set; } = new();
 
@@ -147,6 +147,7 @@ public partial class CheckpointFile : ViewModelBase
     [RelayCommand]
     private void OpenOnCivitAi()
     {
+        if (ConnectedModel?.ModelId == null) return;
         ProcessRunner.OpenUrl($"https://civitai.com/models/{ConnectedModel.ModelId}");
     }
     
diff --git a/StabilityMatrix.Avalonia/ViewModels/CheckpointsPageViewModel.cs b/StabilityMatrix.Avalonia/ViewModels/CheckpointsPageViewModel.cs
index 2975fa26..c4cef39c 100644
--- a/StabilityMatrix.Avalonia/ViewModels/CheckpointsPageViewModel.cs
+++ b/StabilityMatrix.Avalonia/ViewModels/CheckpointsPageViewModel.cs
@@ -1,12 +1,10 @@
-using System.Collections.Concurrent;
-using System.Collections.ObjectModel;
+using System.Collections.ObjectModel;
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Runtime.Versioning;
 using System.Threading.Tasks;
 using Avalonia.Controls;
-using Avalonia.Threading;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using FluentAvalonia.UI.Controls;
diff --git a/StabilityMatrix.Avalonia/ViewModels/Dialogs/InstallerViewModel.cs b/StabilityMatrix.Avalonia/ViewModels/Dialogs/InstallerViewModel.cs
index 430c76d4..19f64ca5 100644
--- a/StabilityMatrix.Avalonia/ViewModels/Dialogs/InstallerViewModel.cs
+++ b/StabilityMatrix.Avalonia/ViewModels/Dialogs/InstallerViewModel.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
diff --git a/StabilityMatrix.Avalonia/ViewModels/Dialogs/LaunchOptionsViewModel.cs b/StabilityMatrix.Avalonia/ViewModels/Dialogs/LaunchOptionsViewModel.cs
index 6b84075a..519fe8c1 100644
--- a/StabilityMatrix.Avalonia/ViewModels/Dialogs/LaunchOptionsViewModel.cs
+++ b/StabilityMatrix.Avalonia/ViewModels/Dialogs/LaunchOptionsViewModel.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Linq;
 using CommunityToolkit.Mvvm.ComponentModel;
+using FuzzySharp;
 using StabilityMatrix.Avalonia.Views.Dialogs;
 using StabilityMatrix.Core.Attributes;
 using StabilityMatrix.Core.Helper.Cache;
@@ -50,7 +51,7 @@ public partial class LaunchOptionsViewModel : ContentDialogViewModelBase
             Options = Array.Empty<LaunchOption>()
         };
             
-        var extracted = FuzzySharp.Process
+        var extracted = Process
             .ExtractTop(searchCard, Cards, c => c.Title.ToLowerInvariant());
         var results = extracted
             .Where(r => r.Score > 40)
diff --git a/StabilityMatrix.Avalonia/ViewModels/LaunchPageViewModel.cs b/StabilityMatrix.Avalonia/ViewModels/LaunchPageViewModel.cs
index 41b8c6be..6dfc9400 100644
--- a/StabilityMatrix.Avalonia/ViewModels/LaunchPageViewModel.cs
+++ b/StabilityMatrix.Avalonia/ViewModels/LaunchPageViewModel.cs
@@ -5,9 +5,9 @@ using System.Diagnostics;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using Avalonia.Controls.Notifications;
 using System.Threading.Tasks.Dataflow;
 using Avalonia;
+using Avalonia.Controls.Notifications;
 using Avalonia.Controls.Primitives;
 using Avalonia.Threading;
 using AvaloniaEdit.Document;
diff --git a/StabilityMatrix.Avalonia/ViewModels/MainWindowViewModel.cs b/StabilityMatrix.Avalonia/ViewModels/MainWindowViewModel.cs
index 7edeb213..d98fafd8 100644
--- a/StabilityMatrix.Avalonia/ViewModels/MainWindowViewModel.cs
+++ b/StabilityMatrix.Avalonia/ViewModels/MainWindowViewModel.cs
@@ -1,9 +1,7 @@
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
-using Avalonia;
 using Avalonia.Controls.Primitives;
 using CommunityToolkit.Mvvm.ComponentModel;
 using FluentAvalonia.UI.Controls;
diff --git a/StabilityMatrix.Avalonia/ViewModels/PageViewModelBase.cs b/StabilityMatrix.Avalonia/ViewModels/PageViewModelBase.cs
index b56a511d..e08f8864 100644
--- a/StabilityMatrix.Avalonia/ViewModels/PageViewModelBase.cs
+++ b/StabilityMatrix.Avalonia/ViewModels/PageViewModelBase.cs
@@ -1,5 +1,4 @@
 using FluentAvalonia.UI.Controls;
-using Symbol = FluentIcons.Common.Symbol;
 
 namespace StabilityMatrix.Avalonia.ViewModels;
 
diff --git a/StabilityMatrix.Avalonia/ViewModels/ProgressManagerViewModel.cs b/StabilityMatrix.Avalonia/ViewModels/ProgressManagerViewModel.cs
index a5be0d61..04888642 100644
--- a/StabilityMatrix.Avalonia/ViewModels/ProgressManagerViewModel.cs
+++ b/StabilityMatrix.Avalonia/ViewModels/ProgressManagerViewModel.cs
@@ -1,12 +1,8 @@
 using System;
-using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
 using CommunityToolkit.Mvvm.ComponentModel;
 using FluentAvalonia.UI.Controls;
-using FluentIcons.FluentAvalonia;
-using Python.Runtime;
-using StabilityMatrix.Avalonia.Models;
 using StabilityMatrix.Avalonia.Views;
 using StabilityMatrix.Core.Attributes;
 using StabilityMatrix.Core.Helper;
diff --git a/StabilityMatrix.Avalonia/ViewModels/SettingsViewModel.cs b/StabilityMatrix.Avalonia/ViewModels/SettingsViewModel.cs
index 4320ea1d..00d7c796 100644
--- a/StabilityMatrix.Avalonia/ViewModels/SettingsViewModel.cs
+++ b/StabilityMatrix.Avalonia/ViewModels/SettingsViewModel.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.ObjectModel;
 using System.IO;
-using System.Linq;
 using System.Reflection;
 using System.Threading.Tasks;
 using Avalonia;
@@ -54,7 +53,7 @@ public partial class SettingsViewModel : PageViewModelBase
         // In case design / tests
         if (Application.Current is null) return;
         // Change theme
-        Application.Current!.RequestedThemeVariant = value switch
+        Application.Current.RequestedThemeVariant = value switch
         {
             "Dark" => ThemeVariant.Dark,
             "Light" => ThemeVariant.Light,
diff --git a/StabilityMatrix.Avalonia/Views/CheckpointBrowserPage.axaml.cs b/StabilityMatrix.Avalonia/Views/CheckpointBrowserPage.axaml.cs
index 2b3676fb..f61dae4c 100644
--- a/StabilityMatrix.Avalonia/Views/CheckpointBrowserPage.axaml.cs
+++ b/StabilityMatrix.Avalonia/Views/CheckpointBrowserPage.axaml.cs
@@ -1,5 +1,4 @@
-using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
+using Avalonia.Markup.Xaml;
 using StabilityMatrix.Avalonia.Controls;
 
 namespace StabilityMatrix.Avalonia.Views;
diff --git a/StabilityMatrix.Avalonia/Views/CheckpointsPage.axaml b/StabilityMatrix.Avalonia/Views/CheckpointsPage.axaml
index a7ff335f..60438ca6 100644
--- a/StabilityMatrix.Avalonia/Views/CheckpointsPage.axaml
+++ b/StabilityMatrix.Avalonia/Views/CheckpointsPage.axaml
@@ -4,8 +4,6 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:vm="clr-namespace:StabilityMatrix.Avalonia.ViewModels"
              xmlns:ui="using:FluentAvalonia.UI.Controls"
-             xmlns:i="clr-namespace:Avalonia.Xaml.Interactivity;assembly=Avalonia.Xaml.Interactivity"
-             xmlns:idd="clr-namespace:Avalonia.Xaml.Interactions.DragAndDrop;assembly=Avalonia.Xaml.Interactions.DragAndDrop"
              xmlns:mocks="clr-namespace:StabilityMatrix.Avalonia.DesignData"
              xmlns:controls="clr-namespace:StabilityMatrix.Avalonia.Controls"
              xmlns:system="clr-namespace:System;assembly=System.Runtime"
diff --git a/StabilityMatrix.Avalonia/Views/Dialogs/InstallerDialog.axaml b/StabilityMatrix.Avalonia/Views/Dialogs/InstallerDialog.axaml
index 32fe842a..9a7645e5 100644
--- a/StabilityMatrix.Avalonia/Views/Dialogs/InstallerDialog.axaml
+++ b/StabilityMatrix.Avalonia/Views/Dialogs/InstallerDialog.axaml
@@ -3,11 +3,8 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:controls="clr-namespace:StabilityMatrix.Avalonia.Controls"
-             xmlns:vm="clr-namespace:StabilityMatrix.Avalonia.ViewModels"
              xmlns:ui="using:FluentAvalonia.UI.Controls"
-             xmlns:md="https://github.com/whistyun/Markdown.Avalonia"
              xmlns:mocks="clr-namespace:StabilityMatrix.Avalonia.DesignData"
-             xmlns:system="clr-namespace:System;assembly=System.Runtime"
              xmlns:dialogs="clr-namespace:StabilityMatrix.Avalonia.ViewModels.Dialogs"
              xmlns:packages="clr-namespace:StabilityMatrix.Core.Models.Packages;assembly=StabilityMatrix.Core"
              xmlns:models="clr-namespace:StabilityMatrix.Core.Models;assembly=StabilityMatrix.Core"
diff --git a/StabilityMatrix.Avalonia/Views/Dialogs/LaunchOptionsDialog.axaml b/StabilityMatrix.Avalonia/Views/Dialogs/LaunchOptionsDialog.axaml
index 0236002b..e8d78ebf 100644
--- a/StabilityMatrix.Avalonia/Views/Dialogs/LaunchOptionsDialog.axaml
+++ b/StabilityMatrix.Avalonia/Views/Dialogs/LaunchOptionsDialog.axaml
@@ -2,14 +2,12 @@
                           xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                           xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
                           xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-                          xmlns:vm="clr-namespace:StabilityMatrix.Avalonia.ViewModels"
                           xmlns:dialogs="clr-namespace:StabilityMatrix.Avalonia.ViewModels.Dialogs"
                           xmlns:models="clr-namespace:StabilityMatrix.Core.Models;assembly=StabilityMatrix.Core"
                           xmlns:converters="clr-namespace:StabilityMatrix.Avalonia.Converters"
                           xmlns:ui="using:FluentAvalonia.UI.Controls"
                           xmlns:mocks="clr-namespace:StabilityMatrix.Avalonia.DesignData"
                           xmlns:controls="clr-namespace:StabilityMatrix.Avalonia.Controls"
-                          xmlns:system="clr-namespace:System;assembly=System.Runtime"
                           d:DataContext="{x:Static mocks:DesignData.LaunchOptionsViewModel}"
                           x:DataType="dialogs:LaunchOptionsViewModel"
                           mc:Ignorable="d" d:DesignWidth="500" d:DesignHeight="650"
diff --git a/StabilityMatrix.Avalonia/Views/Dialogs/LaunchOptionsDialog.axaml.cs b/StabilityMatrix.Avalonia/Views/Dialogs/LaunchOptionsDialog.axaml.cs
index 429ad26f..84d4d3a6 100644
--- a/StabilityMatrix.Avalonia/Views/Dialogs/LaunchOptionsDialog.axaml.cs
+++ b/StabilityMatrix.Avalonia/Views/Dialogs/LaunchOptionsDialog.axaml.cs
@@ -1,5 +1,4 @@
-using Avalonia;
-using Avalonia.Controls;
+using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 
 namespace StabilityMatrix.Avalonia.Views.Dialogs;
diff --git a/StabilityMatrix.Avalonia/Views/Dialogs/OneClickInstallDialog.axaml b/StabilityMatrix.Avalonia/Views/Dialogs/OneClickInstallDialog.axaml
index e0be5463..c190b500 100644
--- a/StabilityMatrix.Avalonia/Views/Dialogs/OneClickInstallDialog.axaml
+++ b/StabilityMatrix.Avalonia/Views/Dialogs/OneClickInstallDialog.axaml
@@ -5,7 +5,6 @@
              xmlns:controls="clr-namespace:StabilityMatrix.Avalonia.Controls"
              xmlns:dialogs="clr-namespace:StabilityMatrix.Avalonia.ViewModels.Dialogs"
              xmlns:designData="clr-namespace:StabilityMatrix.Avalonia.DesignData"
-             xmlns:fa="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
              xmlns:packages="clr-namespace:StabilityMatrix.Core.Models.Packages;assembly=StabilityMatrix.Core"
              mc:Ignorable="d" d:DesignWidth="700" d:DesignHeight="700"
              x:DataType="dialogs:OneClickInstallViewModel"
diff --git a/StabilityMatrix.Avalonia/Views/Dialogs/OneClickInstallDialog.axaml.cs b/StabilityMatrix.Avalonia/Views/Dialogs/OneClickInstallDialog.axaml.cs
index 469d9335..6e5f95fc 100644
--- a/StabilityMatrix.Avalonia/Views/Dialogs/OneClickInstallDialog.axaml.cs
+++ b/StabilityMatrix.Avalonia/Views/Dialogs/OneClickInstallDialog.axaml.cs
@@ -1,5 +1,4 @@
-using Avalonia;
-using Avalonia.Controls;
+using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 
 namespace StabilityMatrix.Avalonia.Views.Dialogs;
diff --git a/StabilityMatrix.Avalonia/Views/Dialogs/SelectDataDirectoryDialog.axaml b/StabilityMatrix.Avalonia/Views/Dialogs/SelectDataDirectoryDialog.axaml
index 59bc3d86..559951b3 100644
--- a/StabilityMatrix.Avalonia/Views/Dialogs/SelectDataDirectoryDialog.axaml
+++ b/StabilityMatrix.Avalonia/Views/Dialogs/SelectDataDirectoryDialog.axaml
@@ -6,7 +6,6 @@
                           xmlns:ui="using:FluentAvalonia.UI.Controls"
                           xmlns:mocks="clr-namespace:StabilityMatrix.Avalonia.DesignData"
                           xmlns:controls="clr-namespace:StabilityMatrix.Avalonia.Controls"
-                          xmlns:system="clr-namespace:System;assembly=System.Runtime"
                           d:DataContext="{x:Static mocks:DesignData.SelectDataDirectoryViewModel}"
                           x:DataType="dialogs:SelectDataDirectoryViewModel"
                           x:CompileBindings="True"
diff --git a/StabilityMatrix.Avalonia/Views/Dialogs/SelectModelVersionDialog.axaml b/StabilityMatrix.Avalonia/Views/Dialogs/SelectModelVersionDialog.axaml
index ba5fe191..50437fdf 100644
--- a/StabilityMatrix.Avalonia/Views/Dialogs/SelectModelVersionDialog.axaml
+++ b/StabilityMatrix.Avalonia/Views/Dialogs/SelectModelVersionDialog.axaml
@@ -6,7 +6,6 @@
              xmlns:api="clr-namespace:StabilityMatrix.Core.Models.Api;assembly=StabilityMatrix.Core"
              xmlns:dialogs="clr-namespace:StabilityMatrix.Avalonia.ViewModels.Dialogs"
              xmlns:designData="clr-namespace:StabilityMatrix.Avalonia.DesignData"
-             xmlns:controls1="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:DataType="dialogs:SelectModelVersionViewModel"
              d:DataContext="{x:Static designData:DesignData.SelectModelVersionViewModel}"
diff --git a/StabilityMatrix.Avalonia/Views/Dialogs/UpdateDialog.axaml b/StabilityMatrix.Avalonia/Views/Dialogs/UpdateDialog.axaml
index 8d30d594..5f03d2ad 100644
--- a/StabilityMatrix.Avalonia/Views/Dialogs/UpdateDialog.axaml
+++ b/StabilityMatrix.Avalonia/Views/Dialogs/UpdateDialog.axaml
@@ -2,12 +2,10 @@
                           xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                           xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
                           xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-                          xmlns:vm="clr-namespace:StabilityMatrix.Avalonia.ViewModels"
                           xmlns:dialogs="clr-namespace:StabilityMatrix.Avalonia.ViewModels.Dialogs"
                           xmlns:ui="using:FluentAvalonia.UI.Controls"
                           xmlns:mocks="clr-namespace:StabilityMatrix.Avalonia.DesignData"
                           xmlns:controls="clr-namespace:StabilityMatrix.Avalonia.Controls"
-                          xmlns:system="clr-namespace:System;assembly=System.Runtime"
                           xmlns:mdxaml="https://github.com/whistyun/Markdown.Avalonia.Tight"
                           d:DataContext="{x:Static mocks:DesignData.UpdateViewModel}"
                           x:DataType="dialogs:UpdateViewModel"
diff --git a/StabilityMatrix.Avalonia/Views/Dialogs/UpdateDialog.axaml.cs b/StabilityMatrix.Avalonia/Views/Dialogs/UpdateDialog.axaml.cs
index d983a7e6..33d2b218 100644
--- a/StabilityMatrix.Avalonia/Views/Dialogs/UpdateDialog.axaml.cs
+++ b/StabilityMatrix.Avalonia/Views/Dialogs/UpdateDialog.axaml.cs
@@ -1,5 +1,4 @@
-using Avalonia;
-using Avalonia.Controls;
+using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 
 namespace StabilityMatrix.Avalonia.Views.Dialogs;
diff --git a/StabilityMatrix.Avalonia/Views/MainWindow.axaml b/StabilityMatrix.Avalonia/Views/MainWindow.axaml
index af4f6607..19ac0797 100644
--- a/StabilityMatrix.Avalonia/Views/MainWindow.axaml
+++ b/StabilityMatrix.Avalonia/Views/MainWindow.axaml
@@ -6,8 +6,6 @@
                         xmlns:mocks="clr-namespace:StabilityMatrix.Avalonia.DesignData"
                         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
                         xmlns:controls="clr-namespace:StabilityMatrix.Avalonia.Controls"
-                        xmlns:process="clr-namespace:StabilityMatrix.Core.Processes;assembly=StabilityMatrix.Core"
-                        xmlns:fluentAvalonia="clr-namespace:FluentIcons.FluentAvalonia;assembly=FluentIcons.FluentAvalonia"
                         mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="550"
                         d:DataContext="{x:Static mocks:DesignData.MainWindowViewModel}"
                         x:DataType="vm:MainWindowViewModel"
diff --git a/StabilityMatrix.Avalonia/Views/ProgressManagerPage.axaml.cs b/StabilityMatrix.Avalonia/Views/ProgressManagerPage.axaml.cs
index 2d4fec1e..e412bab7 100644
--- a/StabilityMatrix.Avalonia/Views/ProgressManagerPage.axaml.cs
+++ b/StabilityMatrix.Avalonia/Views/ProgressManagerPage.axaml.cs
@@ -1,6 +1,4 @@
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
+using Avalonia.Markup.Xaml;
 using StabilityMatrix.Avalonia.Controls;
 
 namespace StabilityMatrix.Avalonia.Views;
diff --git a/StabilityMatrix.Core/Helper/Factory/IPackageFactory.cs b/StabilityMatrix.Core/Helper/Factory/IPackageFactory.cs
index 2a2068b8..efffd767 100644
--- a/StabilityMatrix.Core/Helper/Factory/IPackageFactory.cs
+++ b/StabilityMatrix.Core/Helper/Factory/IPackageFactory.cs
@@ -5,5 +5,5 @@ namespace StabilityMatrix.Core.Helper.Factory;
 public interface IPackageFactory
 {
     IEnumerable<BasePackage> GetAllAvailablePackages();
-    BasePackage? FindPackageByName(string packageName);
+    BasePackage? FindPackageByName(string? packageName);
 }
diff --git a/StabilityMatrix.Core/Helper/Factory/PackageFactory.cs b/StabilityMatrix.Core/Helper/Factory/PackageFactory.cs
index bf162c88..028b7b59 100644
--- a/StabilityMatrix.Core/Helper/Factory/PackageFactory.cs
+++ b/StabilityMatrix.Core/Helper/Factory/PackageFactory.cs
@@ -19,8 +19,9 @@ public class PackageFactory : IPackageFactory
         return basePackages.Values;
     }
 
-    public BasePackage? FindPackageByName(string packageName)
+    public BasePackage? FindPackageByName(string? packageName)
     {
-        return basePackages.GetValueOrDefault(packageName);
+        return packageName == null ? null : 
+            basePackages.GetValueOrDefault(packageName);
     }
 }
diff --git a/StabilityMatrix.Core/Models/Packages/BaseGitPackage.cs b/StabilityMatrix.Core/Models/Packages/BaseGitPackage.cs
index 779f9b95..b43398cc 100644
--- a/StabilityMatrix.Core/Models/Packages/BaseGitPackage.cs
+++ b/StabilityMatrix.Core/Models/Packages/BaseGitPackage.cs
@@ -157,12 +157,10 @@ public abstract class BaseGitPackage : BasePackage
         return Task.CompletedTask;
     }
 
-    public override async Task<bool> CheckForUpdates(string installedPackageName)
+    public override async Task<bool> CheckForUpdates(InstalledPackage package)
     {
-        var package =
-            SettingsManager.Settings.InstalledPackages.FirstOrDefault(x => x.DisplayName == installedPackageName);
-        var currentVersion = package?.PackageVersion;
-        if (package == null || string.IsNullOrWhiteSpace(currentVersion))
+        var currentVersion = package.PackageVersion;
+        if (string.IsNullOrWhiteSpace(currentVersion))
         {
             return false;
         }
diff --git a/StabilityMatrix.Core/Models/Packages/BasePackage.cs b/StabilityMatrix.Core/Models/Packages/BasePackage.cs
index bc466993..eacbac17 100644
--- a/StabilityMatrix.Core/Models/Packages/BasePackage.cs
+++ b/StabilityMatrix.Core/Models/Packages/BasePackage.cs
@@ -23,7 +23,7 @@ public abstract class BasePackage
     public abstract Task InstallPackage(IProgress<ProgressReport>? progress = null);
     public abstract Task RunPackage(string installedPackagePath, string arguments);
     public abstract Task Shutdown();
-    public abstract Task<bool> CheckForUpdates(string installedPackageName);
+    public abstract Task<bool> CheckForUpdates(InstalledPackage package);
     public abstract Task<string> Update(InstalledPackage installedPackage, IProgress<ProgressReport>? progress = null);
     public abstract Task<IOrderedEnumerable<Release>> GetReleaseTags();