From 258cf002a9ec9430f2045cfb2f971bfb9525503e Mon Sep 17 00:00:00 2001 From: Lior Banai Date: Fri, 7 Jul 2023 08:02:11 +0300 Subject: [PATCH] Fix built-in prasers Fix #1775. --- Analogy.CommonControls/LogLoaders/AnalogyJSonLoader.cs | 3 ++- Analogy.CommonControls/LogLoaders/AnalogyMessagePackFormat.cs | 3 ++- Analogy/CommonChangeLog.cs | 1 + Analogy/LogLoaders/AnalogyJSonLoader.cs | 2 +- Analogy/LogLoaders/AnalogyMessagePackFormat.cs | 2 +- 5 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Analogy.CommonControls/LogLoaders/AnalogyJSonLoader.cs b/Analogy.CommonControls/LogLoaders/AnalogyJSonLoader.cs index 22b1431c3..a7539df80 100644 --- 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> ReadFromFile(string fileName, { data = textReader.ReadToEnd(); } - List messages = JsonConvert.DeserializeObject>(data); + List messages = JsonConvert.DeserializeObject>(data).Cast().ToList(); messageHandler?.AppendMessages(messages, Utils.GetFileNameAsDataSource(fileName)); return messages; } diff --git a/Analogy.CommonControls/LogLoaders/AnalogyMessagePackFormat.cs b/Analogy.CommonControls/LogLoaders/AnalogyMessagePackFormat.cs index c3ffd7d01..cccbc14a3 100644 --- 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> ReadFromFile(string fileName, try { byte[] data = File.ReadAllBytes(fileName); - var messages = MessagePackSerializer.Deserialize>(data, MessagePack.Resolvers.ContractlessStandardResolver.Options); + var messages = MessagePackSerializer.Deserialize>(data, MessagePack.Resolvers.ContractlessStandardResolver.Options).Cast().ToList(); messageHandler.AppendMessages(messages, Utils.GetFileNameAsDataSource(fileName)); return messages; } diff --git a/Analogy/CommonChangeLog.cs b/Analogy/CommonChangeLog.cs index ab8a602cb..f1af91d32 100644 --- a/Analogy/CommonChangeLog.cs +++ b/Analogy/CommonChangeLog.cs @@ -9,6 +9,7 @@ public static IEnumerable GetChangeLog() { return new List { + 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 index 6820870ea..19d9453e5 100644 --- a/Analogy/LogLoaders/AnalogyJSonLoader.cs +++ b/Analogy/LogLoaders/AnalogyJSonLoader.cs @@ -37,7 +37,7 @@ public async Task> ReadFromFile(string fileName, { data = textReader.ReadToEnd(); } - List messages = JsonConvert.DeserializeObject>(data); + List messages = JsonConvert.DeserializeObject>(data).Cast().ToList(); messageHandler?.AppendMessages(messages, Utils.GetFileNameAsDataSource(fileName)); return messages; } diff --git a/Analogy/LogLoaders/AnalogyMessagePackFormat.cs b/Analogy/LogLoaders/AnalogyMessagePackFormat.cs index 9613d19c0..a403e594f 100644 --- a/Analogy/LogLoaders/AnalogyMessagePackFormat.cs +++ b/Analogy/LogLoaders/AnalogyMessagePackFormat.cs @@ -31,7 +31,7 @@ public async Task> ReadFromFile(string fileName, try { byte[] data = File.ReadAllBytes(fileName); - var messages = MessagePackSerializer.Deserialize>(data, MessagePack.Resolvers.ContractlessStandardResolver.Options); + var messages = MessagePackSerializer.Deserialize>(data, MessagePack.Resolvers.ContractlessStandardResolver.Options).Cast().ToList(); messageHandler.AppendMessages(messages, Utils.GetFileNameAsDataSource(fileName)); return messages; }