Fixed multiline parsing and updated copyright

couchcoding · couchcoding · commit f9bc6c72465f · 2019-01-30T11:49:15.000+01:00
* Fixed issue #3: The custom file and directory receiver supports now multiline reading. * Updated copyright year to 2019. * Some minor UI improvements.
diff --git a/src/Couchcoding.Logbert.Gui/Properties/AssemblyInfo.cs b/src/Couchcoding.Logbert.Gui/Properties/AssemblyInfo.cs
@@ -9,7 +9,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Couchcoding")]
 [assembly: AssemblyProduct("Logbert Control Library")]
-[assembly: AssemblyCopyright("Copyright ©  2018 Couchcoding")]
+[assembly: AssemblyCopyright("Copyright ©  2019 Couchcoding")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.5.0.0")]
-[assembly: AssemblyFileVersion("1.5.0.0")]
+[assembly: AssemblyVersion("1.5.2.0")]
+[assembly: AssemblyFileVersion("1.5.2.0")]
diff --git a/src/Couchcoding.Logbert.Theme/Properties/AssemblyInfo.cs b/src/Couchcoding.Logbert.Theme/Properties/AssemblyInfo.cs
@@ -9,7 +9,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Couchcoding")]
 [assembly: AssemblyProduct("Logbert Theme Library")]
-[assembly: AssemblyCopyright("Copyright ©  2018 Couchcoding")]
+[assembly: AssemblyCopyright("Copyright ©  2019 Couchcoding")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.5.0.0")]
-[assembly: AssemblyFileVersion("1.5.0.0")]
+[assembly: AssemblyVersion("1.5.2.0")]
+[assembly: AssemblyFileVersion("1.5.2.0")]
diff --git a/src/Logbert/Dialogs/Docking/FrmWelcome.cs b/src/Logbert/Dialogs/Docking/FrmWelcome.cs
@@ -98,16 +98,25 @@ public FrmWelcome(MainForm mainForm)
       lstLogger.Items.Add(new CustomTcpReceiver());
       lstLogger.Items.Add(new CustomFileReceiver());
       lstLogger.Items.Add(new CustomDirReceiver());
-
-      RebuildMruList();
-
-      MruManager.MruListChanged += (_, __) => RebuildMruList();
     }
 
     #endregion
 
     #region Private Methods
 
+    /// <summary>
+    /// Raises the <see cref="E:System.Windows.Forms.Form.Shown"/> event.
+    /// </summary>
+    /// <param name="e">A <see cref="T:System.EventArgs"/> that contains the event data. </param>
+    protected override void OnShown(EventArgs e)
+    {
+      base.OnShown(e);
+
+      RebuildMruList();
+
+      MruManager.MruListChanged += (_, __) => RebuildMruList();
+    }
+
     /// <summary>Calculates the scroll offset to the specified child control. </summary>
     /// <returns>The upper-left hand <see cref="T:System.Drawing.Point" /> of the display area relative to the client area required to scroll the control into view.</returns>
     /// <param name="activeControl">The child control to scroll into view. </param>
@@ -194,7 +203,9 @@ private void RebuildMruList()
           DisabledLinkColor = ThemeManager.CurrentApplicationTheme.ColorPalette.ContentForegroundDimmed,
           LinkBehavior      = LinkBehavior.HoverUnderline,
           Padding           = new Padding(0, 0, 0, 10),
-          AutoSize          = true
+          AutoSize          = false,
+          Width             = flRecentFiles.Width - (flRecentFiles.Padding.Left + flRecentFiles.Padding.Right),
+          Height            = 26
         };
 
         recentFileLink.LinkClicked += RecentFileClicked;
diff --git a/src/Logbert/Dialogs/FrmAbout.Designer.cs b/src/Logbert/Dialogs/FrmAbout.Designer.cs
diff --git a/src/Logbert/Dialogs/FrmAbout.resx b/src/Logbert/Dialogs/FrmAbout.resx
@@ -120,7 +120,7 @@
   <data name="txtLicense.Text" xml:space="preserve">
     <value>The MIT License (MIT)
 
