Merge pull request #378 from LogExperts/decouple_ui_businesslogic

Decouple UI businesslogic

Author: Hirogen

src/AutoColumnizer/AutoColumnizer.cs

@@ -1,9 +1,6 @@
 using LogExpert;
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace AutoColumnizer
 {

src/CsvColumnizer/CsvColumn.cs

@@ -1,19 +1,10 @@
 namespace CsvColumnizer
 {
-    internal class CsvColumn
+    internal class CsvColumn(string name)
     {
-        #region cTor
-
-        public CsvColumn(string name)
-        {
-            Name = name;
-        }
-
-        #endregion
-
         #region Properties
 
-        public string Name { get; }
+        public string Name { get; } = name;
 
         #endregion
     }

src/CsvColumnizer/CsvColumnizer.cs

@@ -26,7 +26,7 @@ public class CsvColumnizer : ILogLineColumnizer, IInitColumnizer, IColumnizerCon
 
         private static readonly string _configFileName = "csvcolumnizer.json";
 
-        private readonly IList<CsvColumn> _columnList = new List<CsvColumn>();
+        private readonly IList<CsvColumn> _columnList = [];
         private CsvColumnizerConfig _config;
 
         private ILogLine _firstLine;
@@ -47,14 +47,12 @@ public string PreProcessLine(string logLine, int lineNum, int realLineNum)
 
                 if (_config.MinColumns > 0)
                 {
-                    using (CsvReader csv = new CsvReader(new StringReader(logLine), _config.ReaderConfiguration))
+                    using CsvReader csv = new(new StringReader(logLine), _config.ReaderConfiguration);
+                    if (csv.Parser.Count < _config.MinColumns)
                     {
-                        if (csv.Parser.Count < _config.MinColumns)
-                        {
-                            // on invalid CSV don't hide the first line from LogExpert, since the file will be displayed in plain mode
-                            _isValidCsv = false;
-                            return logLine;
-                        }
+                        // on invalid CSV don't hide the first line from LogExpert, since the file will be displayed in plain mode
+                        _isValidCsv = false;
+                        return logLine;
                     }
                 }
 
@@ -120,9 +118,11 @@ public IColumnizedLogLine SplitLine(ILogLineColumnizerCallback callback, ILogLin
 
         private static ColumnizedLogLine CreateColumnizedLogLine(ILogLine line)
         {
-            ColumnizedLogLine cLogLine = new ColumnizedLogLine();
-            cLogLine.LogLine = line;
-            cLogLine.ColumnValues = new IColumn[] { new Column { FullValue = line.FullLine, Parent = cLogLine } };
+            ColumnizedLogLine cLogLine = new()
+            {
+                LogLine = line
+            };
+            cLogLine.ColumnValues = [new Column { FullValue = line.FullLine, Parent = cLogLine }];
             return cLogLine;
         }
 
@@ -194,16 +194,17 @@ public void DeSelected(ILogLineColumnizerCallback callback)
         public void Configure(ILogLineColumnizerCallback callback, string configDir)
         {
             string configPath = configDir + "\\" + _configFileName;
-            FileInfo fileInfo = new FileInfo(configPath);
+            FileInfo fileInfo = new(configPath);
+
+            CsvColumnizerConfigDlg dlg = new(_config);
 
-            CsvColumnizerConfigDlg dlg = new CsvColumnizerConfigDlg(_config);
             if (dlg.ShowDialog() == DialogResult.OK)
             {
                 _config.VersionBuild = Assembly.GetExecutingAssembly().GetName().Version.Build;
 
-                using (StreamWriter sw = new StreamWriter(fileInfo.Create()))
+                using (StreamWriter sw = new(fileInfo.Create()))
                 {
-                    JsonSerializer serializer = new JsonSerializer();
+                    JsonSerializer serializer = new();
                     serializer.Serialize(sw, _config);
                 }
 
@@ -256,31 +257,31 @@ public Priority GetPriority(string fileName, IEnumerable<ILogLine> samples)
 
         private IColumnizedLogLine SplitCsvLine(ILogLine line)
         {
-            ColumnizedLogLine cLogLine = new ColumnizedLogLine();
-            cLogLine.LogLine = line;
-
-            using (CsvReader csv = new CsvReader(new StringReader(line.FullLine), _config.ReaderConfiguration))
+            ColumnizedLogLine cLogLine = new()
             {
-                csv.Read();
-                csv.ReadHeader();
+                LogLine = line
+            };
 
-                //we only read line by line and not the whole file so it is always the header
-                string[] records = csv.HeaderRecord;
+            using CsvReader csv = new(new StringReader(line.FullLine), _config.ReaderConfiguration);
+            csv.Read();
+            csv.ReadHeader();
 
-                if (records != null)
-                {
-                    List<Column> columns = new List<Column>();
+            //we only read line by line and not the whole file so it is always the header
+            string[] records = csv.HeaderRecord;
 
-                    foreach (string record in records)
-                    {
-                        columns.Add(new Column { FullValue = record, Parent = cLogLine });
-                    }
+            if (records != null)
+            {
+                List<Column> columns = [];
 
-                    cLogLine.ColumnValues = columns.Select(a => a as IColumn).ToArray();
+                foreach (string record in records)
+                {
+                    columns.Add(new Column { FullValue = record, Parent = cLogLine });
                 }
 
-                return cLogLine;
+                cLogLine.ColumnValues = columns.Select(a => a as IColumn).ToArray();
             }
+
+            return cLogLine;
         }
 
         #endregion

src/CsvColumnizer/CsvColumnizerConfig.cs

@@ -1,8 +1,10 @@
-using System;
-using System.Globalization;
-using CsvHelper.Configuration;
+using CsvHelper.Configuration;
+
 using Newtonsoft.Json;
 
+using System;
+using System.Globalization;
+
 namespace CsvColumnizer
 {
     [Serializable]
@@ -13,13 +15,13 @@ public class CsvColumnizerConfig
         public char CommentChar { get; set; }
 
         public string DelimiterChar { get; set; }
-        
+
         public char EscapeChar { get; set; }
-        
+
         public bool HasFieldNames { get; set; }
-        
+
         public int MinColumns { get; set; }
-        
+
         public char QuoteChar { get; set; }
 
         public int VersionBuild { get; set; }

src/CsvColumnizer/CsvLogLine.cs

@@ -2,23 +2,16 @@
 
 namespace CsvColumnizer
 {
-    public class CsvLogLine : ILogLine
+    public class CsvLogLine(string fullLine, int lineNumber) : ILogLine
     {
-        public CsvLogLine(string fullLine, int lineNumber)
-        {
-            FullLine = fullLine;
-            LineNumber = lineNumber;
-        }
-
         #region Properties
 
-        public string FullLine { get; set; }
+        public string FullLine { get; set; } = fullLine;
 
-        public int LineNumber { get; set; }
+        public int LineNumber { get; set; } = lineNumber;
 
         string ITextValue.Text => FullLine;
 
         #endregion
     }
-
 }

src/DefaultPlugins/Eminus.cs

@@ -1,12 +1,13 @@
-using System;
+using Newtonsoft.Json;
+
+using System;
 using System.Collections.Generic;
-using System.Xml;
-using System.Windows.Forms;
-using System.Net.Sockets;
 using System.IO;
+using System.Net.Sockets;
 using System.Runtime.Serialization;
-using Newtonsoft.Json;
 using System.Runtime.Versioning;
+using System.Windows.Forms;
+using System.Xml;
 
 [assembly: SupportedOSPlatform("windows")]
 namespace LogExpert
@@ -26,10 +27,7 @@ public class Eminus : IContextMenuEntry, ILogExpertPluginConfigurator
 
         #region Properties
 
-        public string Text
-        {
-            get { return "eminus"; }
-        }
+        public string Text => "eminus";
 
         #endregion
 
@@ -49,15 +47,15 @@ private XmlDocument BuildParam(ILogLine line)
 
                 pos += "created in ".Length;
                 int endPos = temp.IndexOf(dot, pos);
-                
+
                 if (endPos == -1)
                 {
                     return null;
                 }
 
                 string className = temp[pos..endPos];
                 pos = temp.IndexOf(doubleDot, pos);
-                
+
                 if (pos == -1)
                 {
                     return null;
@@ -76,7 +74,7 @@ private XmlDocument BuildParam(ILogLine line)
                 int pos = str.IndexOf("at ") + 3;
                 str = str[pos..]; // remove 'at '
                 int idx = str.IndexOfAny(['(', '$', '<']);
-                
+
                 if (idx != -1)
                 {
                     if (str[idx] == '$')
@@ -94,19 +92,19 @@ private XmlDocument BuildParam(ILogLine line)
                     }
 
                     idx = str.LastIndexOf(':');
-                    
+
                     if (idx == -1)
                     {
                         return null;
                     }
 
                     pos = str.IndexOf(')', idx);
-                    
+
                     if (pos == -1)
                     {
                         return null;
                     }
-                    
+
                     lineNum = str.Substring(idx + 1, pos - idx - 1);
                 }
                 /*
@@ -230,9 +228,9 @@ public void SaveConfig(string configDir)
             FileInfo fileInfo = new(configDir + Path.DirectorySeparatorChar + CFG_FILE_NAME);
 
             dlg?.ApplyChanges();
-            
+
             _config = tmpConfig.Clone();
-            
+
             using StreamWriter sw = new(fileInfo.Create());
             JsonSerializer serializer = new();
             serializer.Serialize(sw, _config);
@@ -245,8 +243,10 @@ public bool HasEmbeddedForm()
 
         public void ShowConfigForm(object panel)
         {
-            dlg = new EminusConfigDlg(tmpConfig);
-            dlg.Parent = (Panel)panel;
+            dlg = new EminusConfigDlg(tmpConfig)
+            {
+                Parent = (Panel)panel
+            };
             dlg.Show();
         }
 
@@ -257,9 +257,12 @@ public void ShowConfigForm(object panel)
         /// <param name="owner"></param>
         public void ShowConfigDialog(object owner)
         {
-            dlg = new EminusConfigDlg(tmpConfig);
-            dlg.TopLevel = true;
-            dlg.Owner = (Form)owner;
+            dlg = new EminusConfigDlg(tmpConfig)
+            {
+                TopLevel = true,
+                Owner = (Form)owner
+            };
+
             dlg.ShowDialog();
             dlg.ApplyChanges();
         }

src/DefaultPlugins/EminusConfig.cs

@@ -17,10 +17,12 @@ public class EminusConfig
 
         public EminusConfig Clone()
         {
-            EminusConfig config = new();
-            config.host = host;
-            config.port = port;
-            config.password = password;
+            EminusConfig config = new()
+            {
+                host = host,
+                port = port,
+                password = password
+            };
             return config;
         }
 

src/DefaultPlugins/EminusConfigDlg.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Drawing;
 using System.Windows.Forms;
 
 namespace LogExpert
@@ -13,13 +14,21 @@ public partial class EminusConfigDlg : Form
 
         public EminusConfigDlg(EminusConfig config)
         {
+            SuspendLayout();
+
+            AutoScaleDimensions = new SizeF(96F, 96F);
+            AutoScaleMode = AutoScaleMode.Dpi;
+
             InitializeComponent();
+
             TopLevel = false;
             Config = config;
 
             hostTextBox.Text = config.host;
-            portTextBox.Text = "" + config.port;
+            portTextBox.Text = string.Empty + config.port;
             passwordTextBox.Text = config.password;
+
+            ResumeLayout();
         }
 
         #endregion