Library - Allow passing a date time format info for console and debug…

… logger Fixes #348
dokan-dev · Dec 30, 2023 · 21f2e5b · 21f2e5b
1 parent 3eea673
commit 21f2e5b
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 9 deletions.
diff --git a/DokanNet/Logging/ConsoleLogger.cs b/DokanNet/Logging/ConsoleLogger.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Globalization;
 using System.Threading.Tasks;
 
 namespace DokanNet.Logging
@@ -9,6 +10,7 @@ namespace DokanNet.Logging
     public class ConsoleLogger : ILogger, IDisposable
     {
         private readonly string _loggerName;
+        private readonly DateTimeFormatInfo _dateTimeFormatInfo;
         private readonly System.Collections.Concurrent.BlockingCollection<Tuple<String, ConsoleColor>> _PendingLogs
             = new System.Collections.Concurrent.BlockingCollection<Tuple<String, ConsoleColor>>();
 
@@ -19,9 +21,11 @@ private readonly System.Collections.Concurrent.BlockingCollection<Tuple<String,
         /// Initializes a new instance of the <see cref="ConsoleLogger"/> class.
         /// </summary>
         /// <param name="loggerName">Optional name to be added to each log line.</param>
-        public ConsoleLogger(string loggerName = "")
+        /// <param name="dateTimeFormatInfo">An object that supplies format information for DateTime.</param>
+        public ConsoleLogger(string loggerName = "", DateTimeFormatInfo dateTimeFormatInfo = null)
         {
             _loggerName = loggerName;
+            _dateTimeFormatInfo = dateTimeFormatInfo;
             _WriterTask = Task.Factory.StartNew(() =>
             {
                 foreach (var tuple in _PendingLogs.GetConsumingEnumerable())
@@ -78,7 +82,7 @@ private void WriteMessage(string message, ConsoleColor newColor)
             {
                 var origForegroundColor = Console.ForegroundColor;
                 Console.ForegroundColor = newColor;
-                Console.WriteLine(message.FormatMessageForLogging(true, loggerName: _loggerName));
+                Console.WriteLine(message.FormatMessageForLogging(true, loggerName: _loggerName, dateTimeFormatInfo: _dateTimeFormatInfo));
                 Console.ForegroundColor = origForegroundColor;
             }
         }

diff --git a/DokanNet/Logging/DebugViewLogger.cs b/DokanNet/Logging/DebugViewLogger.cs
@@ -1,4 +1,5 @@
-using System.Runtime.InteropServices;
+using System.Globalization;
+using System.Runtime.InteropServices;
 
 namespace DokanNet.Logging
 {
@@ -12,14 +13,17 @@ namespace DokanNet.Logging
     public class DebugViewLogger : ILogger
     {
         private readonly string _loggerName;
+        private readonly DateTimeFormatInfo _dateTimeFormatInfo;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="DebugViewLogger"/> class.
         /// </summary>
         /// <param name="loggerName">Optional name to be added to each log line.</param>
-        public DebugViewLogger(string loggerName = "")
+        /// <param name="dateTimeFormatInfo">An object that supplies format information for DateTime.</param>
+        public DebugViewLogger(string loggerName = "", DateTimeFormatInfo dateTimeFormatInfo = null)
         {
             _loggerName = loggerName;
+            _dateTimeFormatInfo = dateTimeFormatInfo;
         }
 
         /// <inheritdoc />
@@ -62,7 +66,7 @@ private void WriteMessageToDebugView(string category, string message, params obj
         {
             if (args?.Length > 0)
                 message = string.Format(message, args);
-            OutputDebugString(message.FormatMessageForLogging(category, _loggerName));
+            OutputDebugString(message.FormatMessageForLogging(category, _loggerName, _dateTimeFormatInfo));
         }
     }
 }
diff --git a/DokanNet/Logging/LoggerExtensions.cs b/DokanNet/Logging/LoggerExtensions.cs
@@ -15,13 +15,15 @@ public static class LoggerExtensions
         /// <param name="message">Message to format.</param>
         /// <param name="category">Optional category to add to the log message.</param>
         /// <param name="loggerName">Optional log name to at to the log message.</param>
+        /// <param name="dateTimeFormatInfo">An object that supplies format information for DateTime.</param>
         /// <returns>A formated log message.</returns>
         public static string FormatMessageForLogging(
             this string message,
             string category = null,
-            string loggerName = "")
+            string loggerName = "",
+            DateTimeFormatInfo dateTimeFormatInfo = null)
         {
-            return message.FormatMessageForLogging(false, category, loggerName);
+            return message.FormatMessageForLogging(false, category, loggerName, dateTimeFormatInfo);
         }
 
         /// <summary>
@@ -31,17 +33,19 @@ public static string FormatMessageForLogging(
         /// <param name="addDateTime">If date and time shout be added to the log message.</param>
         /// <param name="category">Optional category to add to the log message.</param>
         /// <param name="loggerName">Optional log name to at to the log message.</param>
+        /// <param name="dateTimeFormatInfo">An object that supplies format information for DateTime.</param>
         /// <returns>A formated log message.</returns>
         public static string FormatMessageForLogging(
             this string message,
             bool addDateTime = false,
             string category = null,
-            string loggerName = "")
+            string loggerName = "",
+            DateTimeFormatInfo dateTimeFormatInfo = null)
         {
             var stringBuilder = new StringBuilder();
             if (addDateTime)
             {
-                stringBuilder.AppendFormat("{0} - ", DateTime.Now.ToString(CultureInfo.InvariantCulture));
+                stringBuilder.AppendFormat("{0} - ", DateTime.Now.ToString((IFormatProvider)dateTimeFormatInfo ?? CultureInfo.InvariantCulture));
             }
 
             if (!string.IsNullOrEmpty(loggerName))