Merge pull request #346 from RandallFlagg/CodeCleanup

Hirogen · web-flow · commit 93ba11467299 · 2025-03-14T08:26:21.000+01:00
Code Improvements
diff --git a/src/ColumnizerLib/ColumnizerLib.csproj b/src/ColumnizerLib/ColumnizerLib.csproj
@@ -5,7 +5,6 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>LogExpert</RootNamespace>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-    <ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
     <DocumentationFile>$(SolutionDir)..\bin\Docs\ColumnizerLib.xml</DocumentationFile>
 	<IsTestProject>false</IsTestProject>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/src/CsvColumnizer/CsvColumnizer.cs b/src/CsvColumnizer/CsvColumnizer.cs
@@ -6,8 +6,10 @@
 using System.IO;
 using System.Linq;
 using System.Reflection;
+using System.Runtime.Versioning;
 using System.Windows.Forms;
 
+[assembly: SupportedOSPlatform("windows")]
 namespace CsvColumnizer
 {
     /// <summary>
diff --git a/src/CsvColumnizer/CsvColumnizer.csproj b/src/CsvColumnizer/CsvColumnizer.csproj
@@ -10,7 +10,6 @@
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <OutputPath>$(SolutionDir)..\bin\$(Configuration)\plugins</OutputPath>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
-    <NoWarn>CA1416;</NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <Optimize>False</Optimize>
diff --git a/src/DefaultPlugins/DefaultPlugins.csproj b/src/DefaultPlugins/DefaultPlugins.csproj
@@ -10,7 +10,6 @@
     <ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <OutputPath>$(SolutionDir)..\bin\$(Configuration)\plugins</OutputPath>
-    <NoWarn>CA1416;</NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <Optimize>False</Optimize>
diff --git a/src/DefaultPlugins/Eminus.cs b/src/DefaultPlugins/Eminus.cs
@@ -6,7 +6,9 @@
 using System.IO;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
+using System.Runtime.Versioning;
 
+[assembly: SupportedOSPlatform("windows")]
 namespace LogExpert
 {
     public class Eminus : IContextMenuEntry, ILogExpertPluginConfigurator
diff --git a/src/FlashIconHighlighter/FlashIconHighlighter.csproj b/src/FlashIconHighlighter/FlashIconHighlighter.csproj
@@ -9,7 +9,6 @@
     <ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <OutputPath>$(SolutionDir)..\bin\$(Configuration)\plugins</OutputPath>
-    <NoWarn>CA1416;</NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <Optimize>False</Optimize>
diff --git a/src/FlashIconHighlighter/FlashIconPlugin.cs b/src/FlashIconHighlighter/FlashIconPlugin.cs
@@ -2,8 +2,10 @@
 
 using System;
 using System.Runtime.InteropServices;
+using System.Runtime.Versioning;
 using System.Windows.Forms;
 
+[assembly: SupportedOSPlatform("windows")]
 namespace FlashIconHighlighter
 {
     internal class FlashIconPlugin : IKeywordAction
diff --git a/src/Log4jXmlColumnizer/Log4jXmlColumnizer.cs b/src/Log4jXmlColumnizer/Log4jXmlColumnizer.cs
@@ -1,14 +1,14 @@
-﻿using System;
+﻿using Newtonsoft.Json;
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
 using System.Linq;
-using System.Runtime.Serialization.Formatters.Binary;
 using System.Runtime.Serialization;
+using System.Runtime.Versioning;
 using System.Windows.Forms;
-using Newtonsoft.Json;
-
 
+[assembly: SupportedOSPlatform("windows")]
 namespace LogExpert
 {
     /// <summary>
diff --git a/src/Log4jXmlColumnizer/Log4jXmlColumnizer.csproj b/src/Log4jXmlColumnizer/Log4jXmlColumnizer.csproj
@@ -9,7 +9,6 @@
     <ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <OutputPath>$(SolutionDir)..\bin\$(Configuration)\plugins</OutputPath>
-    <NoWarn>CA1416;</NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <Optimize>False</Optimize>
diff --git a/src/LogExpert/Controls/LogTabWindow/LogTabWindow.cs b/src/LogExpert/Controls/LogTabWindow/LogTabWindow.cs
@@ -273,8 +273,6 @@ public void ChangeTheme(Control.ControlCollection container)
 
         private delegate void LoadMultiFilesDelegate(string[] fileName, EncodingOptions encodingOptions);
 
-        private delegate void ProgressBarEventFx(ProgressEventArgs e);
-
         private delegate void SetColumnizerFx(ILogLineColumnizer columnizer);
 
         private delegate void SetTabIconDelegate(LogWindow.LogWindow logWindow, Icon icon);
diff --git a/src/LogExpert/Controls/LogTabWindow/LogTabWindowEventHandlers.cs b/src/LogExpert/Controls/LogTabWindow/LogTabWindowEventHandlers.cs
@@ -353,7 +353,7 @@ private void OnBookmarkRemoved(object sender, EventArgs e)
 
         private void OnProgressBarUpdate(object sender, ProgressEventArgs e)
         {
-            Invoke(new ProgressBarEventFx(ProgressBarUpdateWorker), e);
+            Invoke(ProgressBarUpdateWorker, e);
         }
 
         private void OnStatusLineEvent(object sender, StatusLineEventArgs e)
diff --git a/src/LogExpert/Controls/LogWindow/LogWindow.cs b/src/LogExpert/Controls/LogWindow/LogWindow.cs
@@ -614,10 +614,6 @@ private void OnButtonSizeChanged(object sender, EventArgs e)
 
         // used for external wait fx WaitForLoadFinished()
 
-        private delegate void UpdateProgressCallback(LoadFileEventArgs e);
-
-        private delegate void LoadingStartedFx(LoadFileEventArgs e);
-
         private delegate void SelectLineFx(int line, bool triggerSyncCall);
 
         private Action<FilterParams, List<int>, List<int>, List<int>> FilterFxAction;
diff --git a/src/LogExpert/Controls/LogWindow/LogWindowEventHandlers.cs b/src/LogExpert/Controls/LogWindow/LogWindowEventHandlers.cs
@@ -122,7 +122,7 @@ private void OnLogWindowDisposed(object sender, EventArgs e)
 
         private void OnLogFileReaderLoadingStarted(object sender, LoadFileEventArgs e)
         {
-            Invoke(new LoadingStartedFx(LoadingStarted), e);
+            Invoke(LoadingStarted, e);
         }
 
         private void OnLogFileReaderFinishedLoading(object sender, EventArgs e)
@@ -211,16 +211,11 @@ private void OnLogFileReaderLoadFile(object sender, LoadFileEventArgs e)
                 //Thread loadThread = new Thread(new ThreadStart(ReloadNewFile));
                 //loadThread.Start();
                 _logger.Debug("Reloading invoked.");
-                return;
             }
-
-            if (!_isLoading)
+            else if (_isLoading)
             {
-                return;
+                BeginInvoke(UpdateProgress, e);
             }
-
-            UpdateProgressCallback callback = UpdateProgress;
-            BeginInvoke(callback, e);
         }
 
         private void OnFileSizeChanged(object sender, LogEventArgs e)
diff --git a/src/LogExpert/Controls/LogWindow/LogWindowPrivate.cs b/src/LogExpert/Controls/LogWindow/LogWindowPrivate.cs
@@ -1581,7 +1581,6 @@ private void StatusLineFileSize(long size)
 
         private int Search(SearchParams searchParams)
         {
-            UpdateProgressBarFx progressFx = UpdateProgressBar;
             if (searchParams.searchText == null)
             {
                 return -1;
@@ -1679,7 +1678,7 @@ private int Search(SearchParams searchParams)
                     {
                         if (!Disposing)
                         {
-                            Invoke(progressFx, [count]);
+                            Invoke(UpdateProgressBar, [count]);
                         }
                     }
                     catch (ObjectDisposedException ex) // can occur when closing the app while searching
diff --git a/src/LogExpert/Controls/LogWindow/LogWindowsPublic.cs b/src/LogExpert/Controls/LogWindow/LogWindowsPublic.cs
@@ -81,8 +81,10 @@ public void LoadFile(string fileName, EncodingOptions encodingOptions)
 
                 try
                 {
-                    _logFileReader = new LogfileReader(fileName, EncodingOptions, IsMultiFile, Preferences.bufferCount, Preferences.linesPerBuffer, _multiFileOptions);
-                    _logFileReader.UseNewReader = !Preferences.useLegacyReader;
+                    _logFileReader = new LogfileReader(fileName, EncodingOptions, IsMultiFile, Preferences.bufferCount, Preferences.linesPerBuffer, _multiFileOptions)
+                    {
+                        UseNewReader = !Preferences.useLegacyReader
+                    };
                 }
                 catch (LogFileException lfe)
                 {
diff --git a/src/LogExpert/Entities/EventArgs/LoadFileEventArgs.cs b/src/LogExpert/Entities/EventArgs/LoadFileEventArgs.cs
@@ -1,38 +1,4 @@
-﻿//using System.Linq;
-
-namespace LogExpert.Entities.EventArgs
+﻿namespace LogExpert.Entities.EventArgs
 {
-    public class LoadFileEventArgs
-    {
-        #region Fields
-
-        #endregion
-
-        #region cTor
-
-        public LoadFileEventArgs(string fileName, long pos, bool finished, long fileSize, bool newFile)
-        {
-            this.FileName = fileName;
-            this.ReadPos = pos;
-            this.Finished = finished;
-            this.FileSize = fileSize;
-            this.NewFile = newFile;
-        }
-
-        #endregion
-
-        #region Properties
-
-        public long ReadPos { get; }
-
-        public bool Finished { get; }
-
-        public long FileSize { get; }
-
-        public bool NewFile { get; }
-
-        public string FileName { get; }
-
-        #endregion
-    }
+    public record LoadFileEventArgs(string FileName, long ReadPos, bool Finished, long FileSize, bool NewFile);
 }
diff --git a/src/LogExpert/LogExpert.csproj b/src/LogExpert/LogExpert.csproj
@@ -17,8 +17,8 @@
     <OutputPath>$(SolutionDir)..\bin\$(Configuration)</OutputPath>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     <ApplicationHighDpiMode>PerMonitorV2</ApplicationHighDpiMode>
-	<ForceDesignerDPIUnaware>true</ForceDesignerDPIUnaware>
-    <NoWarn>CS1591;CA1416;</NoWarn>
+    <ForceDesignerDPIUnaware>true</ForceDesignerDPIUnaware>
+    <NoWarn>CS1591;</NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <Optimize>False</Optimize>
diff --git a/src/RegexColumnizer.UnitTests/RegexColumnizerTests.cs b/src/RegexColumnizer.UnitTests/RegexColumnizerTests.cs
@@ -1,9 +1,9 @@
 ﻿using LogExpert;
-
 using Moq;
-
 using NUnit.Framework;
+using System.Runtime.Versioning;
 
+[assembly: SupportedOSPlatform("windows")]
 namespace RegexColumnizer.UnitTests
 {
     [TestFixture]
diff --git a/src/RegexColumnizer/RegexColumnizer.cs b/src/RegexColumnizer/RegexColumnizer.cs
@@ -2,10 +2,12 @@
 using System;
 using System.IO;
 using System.Linq;
+using System.Runtime.Versioning;
 using System.Text.RegularExpressions;
 using System.Windows.Forms;
 using System.Xml.Serialization;
 
+[assembly: SupportedOSPlatform("windows")]
 namespace RegexColumnizer
 {
     public abstract class BaseRegexColumnizer : ILogLineColumnizer, IColumnizerConfigurator
@@ -122,16 +124,16 @@ public void PushValue(ILogLineColumnizerCallback callback, int column, string va
 
         public void Configure(ILogLineColumnizerCallback callback, string configDir)
         {
-            RegexColumnizerConfigDialog d = new RegexColumnizerConfigDialog {Config = Config};
-            if (d.ShowDialog() == DialogResult.OK)
+            RegexColumnizerConfigDialog dialog = new RegexColumnizerConfigDialog {Config = Config};
+            if (dialog.ShowDialog() == DialogResult.OK)
             {
                 var configFile = GetConfigFile(configDir);
                 using (var w = new FileStream(configFile, FileMode.Create))
                 {
-                    xml.Serialize(w, d.Config);
+                    xml.Serialize(w, dialog.Config);
                 }
 
-                Init(d.Config);
+                Init(dialog.Config);
             }
         }
 
diff --git a/src/RegexColumnizer/RegexColumnizer.csproj b/src/RegexColumnizer/RegexColumnizer.csproj
@@ -9,7 +9,6 @@
     <ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <OutputPath>$(SolutionDir)..\bin\$(Configuration)\plugins</OutputPath>
-    <NoWarn>CA1416;</NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <Optimize>False</Optimize>
diff --git a/src/SftpFileSystemx64/ConfigDialog.cs b/src/SftpFileSystemx64/ConfigDialog.cs
@@ -1,6 +1,8 @@
 ﻿using System;
+using System.Runtime.Versioning;
 using System.Windows.Forms;
 
+[assembly: SupportedOSPlatform("windows")]
 namespace SftpFileSystem
 {
     public partial class ConfigDialog : Form
diff --git a/src/SftpFileSystemx64/SftpFileSystemx64.csproj b/src/SftpFileSystemx64/SftpFileSystemx64.csproj
@@ -11,7 +11,6 @@
     <ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <OutputPath>$(SolutionDir)..\bin\$(Configuration)\plugins</OutputPath>
-    <NoWarn>CA1416;</NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <Optimize>False</Optimize>
diff --git a/src/SftpFileSystemx86/SftpFileSystemx86.csproj b/src/SftpFileSystemx86/SftpFileSystemx86.csproj
@@ -12,7 +12,6 @@
     <AssemblyTitle>SftpFileSystemx86</AssemblyTitle>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <OutputPath>$(SolutionDir)..\bin\$(Configuration)\pluginsx86</OutputPath>
-    <NoWarn>CA1416;</NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <Optimize>False</Optimize>

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,9 @@`
`6`	`6`	`using System.IO;`
`7`	`7`	`using System.Runtime.Serialization;`
`8`	`8`	`using Newtonsoft.Json;`
	`9`	`+using System.Runtime.Versioning;`
`9`	`10`
	`11`	`+[assembly: SupportedOSPlatform("windows")]`
`10`	`12`	`namespace LogExpert`
`11`	`13`	`{`
`12`	`14`	`public class Eminus : IContextMenuEntry, ILogExpertPluginConfigurator`
Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,10 @@`
`2`	`2`
`3`	`3`	`using System;`
`4`	`4`	`using System.Runtime.InteropServices;`
	`5`	`+using System.Runtime.Versioning;`
`5`	`6`	`using System.Windows.Forms;`
`6`	`7`
	`8`	`+[assembly: SupportedOSPlatform("windows")]`
`7`	`9`	`namespace FlashIconHighlighter`
`8`	`10`	`{`
`9`	`11`	`internal class FlashIconPlugin : IKeywordAction`