Merge pull request #22 from LykosAI/main

StabilityMatrix/App.xaml.cs

@@ -5,8 +5,8 @@ using System.IO;
 using System.Linq;
 using System.Net;
 using System.Net.Http;
-using System.Text.Json;
 using System.Text.Json.Serialization;
+using System.Threading;
 using System.Threading.Tasks;
 using System.Windows;
 using AsyncAwaitBestPractices;
@@ -148,11 +148,28 @@ namespace StabilityMatrix
         {
             if (AppDomain.CurrentDomain.BaseDirectory.EndsWith("Update\\"))
             {
-                File.Copy(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "StabilityMatrix.exe"),
+                var delays = Backoff.DecorrelatedJitterBackoffV2(
-                    Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "..", "StabilityMatrix.exe"), true);
+                    TimeSpan.FromMilliseconds(150), retryCount: 3);
+                foreach (var dlay in delays) 
+                {
+                    try
+                    {
+                        File.Copy(
+                            Path.Combine(AppDomain.CurrentDomain.BaseDirectory,
+                                "StabilityMatrix.exe"),
+                            Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "..",
+                                "StabilityMatrix.exe"), true);
+                        
                         Process.Start(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "..",
                             "StabilityMatrix.exe"));
+                        
                         Current.Shutdown();
+                    }
+                    catch (Exception)
+                    {
+                        Thread.Sleep(dlay);
+                    }
+                }
                 return;
             }
 

StabilityMatrix/DataDirectoryMigrationDialog.xaml.cs

@@ -1,5 +1,4 @@
 using System;
-using System.IO;
 using System.Threading.Tasks;
 using System.Windows;
 using AsyncAwaitBestPractices;

StabilityMatrix/DesignData/MockFirstLaunchSetupViewModel.cs

@@ -1,5 +1,4 @@
-using StabilityMatrix.Models;
+using StabilityMatrix.Models.Progress;
-using StabilityMatrix.Models.Progress;
 using StabilityMatrix.ViewModels;
 
 namespace StabilityMatrix.DesignData;

StabilityMatrix/Helper/ArchiveHelper.cs

@@ -9,7 +9,6 @@ using System.Windows.Threading;
 using NLog;
 using SharpCompress.Common;
 using SharpCompress.Readers;
-using StabilityMatrix.Models;
 using StabilityMatrix.Models.Progress;
 
 namespace StabilityMatrix.Helper;

StabilityMatrix/Helper/EventManager.cs

@@ -1,5 +1,4 @@
 using System;
-using StabilityMatrix.Models;
 using StabilityMatrix.Updater;
 
 namespace StabilityMatrix.Helper;

StabilityMatrix/Helper/FileHash.cs

@@ -4,7 +4,6 @@ using System.IO;
 using System.Security.Cryptography;
 using System.Threading.Tasks;
 using Blake3;
-using StabilityMatrix.Models;
 using StabilityMatrix.Models.Progress;
 
 namespace StabilityMatrix.Helper;

StabilityMatrix/Helper/FileTransfers.cs

@@ -4,7 +4,6 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
-using StabilityMatrix.Models;
 using StabilityMatrix.Models.Progress;
 
 namespace StabilityMatrix.Helper;

StabilityMatrix/Helper/IPrerequisiteHelper.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Threading.Tasks;
-using StabilityMatrix.Models;
 using StabilityMatrix.Models.Progress;
 
 namespace StabilityMatrix.Helper;

StabilityMatrix/Helper/ModelFinder.cs

@@ -1,5 +1,4 @@
-using System;
+using System.Linq;
-using System.Linq;
 using System.Threading.Tasks;
 using NLog;
 using Refit;

StabilityMatrix/Helper/PrerequisiteHelper.cs

@@ -8,7 +8,6 @@ using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
 using Microsoft.Win32;
 using Octokit;
-using StabilityMatrix.Models;
 using StabilityMatrix.Models.Progress;
 using StabilityMatrix.Python;
 using StabilityMatrix.Services;

StabilityMatrix/Helper/SettingsManager.cs

@@ -119,6 +119,9 @@ public class SettingsManager : ISettingsManager
         var library = new LibrarySettings { LibraryPath = path };
         var libraryJson = JsonSerializer.Serialize(library, new JsonSerializerOptions { WriteIndented = true });
         File.WriteAllText(libraryJsonPath, libraryJson);
+        
+        // actually create the LibraryPath directory
+        Directory.CreateDirectory(path);
     } 
     
     /// <summary>

StabilityMatrix/Helper/SnackbarService.cs

@@ -1,7 +1,6 @@
 using System.Threading.Tasks;
 using System;
 using AsyncAwaitBestPractices;
-using Microsoft.Extensions.Logging;
 using StabilityMatrix.Models;
 using StabilityMatrix.ViewModels;
 using Wpf.Ui.Common;

