Message viewer doesn't understand Linux-style new lines #1770

Analogy-LogViewer · Aug 18, 2023 · c3b96e7 · c3b96e7
1 parent e36b956
commit c3b96e7
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 8 deletions.
diff --git a/Analogy.CommonControls/UserControls/LogMessagesUC.cs b/Analogy.CommonControls/UserControls/LogMessagesUC.cs
@@ -2428,19 +2428,19 @@ private void LoadTextBoxes(AnalogyLogMessage m)
                 {
                     bbtnRawMessageViewer.Tag = m;
                     recMessageDetails.Tag = m;
-                    recMessageDetails.Text = m.Text;
+                    recMessageDetails.Text = Utils.ProcessLinuxMessage(m.Text);
                     meMessageDetails.Tag = m;
-                    meMessageDetails.Text = m.Text;
+                    meMessageDetails.Text = Utils.ProcessLinuxMessage(m.Text); ;
                     recMessageDetails.HtmlText = Markdown.ToHtml(m.Text, pipeline);
                 }));
             }
             else
             {
                 bbtnRawMessageViewer.Tag = m;
                 recMessageDetails.Tag = m;
-                recMessageDetails.Text = m.Text;
+                recMessageDetails.Text = Utils.ProcessLinuxMessage(m.Text); ;
                 meMessageDetails.Tag = m;
-                meMessageDetails.Text = m.Text;
+                meMessageDetails.Text = Utils.ProcessLinuxMessage(m.Text); ;
                 recMessageDetails.HtmlText = Markdown.ToHtml(m.Text, pipeline);
             }
 

diff --git a/Analogy.CommonControls/UserControls/MessageDetailsUC.cs b/Analogy.CommonControls/UserControls/MessageDetailsUC.cs
@@ -82,7 +82,7 @@ public async Task LoadMessage()
                     Message.AdditionalProperties.Select(kv => $"{kv.Key}:{kv.Value}"));
             }
 
-            memoText.Text = Message.Text;
+            memoText.Text =Utils.ProcessLinuxMessage(Message.Text);
             txtbMachineName.Text = Message.MachineName;
             txtID.Text = Message.Id.ToString();
             txtbDataSource.Text = DataSource;

diff --git a/Analogy.CommonControls/Utils.cs b/Analogy.CommonControls/Utils.cs
@@ -13,6 +13,7 @@
 using DevExpress.XtraEditors;
 using DevExpress.XtraEditors.Controls;
 using Newtonsoft.Json;
+using System.Text;
 
 namespace Analogy.CommonControls
 {
@@ -67,7 +68,7 @@ public static DataRow CreateRow(DataTable table, IAnalogyLogMessage message, str
         {
             var dtr = table.NewRow();
             dtr.BeginEdit();
-            dtr["Date"] = GetOffsetTime(message.Date,timeOffsetType,customOffset);
+            dtr["Date"] = GetOffsetTime(message.Date, timeOffsetType, customOffset);
             dtr["Text"] = message.Text ?? "";
             dtr["Source"] = message.Source ?? "";
             dtr["Level"] = message.Level;
@@ -101,7 +102,7 @@ public static bool IsCompressedArchive(string filename)
                    filename.EndsWith(".zip", StringComparison.InvariantCultureIgnoreCase);
         }
 
-        public static DateTime GetOffsetTime(DateTime time, TimeOffsetType timeOffsetType,TimeSpan customOffset)
+        public static DateTime GetOffsetTime(DateTime time, TimeOffsetType timeOffsetType, TimeSpan customOffset)
         {
             return timeOffsetType switch
             {
@@ -216,7 +217,7 @@ static long GetLastInputTime()
         }
         public static TimeSpan IdleTime() => TimeSpan.FromSeconds(GetLastInputTime());
 
-        public static string GetOpenFilter(string openFilter,bool addCompressedArchives)
+        public static string GetOpenFilter(string openFilter, bool addCompressedArchives)
         {
             if (!addCompressedArchives)
             {
@@ -260,5 +261,27 @@ public static SuperToolTip GetSuperTip(string title, string content)
             toolTip.Setup(args);
             return toolTip;
         }
+
+        public static string ProcessLinuxMessage(string? msg)
+        {
+            if (msg == null)
+            {
+                return string.Empty;
+            }
+            StringBuilder sb = new();
+            foreach (var line in msg.Split(new[] { "\r\n" }, StringSplitOptions.RemoveEmptyEntries))
+            {
+                if (!line.Contains("\n"))
+                {
+                    sb.AppendLine(line);
+                    continue;
+                }
+                foreach (var innerLines in line.Split(new[] { "\n" }, StringSplitOptions.RemoveEmptyEntries))
+                {
+                    sb.AppendFormat("{0}{1}", innerLines.Replace("\n",""), Environment.NewLine);
+                }
+            }
+            return sb.ToString();
+        }
     }
 }