Conform to revised J4JHost API re: configuration folders

Author: markolbert

GeoProcessorApp/app/StoreKeyApp.cs

@@ -40,21 +40,21 @@ public class StoreKeyApp : IHostedService
         private readonly AppConfig _config;
         private readonly IHostApplicationLifetime _lifetime;
         private readonly IJ4JLogger? _logger;
-        private readonly J4JHostInfo _hostInfo;
+        private readonly string _userConfigFolder;
         private readonly IJ4JProtection _protection;
 
         public StoreKeyApp(
             AppConfig config,
             IHostApplicationLifetime lifetime,
             IIndex<string, IConfigurationUpdater> configUpdaters,
-            J4JHostInfo hostInfo,
+            IJ4JHost host,
             IJ4JProtection protection,
             IJ4JLogger? logger
         )
         {
             _config = config;
             _lifetime = lifetime;
-            _hostInfo = hostInfo;
+            _userConfigFolder = host.UserConfigurationFolder;
             _protection = protection;
 
             _logger = logger;
@@ -139,7 +139,7 @@ public async Task StartAsync( CancellationToken cancellationToken )
             var serialized = JsonSerializer.Serialize( tempConfig, jsonOptions );
 
             await File.WriteAllTextAsync(
-                Path.Combine( _hostInfo.UserConfigurationFolder, Program.UserConfigFile ),
+                Path.Combine( _userConfigFolder, Program.UserConfigFile ),
                 serialized,
                 cancellationToken );
 

GeoProcessorWPF/ui/optionswin/vm/OptionsVM.cs

@@ -21,6 +21,7 @@
 using System.Text.Json;
 using System.Windows.Input;
 using J4JSoftware.DependencyInjection;
+using J4JSoftware.Logging;
 using MahApps.Metro.Controls.Dialogs;
 using Microsoft.Extensions.Options;
 using Microsoft.Toolkit.Mvvm.ComponentModel;
@@ -32,7 +33,8 @@ public class OptionsVM : ObservableRecipient
     {
         private readonly IAppConfig _appConfig;
         private readonly IUserConfig _userConfig;
-        private readonly J4JHostInfo _hostInfo;
+        private readonly string _appConfigFolder;
+        private readonly string _userConfigFolder;
 
         private CachedAppConfig _cachedAppConfig;
         private UserConfig _prevUserConfig;
@@ -42,12 +44,13 @@ public class OptionsVM : ObservableRecipient
         public OptionsVM(
             IAppConfig appConfig,
             IUserConfig userConfig,
-            J4JHostInfo hostInfo
+            IJ4JHost host
         )
         {
             _appConfig = appConfig;
             _userConfig = userConfig;
-            _hostInfo = hostInfo;
+            _appConfigFolder = host.ApplicationConfigurationFolder;
+            _userConfigFolder = host.UserConfigurationFolder;
 
             SaveCommand = new RelayCommand( SaveCommandHandlerAsync );
             ReloadCommand = new RelayCommand( ReloadCommandHandler );
@@ -116,15 +119,15 @@ private async void SaveCommandHandlerAsync()
             var userText = JsonSerializer.Serialize( _userConfig, options );
 
             await File.WriteAllTextAsync(
-                Path.Combine( _hostInfo.UserConfigurationFolder, ViewModelLocator.UserConfigFile ),
+                Path.Combine( _userConfigFolder, ViewModelLocator.UserConfigFile ),
                 userText );
 
             _prevUserConfig = _userConfig.Copy();
 
             var appText = JsonSerializer.Serialize( _appConfig, options );
 
             await File.WriteAllTextAsync(
-                Path.Combine( _hostInfo.ApplicationConfigurationFolder, ViewModelLocator.AppConfigFile ),
+                Path.Combine( _appConfigFolder, ViewModelLocator.AppConfigFile ),
                 appText );
 
             _cachedAppConfig = new CachedAppConfig( _appConfig );