review comments

Author: Hirogen

src/LogExpert/Classes/Filter/FilterStarter.cs

@@ -149,7 +149,7 @@ private Filter DoWork(FilterParams filterParams, int startLine, int maxCount, Pr
             _logger.Info("Started Filter worker [{0}] for line {1}", Environment.CurrentManagedThreadId, startLine);
 
             // Give every thread own copies of ColumnizerCallback and FilterParams, because the state of the objects changes while filtering
-            FilterParams threadFilterParams = filterParams.Copy();
+            FilterParams threadFilterParams = filterParams.CopyCurrentColumnizer();
             ColumnizerCallback threadColumnizerCallback = _callback.CreateCopy();
 
             Filter filter = new(threadColumnizerCallback);

src/LogExpert/Classes/RangeFinder.cs

@@ -10,24 +10,12 @@ namespace LogExpert.Classes
     /// <summary>
     /// Delivers the range (from..to) that matches the current range filter settings starting from a given line.
     /// </summary>
-    public class RangeFinder
+    public class RangeFinder(FilterParams filterParams, ColumnizerCallback callback)
     {
         #region Fields
 
         private static readonly ILogger _logger = LogManager.GetCurrentClassLogger();
-
-        private readonly ColumnizerCallback _callback;
-        private readonly FilterParams _filterParams;
-
-        #endregion
-
-        #region cTor
-
-        public RangeFinder(FilterParams filterParams, ColumnizerCallback callback)
-        {
-            _filterParams = filterParams.Copy();
-            _callback = callback;
-        }
+        private readonly FilterParams _filterParams = filterParams.CopyCurrentColumnizer();
 
         #endregion
 
@@ -36,6 +24,7 @@ public RangeFinder(FilterParams filterParams, ColumnizerCallback callback)
         public Range FindRange(int startLine)
         {
             _logger.Info($"Starting range search for {_filterParams.SearchText} ... {_filterParams.RangeSearchText}");
+
             if (_filterParams.RangeSearchText == null || _filterParams.RangeSearchText.Trim().Length == 0)
             {
                 _logger.Info("Range search text not set. Cancelling range search.");
@@ -49,46 +38,54 @@ public Range FindRange(int startLine)
 
             _filterParams.IsRangeSearch = false;
             _filterParams.IsInRange = false;
-            int lineCount = _callback.GetLineCount();
+
+            int lineCount = callback.GetLineCount();
             int lineNum = startLine;
             bool foundStartLine = false;
+
             Range range = new();
-            FilterParams tmpParam = _filterParams.Copy();
+            FilterParams tmpParam = _filterParams.CopyCurrentColumnizer();
+
             tmpParam.SearchText = _filterParams.RangeSearchText;
 
             // search backward for starting keyword
-            var line = _callback.GetLogLine(lineNum);
+            var line = callback.GetLogLine(lineNum);
+
             while (lineNum >= 0)
             {
-                _callback.LineNum = lineNum;
-                if (Util.TestFilterCondition(_filterParams, line, _callback))
+                callback.LineNum = lineNum;
+
+                if (Util.TestFilterCondition(_filterParams, line, callback))
                 {
                     foundStartLine = true;
                     break;
                 }
                 lineNum--;
-                line = _callback.GetLogLine(lineNum);
-                if (lineNum < 0 || Util.TestFilterCondition(tmpParam, line, _callback)
-                ) // do not crash on Ctrl+R when there is not start line found
+                line = callback.GetLogLine(lineNum);
+
+                if (lineNum < 0 || Util.TestFilterCondition(tmpParam, line, callback)) // do not crash on Ctrl+R when there is not start line found
                 {
                     // lower range bound found --> we are not in between a valid range
                     break;
                 }
             }
+
             if (!foundStartLine)
             {
                 _logger.Info("Range start not found");
                 return null;
             }
+
             range.StartLine = lineNum;
             _filterParams.IsRangeSearch = true;
             _filterParams.IsInRange = true;
             lineNum++;
+
             while (lineNum < lineCount)
             {
-                line = _callback.GetLogLine(lineNum);
-                _callback.LineNum = lineNum;
-                if (!Util.TestFilterCondition(_filterParams, line, _callback))
+                line = callback.GetLogLine(lineNum);
+                callback.LineNum = lineNum;
+                if (!Util.TestFilterCondition(_filterParams, line, callback))
                 {
                     break;
                 }

src/Logexpert.Core/Classes/Filter/FilterParams.cs

@@ -9,8 +9,8 @@ public class FilterParams
     {
         #region Fields
 
-        private string _rangeSearchText = "";
-        private string _searchText = "";
+        private string _rangeSearchText = string.Empty;
+        private string _searchText = string.Empty;
 
         //public List<string> historyList = new List<string>();
         //public List<string> rangeHistoryList = new List<string>();
@@ -25,7 +25,7 @@ public string SearchText
             set
             {
                 _searchText = value;
-                LowerSearchText = _searchText.ToLower();
+                LowerSearchText = _searchText.ToLowerInvariant();
             }
         }
 
@@ -35,7 +35,7 @@ public string RangeSearchText
             set
             {
                 _rangeSearchText = value;
-                LowerRangeSearchText = _rangeSearchText.ToLower();
+                LowerRangeSearchText = _rangeSearchText.ToLowerInvariant();
             }
         }
 
@@ -105,7 +105,7 @@ public string RangeSearchText
 
         #region Public methods
 
-        public FilterParams Copy()
+        public FilterParams CopyCurrentColumnizer()
         {
             FilterParams newParams = MemberwiseCopy();
             newParams.Init();
@@ -143,6 +143,10 @@ public void CreateRegex()
             }
         }
 
+        /// <summary>
+        /// Shallow Copy
+        /// </summary>
+        /// <returns></returns>
         public FilterParams MemberwiseCopy()
         {
             return (FilterParams)MemberwiseClone();