From 637997bd185fa3ffa42578b53bbca3f1043d6169 Mon Sep 17 00:00:00 2001 From: Adam Hathcock Date: Tue, 26 Aug 2025 10:31:43 +0100 Subject: [PATCH] Report progress before saving SQLite --- .config/dotnet-tools.json | 4 ++-- src/Speckle.Sdk/Models/Base.cs | 3 +-- src/Speckle.Sdk/Serialisation/V2/Send/ObjectSaver.cs | 2 +- .../Serialisation/PrimitiveTestFixture.cs | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 9c4df592..321b5d64 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,11 +3,11 @@ "isRoot": true, "tools": { "csharpier": { - "version": "1.0.2", + "version": "1.1.2", "commands": [ "csharpier" ], "rollForward": false } } -} +} \ No newline at end of file diff --git a/src/Speckle.Sdk/Models/Base.cs b/src/Speckle.Sdk/Models/Base.cs index 57fb1408..1065e6b0 100644 --- a/src/Speckle.Sdk/Models/Base.cs +++ b/src/Speckle.Sdk/Models/Base.cs @@ -169,8 +169,7 @@ public class Base : DynamicBase, ISpeckleObject return count; } - case IEnumerable e - and not string: + case IEnumerable e and not string: { foreach (var arrValue in e) { diff --git a/src/Speckle.Sdk/Serialisation/V2/Send/ObjectSaver.cs b/src/Speckle.Sdk/Serialisation/V2/Send/ObjectSaver.cs index 906d408b..0e26a1bc 100644 --- a/src/Speckle.Sdk/Serialisation/V2/Send/ObjectSaver.cs +++ b/src/Speckle.Sdk/Serialisation/V2/Send/ObjectSaver.cs @@ -100,9 +100,9 @@ public sealed class ObjectSaver( { if (!_options.SkipCacheWrite && batch.Count != 0) { - sqLiteJsonCacheManager.SaveObjects(batch.Select(x => (x.Id.Value, x.Json.Value))); Interlocked.Add(ref _cached, batch.Count); progress?.Report(new(ProgressEvent.CachedToLocal, _cached, _objectsSerialized)); + sqLiteJsonCacheManager.SaveObjects(batch.Select(x => (x.Id.Value, x.Json.Value))); } } catch (OperationCanceledException) diff --git a/tests/Speckle.Sdk.Tests.Unit/Serialisation/PrimitiveTestFixture.cs b/tests/Speckle.Sdk.Tests.Unit/Serialisation/PrimitiveTestFixture.cs index 75f63184..6aa76069 100644 --- a/tests/Speckle.Sdk.Tests.Unit/Serialisation/PrimitiveTestFixture.cs +++ b/tests/Speckle.Sdk.Tests.Unit/Serialisation/PrimitiveTestFixture.cs @@ -39,7 +39,7 @@ public abstract class PrimitiveTestFixture }.Select(x => new object[] { x }); public static Half[] Float16TestCases { get; } = - [default, Half.Epsilon, Half.MaxValue, Half.MinValue, Half.PositiveInfinity, Half.NegativeInfinity, Half.NaN]; + [default, Half.Epsilon, Half.MaxValue, Half.MinValue, Half.PositiveInfinity, Half.NegativeInfinity, Half.NaN]; public static float[] FloatIntegralTestCases { get; } = [0, 1, int.MaxValue, int.MinValue];