根据代码审查意见修改

Author: walterlv

src/DotNetCampus.Logger/Writers/ConsoleLogger.cs

@@ -15,13 +15,20 @@ namespace DotNetCampus.Logging.Writers;
 /// </summary>
 public class ConsoleLogger : ILogger
 {
+    private static readonly TextWriter Out = GetStandardOutputWriter();
+
     /// <summary>
-    /// 控制台光标控制是否启用。
+    /// 用于处理重复的日志，避免重复日志污染控制台输出内容。
     /// </summary>
-    private readonly bool _isCursorMovementEnabled;
     private readonly RepeatLoggerDetector _repeat;
-    private static bool _isConsoleOutput;
-    private static readonly TextWriter Out = GetStandardOutputWriter();
+
+    /// <summary>
+    /// 判断当前是否在控制台输出日志（否则可能在普通的标准输入流，被其他应用程序对接）。
+    /// </summary>
+    /// <remarks>
+    /// 如果在控制台输出，则可以使用 ASCII 控制码来修改颜色、控制光标移动。也可以用来获取控制台窗口信息。
+    /// </remarks>
+    private readonly bool _isConsoleOutput;
 
     /// <summary>
     /// 创建一个 <see cref="ConsoleLogger"/> 的新实例。
@@ -38,10 +45,7 @@ internal ConsoleLogger(ICoreLogWriter coreWriter, TagFilterManager? tagManager)
         _repeat = new RepeatLoggerDetector(ClearAndMoveToLastLine);
         CoreWriter = coreWriter;
         TagManager = tagManager;
-        _isConsoleOutput = Out == Console.Out;
-        var success = ConsoleInitializer.Initialize();
-        // 如果输出流是自己创建的，则不支持光标移动。
-        _isCursorMovementEnabled = _isConsoleOutput && success;
+        _isConsoleOutput = ConsoleInitializer.Initialize();
     }
 
     /// <summary>
@@ -179,7 +183,7 @@ string FirstLineFormatter(string m, int i) => logLevel is LogLevel.Critical
     /// <param name="repeatCount">此移动光标，是因为日志已重复第几次。</param>
     private void ClearAndMoveToLastLine(int repeatCount)
     {
-        if (!_isCursorMovementEnabled)
+        if (!_isConsoleOutput)
         {
             // 如果光标控制不可用，或者还没有重复次数，则不尝试移动光标。
             return;
@@ -256,10 +260,12 @@ private int SafeGetBufferWidth()
     {
         try
         {
-            return _isCursorMovementEnabled ? Console.WindowWidth : 0;
+            return _isConsoleOutput ? Console.WindowWidth : 0;
         }
         catch (IOException)
         {
+            // _isConsoleOutput 的条件已经非常苛刻了，足以确保 Console.WindowWidth 的获取不会出现异常。
+            // 这只是保险性捕获。
             return 0;
         }
     }

src/DotNetCampus.Logger/Writers/Helpers/TagFilterManager.cs

@@ -15,29 +15,17 @@ internal class TagFilterManager
     /// <summary>
     /// 当前已设置的任一标签。（无前缀）
     /// </summary>
-#if NET6_0_OR_GREATER
-    public required IReadOnlySet<string> AnyFilterTags { get; init; }
-#else
-    public required HashSet<string> AnyFilterTags { get; init; }
-#endif
+    internal required IReadOnlyList<string> AnyFilterTags { get; init; }
 
     /// <summary>
     /// 当前已设置的包含标签。（前缀为 +）
     /// </summary>
-#if NET6_0_OR_GREATER
-    public required IReadOnlySet<string> IncludingFilterTags { get; init; }
-#else
-    public required HashSet<string> IncludingFilterTags { get; init; }
-#endif
+    internal required IReadOnlyList<string> IncludingFilterTags { get; init; }
 
     /// <summary>
     /// 当前已设置的排除标签。（前缀为 -）
     /// </summary>
-#if NET6_0_OR_GREATER
-    public required IReadOnlySet<string> ExcludingFilterTags { get; init; }
-#else
-    public required HashSet<string> ExcludingFilterTags { get; init; }
-#endif
+    internal required IReadOnlyList<string> ExcludingFilterTags { get; init; }
 
     /// <summary>
     /// 判断某个日志是否满足当前标签过滤条件。
@@ -127,9 +115,9 @@ internal bool IsTagEnabled(string text)
             return null;
         }
 
-        HashSet<string> anyFilterTags = [];
-        HashSet<string> includingFilterTags = [];
-        HashSet<string> excludingFilterTags = [];
+        List<string> anyFilterTags = [];
+        List<string> includingFilterTags = [];
+        List<string> excludingFilterTags = [];
         var filterTags = value.Split([',', ';', ' ']);
         foreach (var tag in filterTags)
         {