Loggerrework (#45)

* test some refactoring for cachedplayer

* rework logging

* fix saving of log level

---------

Co-authored-by: rootdarkarchon <root.darkarchon@outlook.com>

MareSynchronos/MareConfiguration/ConfigurationMigrator.cs

@@ -2,17 +2,19 @@
 using MareSynchronos.MareConfiguration.Configurations;
 using MareSynchronos.MareConfiguration.Configurations.Obsolete;
 using MareSynchronos.MareConfiguration.Models;
-using MareSynchronos.Utils;
+using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
 
 namespace MareSynchronos.MareConfiguration;
 
 public class ConfigurationMigrator
 {
+    private readonly ILogger<ConfigurationMigrator> _logger;
     private readonly DalamudPluginInterface _pi;
 
-    public ConfigurationMigrator(DalamudPluginInterface pi)
+    public ConfigurationMigrator(ILogger<ConfigurationMigrator> logger, DalamudPluginInterface pi)
     {
+        _logger = logger;
         _pi = pi;
     }
 
@@ -21,9 +23,9 @@ public class ConfigurationMigrator
 #pragma warning disable CS0618 // ignore Obsolete tag, the point of this migrator is to migrate obsolete configs to new ones
         if (_pi.GetPluginConfig() is Configuration oldConfig)
         {
-            Logger.Info("Migrating Configuration from old config style to 1");
+            _logger.LogInformation("Migrating Configuration from old config style to 1");
 
-            var config = oldConfig.ToMareConfig();
+            var config = oldConfig.ToMareConfig(_logger);
             File.Move(_pi.ConfigFile.FullName, _pi.ConfigFile.FullName + ".old", overwrite: true);
             MigrateMareConfigV0ToV1(config);
         }
@@ -41,7 +43,7 @@ public class ConfigurationMigrator
 
     private void MigrateMareConfigV0ToV1(MareConfigV0 mareConfigV0)
     {
-        Logger.Info("Migrating Configuration from version 0 to 1");
+        _logger.LogInformation("Migrating Configuration from version 0 to 1");
         if (File.Exists(ConfigurationPath(MareConfigService.ConfigName)))
             File.Copy(ConfigurationPath(MareConfigService.ConfigName), ConfigurationPath(MareConfigService.ConfigName) + ".migrated." + mareConfigV0.Version + ".bak", true);
 

MareSynchronos/MareConfiguration/ConfigurationServiceBase.cs

@@ -1,6 +1,6 @@
 using Dalamud.Plugin;
 using MareSynchronos.MareConfiguration.Configurations;
-using MareSynchronos.Utils;
+using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
 
 namespace MareSynchronos.MareConfiguration;
@@ -44,7 +44,7 @@ public abstract class ConfigurationServiceBase<T> : IDisposable where T : IMareC
             var lastWriteTime = GetConfigLastWriteTime();
             if (lastWriteTime != _configLastWriteTime)
             {
-                Logger.Debug($"Config {ConfigurationName} changed, reloading config");
+                //_logger.LogDebug($"Config {ConfigurationName} changed, reloading config");
                 _currentConfigInternal = LazyConfig();
             }
         }
@@ -98,7 +98,7 @@ public abstract class ConfigurationServiceBase<T> : IDisposable where T : IMareC
             }
         }
 
-        Logger.Debug("Saving dirty config " + ConfigurationName);
+        //_logger.LogDebug("Saving dirty config " + ConfigurationName);
 
         try
         {
@@ -117,7 +117,7 @@ public abstract class ConfigurationServiceBase<T> : IDisposable where T : IMareC
 
     public void Dispose()
     {
-        Logger.Verbose($"Disposing {GetType()}");
+        //_logger.LogTrace($"Disposing {GetType()}");
         _periodicCheckCts.Cancel();
     }
 }

MareSynchronos/MareConfiguration/Configurations/MareConfig.cs

@@ -1,4 +1,5 @@
 using MareSynchronos.MareConfiguration.Models;