-Copyright (c) 2018 Couchcoding
+Copyright (c) 2019 Couchcoding
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/src/Logbert/Logging/LogMessageCustom.cs b/src/Logbert/Logging/LogMessageCustom.cs
@@ -126,7 +126,7 @@ private bool ParseData(string data)
     {
       for (int i = 0; i < mColumnizer.Columns.Count; ++i)
       {
-        Match mtc = Regex.Match(data, mColumnizer.Columns[i].Expression);
+        Match mtc = Regex.Match(data, mColumnizer.Columns[i].Expression, RegexOptions.Multiline);
 
         if (!mtc.Success && !mColumnizer.Columns[i].Optional)
         {
diff --git a/src/Logbert/Properties/AssemblyInfo.cs b/src/Logbert/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Couchcoding")]
 [assembly: AssemblyProduct("Logbert")]
-[assembly: AssemblyCopyright("Copyright © 2018 Couchcoding")]
+[assembly: AssemblyCopyright("Copyright © 2019 Couchcoding")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -29,6 +29,6 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("1.5.1.0")]
-[assembly: AssemblyFileVersion("1.5.1.0")]
+[assembly: AssemblyVersion("1.5.2.0")]
+[assembly: AssemblyFileVersion("1.5.2.0")]
 [assembly: NeutralResourcesLanguageAttribute("")]
diff --git a/src/Logbert/Properties/Resources.Designer.cs b/src/Logbert/Properties/Resources.Designer.cs
diff --git a/src/Logbert/Properties/Resources.resx b/src/Logbert/Properties/Resources.resx
@@ -125,7 +125,7 @@
     <value>..\Resources\action_add_16xMD.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="strAboutDlgCopyright" xml:space="preserve">
-    <value>Copyright 2018 Couchcoding. All Right Reserved.</value>
+    <value>Copyright 2019 Couchcoding. All Right Reserved.</value>
   </data>
   <data name="strColumnizerConfigurationEnterColumnNameAndExpression" xml:space="preserve">
     <value>Please enter a name and an expression for each configure column.</value>
diff --git a/src/Logbert/Receiver/CustomReceiver/CustomDirReceiver/CustomDirReceiver.cs b/src/Logbert/Receiver/CustomReceiver/CustomDirReceiver/CustomDirReceiver.cs
@@ -265,17 +265,21 @@ private void ReadNewLogMessagesFromFile()
           mLastFileOffset
         , SeekOrigin.Begin);
 
-      string line;
+      string currentLine;
+      string messageLines = string.Empty;
+
       List<LogMessage> messages = new List<LogMessage>();
 
-      while ((line = mFileReader.ReadLine()) != null)
+      while ((currentLine = mFileReader.ReadLine()) != null)
       {
         LogMessageCustom cstmLgMsg;
 
         try
         {
+          messageLines += currentLine;
+
           cstmLgMsg = new LogMessageCustom(
-              line
+              messageLines
             , mLogNumber + 1
             , mColumnizer);
         }
@@ -285,6 +289,8 @@ private void ReadNewLogMessagesFromFile()
           continue;
         }
 
+        messageLines = string.Empty;
+
         mLogNumber++;
         messages.Add(cstmLgMsg);
       }
diff --git a/src/Logbert/Receiver/CustomReceiver/CustomFileReceiver/CustomFileReceiver.cs b/src/Logbert/Receiver/CustomReceiver/CustomFileReceiver/CustomFileReceiver.cs
@@ -241,18 +241,21 @@ private void ReadNewLogMessagesFromFile()
           mLastFileOffset
         , SeekOrigin.Begin);
 
-      string line;
+      string currentLine;
+      string messageLines = string.Empty;
 
       List<LogMessage> messages = new List<LogMessage>();
 
-      while ((line = mFileReader.ReadLine()) != null)
+      while ((currentLine = mFileReader.ReadLine()) != null)
       {
         LogMessageCustom cstmLgMsg;
 
         try
-        {
+        {
+          messageLines += currentLine;
+
           cstmLgMsg = new LogMessageCustom(
-              line
+              messageLines
             , mLogNumber + 1
             , mColumnizer);
         }
@@ -261,6 +264,8 @@ private void ReadNewLogMessagesFromFile()
           Logger.Warn(ex.Message);
           continue;
         }
+
+        messageLines = string.Empty;
 
         mLogNumber++;
         messages.Add(cstmLgMsg);

Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,7 @@ private bool ParseData(string data)`
`126`	`126`	`{`
`127`	`127`	`for (int i = 0; i < mColumnizer.Columns.Count; ++i)`
`128`	`128`	`{`
`129`		`- Match mtc = Regex.Match(data, mColumnizer.Columns[i].Expression);`
	`129`	`+ Match mtc = Regex.Match(data, mColumnizer.Columns[i].Expression, RegexOptions.Multiline);`
`130`	`130`
`131`	`131`	`if (!mtc.Success && !mColumnizer.Columns[i].Optional)`
`132`	`132`	`{`
Original file line number	Diff line number	Diff line change
`@@ -265,17 +265,21 @@ private void ReadNewLogMessagesFromFile()`
`265`	`265`	`mLastFileOffset`
`266`	`266`	`, SeekOrigin.Begin);`
`267`	`267`
`268`		`- string line;`
	`268`	`+ string currentLine;`
	`269`	`+ string messageLines = string.Empty;`
	`270`	`+`
`269`	`271`	`List<LogMessage> messages = new List<LogMessage>();`
`270`	`272`
`271`		`- while ((line = mFileReader.ReadLine()) != null)`
	`273`	`+ while ((currentLine = mFileReader.ReadLine()) != null)`
`272`	`274`	`{`
`273`	`275`	`LogMessageCustom cstmLgMsg;`
`274`	`276`
`275`	`277`	`try`
`276`	`278`	`{`
	`279`	`+ messageLines += currentLine;`
	`280`	`+`
`277`	`281`	`cstmLgMsg = new LogMessageCustom(`
`278`		`- line`
	`282`	`+ messageLines`
`279`	`283`	`, mLogNumber + 1`
`280`	`284`	`, mColumnizer);`
`281`	`285`	`}`
`@@ -285,6 +289,8 @@ private void ReadNewLogMessagesFromFile()`
`285`	`289`	`continue;`
`286`	`290`	`}`
`287`	`291`
	`292`	`+ messageLines = string.Empty;`
	`293`	`+`
`288`	`294`	`mLogNumber++;`
`289`	`295`	`messages.Add(cstmLgMsg);`
`290`	`296`	`}`