Fix built-in prasers Fix #1775.

Analogy-LogViewer · Jul 7, 2023 · 258cf00 · 258cf00
1 parent acd91d2
commit 258cf00
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 4 deletions.
diff --git a/Analogy.CommonControls/LogLoaders/AnalogyJSonLoader.cs b/Analogy.CommonControls/LogLoaders/AnalogyJSonLoader.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
+using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using Analogy.Interfaces;
@@ -38,7 +39,7 @@ public async Task<IEnumerable<IAnalogyLogMessage>> ReadFromFile(string fileName,
                     {
                         data = textReader.ReadToEnd();
                     }
-                    List<IAnalogyLogMessage> messages = JsonConvert.DeserializeObject<List<IAnalogyLogMessage>>(data);
+                    List<IAnalogyLogMessage> messages = JsonConvert.DeserializeObject<List<AnalogyLogMessage>>(data).Cast<IAnalogyLogMessage>().ToList();
                     messageHandler?.AppendMessages(messages, Utils.GetFileNameAsDataSource(fileName));
                     return messages;
                 }

diff --git a/Analogy.CommonControls/LogLoaders/AnalogyMessagePackFormat.cs b/Analogy.CommonControls/LogLoaders/AnalogyMessagePackFormat.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
+using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using Analogy.Interfaces;
@@ -32,7 +33,7 @@ public async Task<IEnumerable<IAnalogyLogMessage>> ReadFromFile(string fileName,
                 try
                 {
                     byte[] data = File.ReadAllBytes(fileName);
-                    var messages = MessagePackSerializer.Deserialize<List<IAnalogyLogMessage>>(data, MessagePack.Resolvers.ContractlessStandardResolver.Options);
+                    var messages = MessagePackSerializer.Deserialize<List<AnalogyLogMessage>>(data, MessagePack.Resolvers.ContractlessStandardResolver.Options).Cast<IAnalogyLogMessage>().ToList();
                     messageHandler.AppendMessages(messages, Utils.GetFileNameAsDataSource(fileName));
                     return messages;
                 }

diff --git a/Analogy/CommonChangeLog.cs b/Analogy/CommonChangeLog.cs
@@ -9,6 +9,7 @@ public static IEnumerable<AnalogyChangeLog> GetChangeLog()
         {
             return new List<AnalogyChangeLog>
             {
+                new ("V4.14.2 - Fix built-in prasers #1775",AnalogChangeLogType.Bug."Lior Banai",new DateTime(2023,07,07)),
                 new ("V4.14.1 - Add Analogy.LogViewer.FFmpeg tool #1755",AnalogChangeLogType.Feature,"Lior Banai",new DateTime(2023, 06, 03)),
                 new ("V4.14.1 - Enable User Control Only Tab #1754",AnalogChangeLogType.Feature,"Lior Banai",new DateTime(2023, 06, 02)),
                 new ("V4.14.0 - [Data Provider] Add Elastic Common Schema (ECS) as Data Provider #1729",AnalogChangeLogType.Feature,"Lior Banai",new DateTime(2023, 05, 12)),

diff --git a/Analogy/LogLoaders/AnalogyJSonLoader.cs b/Analogy/LogLoaders/AnalogyJSonLoader.cs
@@ -37,7 +37,7 @@ public async Task<IEnumerable<IAnalogyLogMessage>> ReadFromFile(string fileName,
                     {
                         data = textReader.ReadToEnd();
                     }
-                    List<IAnalogyLogMessage> messages = JsonConvert.DeserializeObject<List<IAnalogyLogMessage>>(data);
+                    List<IAnalogyLogMessage> messages = JsonConvert.DeserializeObject<List<AnalogyLogMessage>>(data).Cast<IAnalogyLogMessage>().ToList();
                     messageHandler?.AppendMessages(messages, Utils.GetFileNameAsDataSource(fileName));
                     return messages;
                 }

diff --git a/Analogy/LogLoaders/AnalogyMessagePackFormat.cs b/Analogy/LogLoaders/AnalogyMessagePackFormat.cs
@@ -31,7 +31,7 @@ public async Task<IEnumerable<IAnalogyLogMessage>> ReadFromFile(string fileName,
                 try
                 {
                     byte[] data = File.ReadAllBytes(fileName);
-                    var messages = MessagePackSerializer.Deserialize<List<IAnalogyLogMessage>>(data, MessagePack.Resolvers.ContractlessStandardResolver.Options);
+                    var messages = MessagePackSerializer.Deserialize<List<AnalogyLogMessage>>(data, MessagePack.Resolvers.ContractlessStandardResolver.Options).Cast<IAnalogyLogMessage>().ToList();
                     messageHandler.AppendMessages(messages, Utils.GetFileNameAsDataSource(fileName));
                     return messages;
                 }