From 2f1b2f42f6e558ecbcd80afa2de8500abf29d445 Mon Sep 17 00:00:00 2001
From: cuqmbr <dr.juniorf@gmail.com>
Date: Tue, 23 Aug 2022 13:52:41 +0300
Subject: [PATCH] fix: fix verbose option

This fixes the broken behaviour of th verbose option by moving logger configuration call options handler
---
 netxml2kml/Methods/CliOptionsHandlers.cs | 3 +++
 netxml2kml/Methods/Helpers.cs            | 4 ----
 netxml2kml/Methods/RuntimeStorage.cs     | 7 +++++--
 netxml2kml/Program.cs                    | 7 -------
 4 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/netxml2kml/Methods/CliOptionsHandlers.cs b/netxml2kml/Methods/CliOptionsHandlers.cs
index ac4bf58..2b3a866 100644
--- a/netxml2kml/Methods/CliOptionsHandlers.cs
+++ b/netxml2kml/Methods/CliOptionsHandlers.cs
@@ -12,6 +12,9 @@ public static class CliOptionsHandlers
         FileInfo? outputFile, bool useDatabase, string? sqlQuery,
         IEnumerable<FileInfo>? concatFiles, bool isVerbose)
     {
+        RuntimeStorage.IsVerbose = isVerbose;
+        RuntimeStorage.ConfigureLogger();
+        
         Log.Information("Handler started with options: " +
                         "-i: {input}; -o {output}; -d {useDatabase}; " +
                         "-q: {sqlQuery}; -c: {concatFiles}; -v: {verbosityLevel}.",
diff --git a/netxml2kml/Methods/Helpers.cs b/netxml2kml/Methods/Helpers.cs
index a00ca9f..04784da 100644
--- a/netxml2kml/Methods/Helpers.cs
+++ b/netxml2kml/Methods/Helpers.cs
@@ -86,8 +86,6 @@ public static class Helpers
             {"Dec", 12},
         };
 
-        Log.Debug("Converting string {dateString} to date...", dateString);
-        
         var year = Int32.Parse(dateString.Split(" ")[4]);
         var month = monthNameNumber[dateString.Split(" ")[1]];
         var day = Int32.Parse(dateString.Split(" ")[2]);
@@ -95,8 +93,6 @@ public static class Helpers
         var minute = Int32.Parse(dateString.Split(" ")[3].Split(":")[1]);
         var second = Int32.Parse(dateString.Split(" ")[3].Split(":")[2]);
 
-        Log.Debug("String converted successfully.");
-
         return new DateTime(year, month, day, hour, minute, second);
     }
 
diff --git a/netxml2kml/Methods/RuntimeStorage.cs b/netxml2kml/Methods/RuntimeStorage.cs
index aa2a7a7..f1295e5 100644
--- a/netxml2kml/Methods/RuntimeStorage.cs
+++ b/netxml2kml/Methods/RuntimeStorage.cs
@@ -15,12 +15,15 @@ public static class RuntimeStorage
 
     public static void ConfigureLogger()
     {
+        var logLevel =
+            IsVerbose ? LogEventLevel.Verbose : LogEventLevel.Warning;
+        
         Log.Logger = new LoggerConfiguration()
             .MinimumLevel.Verbose()
-            .WriteTo.Console(IsVerbose ? LogEventLevel.Verbose : LogEventLevel.Warning,
+            .WriteTo.Console(logLevel,
                 outputTemplate: "{Message:lj}{NewLine}{Exception}")
             .WriteTo.File(Path.Join(LogsFolder, "log.txt"),
-                restrictedToMinimumLevel: IsVerbose ? LogEventLevel.Verbose : LogEventLevel.Warning,
+                restrictedToMinimumLevel: logLevel,
                 rollingInterval: RollingInterval.Day)
             .CreateLogger();
     }
diff --git a/netxml2kml/Program.cs b/netxml2kml/Program.cs
index 19b9e99..4522743 100644
--- a/netxml2kml/Program.cs
+++ b/netxml2kml/Program.cs
@@ -182,13 +182,6 @@ class Program
             Arity = ArgumentArity.ZeroOrOne
         };
         
-        verboseOption.AddValidator(result =>
-        {
-            RuntimeStorage.IsVerbose = result.GetValueForOption(verboseOption);
-        });
-
-        RuntimeStorage.ConfigureLogger();
-        
         /*----------------------Root Command Setup-------------------------*/
 
         var rootCommand =