feat: Improve RestoreCustomAppSettingsIfNeeded

Author: davidkallesen

src/Atc.Installer.Wpf.App/App.xaml.cs

@@ -9,8 +9,12 @@ public partial class App
     private readonly IHost host;
     private IConfiguration? configuration;
 
+    public static DirectoryInfo InstallerTempDirectory => new(Path.Combine(Path.GetTempPath(), "atc-installer"));
+
     public App()
     {
+        RestoreCustomAppSettingsIfNeeded();
+
         host = Host.CreateDefaultBuilder()
             .ConfigureAppConfiguration(
                 configurationBuilder =>
@@ -89,4 +93,18 @@ await host
 
         host.Dispose();
     }
+
+    private static void RestoreCustomAppSettingsIfNeeded()
+    {
+        var currentFile = new FileInfo(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "appsettings.custom.json"));
+        var backupFile = new FileInfo(Path.Combine(InstallerTempDirectory.FullName, "appsettings.custom.json"));
+        if (!currentFile.Exists ||
+            !backupFile.Exists ||
+            currentFile.LastWriteTime == backupFile.LastWriteTime)
+        {
+            return;
+        }
+
+        File.Copy(backupFile.FullName, currentFile.FullName, overwrite: true);
+    }
 }

src/Atc.Installer.Wpf.App/MainWindowViewModel.cs

@@ -10,7 +10,6 @@ public partial class MainWindowViewModel : MainWindowViewModelBase
     private readonly IWindowsApplicationInstallerService waInstallerService;
     private readonly IAzureStorageAccountInstallerService azureStorageAccountInstallerService;
     private readonly ToastNotificationManager notificationManager = new();
-    private readonly DirectoryInfo installerTempDirectory = new(Path.Combine(Path.GetTempPath(), "atc-installer"));
     private DirectoryInfo? installationDirectory;
     private string? projectName;
     private ComponentProviderViewModel? selectedComponentProvider;
@@ -29,7 +28,7 @@ public MainWindowViewModel()
 
         this.azureStorageAccountInstallerService = new AzureStorageAccountInstallerService();
 
-        this.installationDirectory = new DirectoryInfo(Path.Combine(installerTempDirectory.FullName, "InstallationFiles"));
+        this.installationDirectory = new DirectoryInfo(Path.Combine(App.InstallerTempDirectory.FullName, "InstallationFiles"));
 
         ApplicationOptions = new ApplicationOptionsViewModel(new ApplicationOptions());
 
@@ -44,7 +43,7 @@ public MainWindowViewModel()
                 waInstallerService,
                 networkShellService,
                 new ObservableCollectionEx<ComponentProviderViewModel>(),
-                installerTempDirectory,
+                App.InstallerTempDirectory,
                 installationDirectory,
                 ProjectName,
                 new Dictionary<string, object>(StringComparer.Ordinal),
@@ -59,7 +58,7 @@ public MainWindowViewModel()
                 iisInstallerService,
                 networkShellService,
                 ComponentProviders,
-                installerTempDirectory,
+                App.InstallerTempDirectory,
                 installationDirectory,
                 ProjectName,
                 new Dictionary<string, object>(StringComparer.Ordinal),
@@ -89,7 +88,6 @@ public MainWindowViewModel(
         this.waInstallerService = windowsApplicationInstallerService ?? throw new ArgumentNullException(nameof(windowsApplicationInstallerService));
         this.azureStorageAccountInstallerService = azureStorageAccountInstallerService ?? throw new ArgumentNullException(nameof(azureStorageAccountInstallerService));
 
-        applicationOptionsValue = RestoreCustomAppSettingsIfNeeded(applicationOptionsValue);
         LoadRecentOpenFiles();
 
         ApplicationOptions = new ApplicationOptionsViewModel(applicationOptionsValue);
@@ -174,27 +172,9 @@ public void StopMonitoringServices()
         cancellationTokenSource?.Cancel();
     }
 
-    private ApplicationOptions RestoreCustomAppSettingsIfNeeded(
-        ApplicationOptions applicationOptions)
-    {
-        var currentFile = new FileInfo(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "appsettings.custom.json"));
-        var backupFile = new FileInfo(Path.Combine(installerTempDirectory.FullName, "appsettings.custom.json"));
-        if (!currentFile.Exists ||
-            !backupFile.Exists ||
-            currentFile.LastWriteTime == backupFile.LastWriteTime)
-        {
-            return applicationOptions;
-        }
-
-        File.Copy(backupFile.FullName, currentFile.FullName, overwrite: true);
-
-        var wrapperModel = FileHelper<ApplicationOptionsWrapper>.ReadJsonFileToModel(fileInfo: backupFile)!;
-        return wrapperModel.Application;
-    }
-
     private void LoadRecentOpenFiles()
     {
-        var recentOpenFilesFile = Path.Combine(installerTempDirectory.FullName, "RecentOpenFiles.json");
+        var recentOpenFilesFile = Path.Combine(App.InstallerTempDirectory.FullName, "RecentOpenFiles.json");
         if (!File.Exists(recentOpenFilesFile))
         {
             return;
@@ -256,10 +236,10 @@ private void AddLoadedFileToRecentOpenFiles(
             recentOpenFilesOption.RecentOpenFiles.Add(item);
         }
 
-        var recentOpenFilesFilePath = Path.Combine(installerTempDirectory.FullName, "RecentOpenFiles.json");
-        if (!Directory.Exists(installerTempDirectory.FullName))
+        var recentOpenFilesFilePath = Path.Combine(App.InstallerTempDirectory.FullName, "RecentOpenFiles.json");
+        if (!Directory.Exists(App.InstallerTempDirectory.FullName))
         {
-            Directory.CreateDirectory(installerTempDirectory.FullName);
+            Directory.CreateDirectory(App.InstallerTempDirectory.FullName);
         }
 
         var json = JsonSerializer.Serialize(
@@ -343,7 +323,7 @@ private void AddComponentProviderWindowsApplication(
             waInstallerService,
             networkShellService,
             ComponentProviders,
-            installerTempDirectory,
+            App.InstallerTempDirectory,
             installationDirectory,
             ProjectName!,
             DefaultApplicationSettings,
@@ -364,7 +344,7 @@ private void AddComponentProviderElasticSearchServer(
             networkShellService,
             waInstallerService,
             ComponentProviders,
-            installerTempDirectory,
+            App.InstallerTempDirectory,
             installationDirectory,
             ProjectName!,
             DefaultApplicationSettings,
@@ -384,7 +364,7 @@ private void AddComponentProviderInternetInformationServer(
             iisInstallerService,
             networkShellService,
             ComponentProviders,
-            installerTempDirectory,
+            App.InstallerTempDirectory,
             installationDirectory,
             ProjectName!,
             DefaultApplicationSettings,
@@ -405,7 +385,7 @@ private void AddComponentProviderPostgreSql(
             networkShellService,
             waInstallerService,
             ComponentProviders,
-            installerTempDirectory,
+            App.InstallerTempDirectory,
             installationDirectory,
             ProjectName!,
             DefaultApplicationSettings,

src/Atc.Installer.Wpf.App/MainWindowViewModel_Commands.cs

@@ -50,7 +50,7 @@ private void OpenApplicationSettingsCommandHandler()
         new ApplicationSettingsDialog(
             new ApplicationSettingsDialogViewModel(
                 ApplicationOptions,
-                installerTempDirectory)).ShowDialog();
+                App.InstallerTempDirectory)).ShowDialog();
     }
 
     private Task OpenRecentConfigurationFileCommandHandler(