StabilityMatrix/LaunchPage.xaml.cs

@@ -1,5 +1,4 @@
-using System;
+using System.Windows;
-using System.Windows;
 using System.Windows.Controls;
 using StabilityMatrix.ViewModels;
 

StabilityMatrix/MainWindow.xaml.cs

@@ -4,9 +4,7 @@ using System.Diagnostics;
 using System.Reactive.Linq;
 using System.Threading;
 using System.Windows;
-using System.Windows.Forms;
 using System.Windows.Interop;
-using CommunityToolkit.Mvvm.ComponentModel;
 using StabilityMatrix.Helper;
 using StabilityMatrix.Services;
 using StabilityMatrix.ViewModels;

StabilityMatrix/Models/CheckpointFile.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Immutable;
 using System.Collections.ObjectModel;
 using System.Diagnostics;
 using System.IO;

StabilityMatrix/Models/InstalledPackage.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Text.Json.Serialization;
 using System.Threading.Tasks;
 using StabilityMatrix.Helper;

StabilityMatrix/Services/DownloadService.cs

@@ -5,7 +5,6 @@ using System.Net.Http.Headers;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
 using Polly.Contrib.WaitAndRetry;
-using StabilityMatrix.Models;
 using StabilityMatrix.Models.Progress;
 
 namespace StabilityMatrix.Services;

StabilityMatrix/Services/IDownloadService.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Threading.Tasks;
-using StabilityMatrix.Models;
 using StabilityMatrix.Models.Progress;
 
 namespace StabilityMatrix.Services;

StabilityMatrix/Updater/IUpdateHelper.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Threading.Tasks;
-using StabilityMatrix.Models;
 using StabilityMatrix.Models.Progress;
 
 namespace StabilityMatrix.Updater;

StabilityMatrix/Updater/UpdateHelper.cs

@@ -9,7 +9,6 @@ using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using StabilityMatrix.Extensions;
 using StabilityMatrix.Helper;
-using StabilityMatrix.Models;
 using StabilityMatrix.Models.Configs;
 using StabilityMatrix.Models.Progress;
 using StabilityMatrix.Services;

StabilityMatrix/ViewModels/CheckpointBrowserViewModel.cs

@@ -11,7 +11,6 @@ using NLog;
 using System.Diagnostics;
 using System.Net.Http;
 using System.Windows.Data;
-using Octokit;
 using StabilityMatrix.Api;
 using StabilityMatrix.Database;
 using StabilityMatrix.Extensions;

StabilityMatrix/ViewModels/CheckpointManagerViewModel.cs

@@ -1,6 +1,5 @@
 using System.Collections.Concurrent;
 using System.Collections.ObjectModel;
-using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;

StabilityMatrix/ViewModels/LaunchViewModel.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.ObjectModel;
-using System.Diagnostics;
 using System.Linq;
 using System.Threading.Tasks;
 using System.Windows;

StabilityMatrix/ViewModels/MainWindowViewModel.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Dynamic;
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
@@ -12,7 +11,6 @@ using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using Microsoft.Extensions.Options;
 using StabilityMatrix.Helper;
-using StabilityMatrix.Models;
 using StabilityMatrix.Models.Configs;
 using StabilityMatrix.Services;
 using StabilityMatrix.Updater;

StabilityMatrix/ViewModels/RefreshBadgeViewModel.cs

@@ -5,7 +5,6 @@ using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using NLog;
 using StabilityMatrix.Controls;
-using StabilityMatrix.Models;
 using StabilityMatrix.Models.Progress;
 using Wpf.Ui.Common;
 using Wpf.Ui.Controls;

StabilityMatrix/ViewModels/SelectInstallLocationsViewModel.cs

@@ -10,8 +10,6 @@ using CommunityToolkit.Mvvm.Input;
 using NLog;
 using Ookii.Dialogs.Wpf;
 using StabilityMatrix.Helper;
-using StabilityMatrix.Models;
-using StabilityMatrix.Models.FileInterfaces;
 using StabilityMatrix.Models.Progress;
 using StabilityMatrix.Models.Settings;
 

StabilityMatrix/ViewModels/UpdateWindowViewModel.cs

@@ -6,7 +6,6 @@ using System.Windows;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using StabilityMatrix.Helper;
-using StabilityMatrix.Models;
 using StabilityMatrix.Models.Progress;
 using StabilityMatrix.Updater;
 using Wpf.Ui.Controls.Window;

StabilityMatrix/WebLoginDialog.xaml.cs

@@ -1,6 +1,5 @@
 using System.Windows;
 using Microsoft.Web.WebView2.Core;
-using NLog;
 using StabilityMatrix.ViewModels;
 using Wpf.Ui.Contracts;
 using Wpf.Ui.Controls.ContentDialogControl;