From 7b5ada57cd3d41bca0d516667b1b8d9d842d31af Mon Sep 17 00:00:00 2001 From: Adam Hathcock Date: Tue, 3 Jun 2025 17:27:02 +0100 Subject: [PATCH] Changing uploaded to uploading to better show progress than just rate (#321) --- src/Speckle.Sdk/Serialisation/V2/Send/ObjectSaver.cs | 7 +++---- src/Speckle.Sdk/Transports/ProgressArgs.cs | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/Speckle.Sdk/Serialisation/V2/Send/ObjectSaver.cs b/src/Speckle.Sdk/Serialisation/V2/Send/ObjectSaver.cs index 3a73a221..429dccdd 100644 --- a/src/Speckle.Sdk/Serialisation/V2/Send/ObjectSaver.cs +++ b/src/Speckle.Sdk/Serialisation/V2/Send/ObjectSaver.cs @@ -34,7 +34,7 @@ public sealed class ObjectSaver( private readonly SerializeProcessOptions _options = options ?? new(); - private long _uploaded; + private long _uploading; private long _cached; private long _objectsSerialized; @@ -56,13 +56,12 @@ public sealed class ObjectSaver( objectBatch = batch.Items.Where(x => !hasObjects[x.Id.Value]).ToList(); if (objectBatch.Count != 0) { + Interlocked.Add(ref _uploading, batch.Items.Count); + progress?.Report(new(ProgressEvent.UploadingObjects, _uploading, null)); await serverObjectManager .UploadObjects(objectBatch, true, progress, _cancellationTokenSource.Token) .ConfigureAwait(false); - Interlocked.Add(ref _uploaded, batch.Items.Count); } - - progress?.Report(new(ProgressEvent.UploadedObjects, _uploaded, null)); } } catch (OperationCanceledException) diff --git a/src/Speckle.Sdk/Transports/ProgressArgs.cs b/src/Speckle.Sdk/Transports/ProgressArgs.cs index b7660374..6e974e41 100644 --- a/src/Speckle.Sdk/Transports/ProgressArgs.cs +++ b/src/Speckle.Sdk/Transports/ProgressArgs.cs @@ -9,7 +9,7 @@ public enum ProgressEvent FromCacheOrSerialized, FindingChildren, UploadBytes, - UploadedObjects, + UploadingObjects, CacheCheck, DownloadBytes,