+using Microsoft.Extensions.Logging;
 
 namespace MareSynchronos.MareConfiguration.Configurations;
 
@@ -24,4 +25,5 @@ public class MareConfig : IMareConfiguration
     public NotificationLocation InfoNotification { get; set; } = NotificationLocation.Toast;
     public NotificationLocation WarningNotification { get; set; } = NotificationLocation.Both;
     public NotificationLocation ErrorNotification { get; set; } = NotificationLocation.Both;
+    public LogLevel LogLevel { get; set; } = LogLevel.Information;
 }

MareSynchronos/MareConfiguration/Configurations/Obsolete/Configuration.cs

@@ -1,8 +1,8 @@
 using Dalamud.Configuration;
 using Dalamud.Plugin;
 using MareSynchronos.MareConfiguration.Models;
-using MareSynchronos.Utils;
 using MareSynchronos.WebAPI;
+using Microsoft.Extensions.Logging;
 
 namespace MareSynchronos.MareConfiguration.Configurations.Obsolete;
 
@@ -56,28 +56,16 @@ public class Configuration : IPluginConfiguration
     public HashSet<string> OpenPairTags = new(StringComparer.Ordinal);
 
 
-    // the below exist just to make saving less cumbersome
-    public void Initialize(DalamudPluginInterface pluginInterface)
-    {
-        _pluginInterface = pluginInterface;
-
-        if (!Directory.Exists(CacheFolder))
-        {
-            InitialScanComplete = false;
-        }
-
-        Save();
-    }
-
     public void Save()
     {
         _pluginInterface!.SavePluginConfig(this);
     }
 
-    public MareConfigV0 ToMareConfig()
+    public MareConfigV0 ToMareConfig(ILogger logger)
     {
+
         MareConfigV0 newConfig = new();
-        Logger.Info("Migrating Config to MareConfig");
+        logger.LogInformation("Migrating Config to MareConfig");
 
         newConfig.AcceptedAgreement = AcceptedAgreement;
         newConfig.CacheFolder = CacheFolder;
@@ -95,7 +83,7 @@ public class Configuration : IPluginConfiguration
         // create all server storage based on current clientsecret
         foreach (var secret in ClientSecret)
         {
-            Logger.Debug("Migrating " + secret.Key);
+            logger.LogDebug("Migrating " + secret.Key);
             var apiuri = secret.Key;
             var secretkey = secret.Value;
             ServerStorageV0 toAdd = new();

MareSynchronos/MareConfiguration/MareConfigService.cs

@@ -1,5 +1,6 @@
 using Dalamud.Plugin;
 using MareSynchronos.MareConfiguration.Configurations;
+using Microsoft.Extensions.Logging;
 
 namespace MareSynchronos.MareConfiguration;
 

MareSynchronos/MareConfiguration/NotesConfigService.cs

@@ -1,5 +1,6 @@
 using Dalamud.Plugin;
 using MareSynchronos.MareConfiguration.Configurations;
+using Microsoft.Extensions.Logging;
 
 namespace MareSynchronos.MareConfiguration;
 

MareSynchronos/MareConfiguration/ServerConfigService.cs

@@ -1,5 +1,6 @@
 using Dalamud.Plugin;
 using MareSynchronos.MareConfiguration.Configurations;
+using Microsoft.Extensions.Logging;
 
 namespace MareSynchronos.MareConfiguration;
 

MareSynchronos/MareConfiguration/ServerTagConfigService.cs

@@ -1,5 +1,6 @@
 using Dalamud.Plugin;
 using MareSynchronos.MareConfiguration.Configurations;
+using Microsoft.Extensions.Logging;
 
 namespace MareSynchronos.MareConfiguration;
 

MareSynchronos/MareConfiguration/TransientConfigService.cs

@@ -1,5 +1,6 @@
 using Dalamud.Plugin;
 using MareSynchronos.MareConfiguration.Configurations;
+using Microsoft.Extensions.Logging;
 
 namespace MareSynchronos.MareConfiguration;