From 6aace549103a31b33b4a6efb97b816c9a1a301d6 Mon Sep 17 00:00:00 2001 From: rootdarkarchon Date: Fri, 23 Dec 2022 01:53:01 +0100 Subject: [PATCH] sequentialize file uploads, bump version --- MareSynchronos/Managers/IpcManager.cs | 2 +- MareSynchronos/MareSynchronos.csproj | 2 +- MareSynchronos/WebAPI/ApIController.Functions.Files.cs | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/MareSynchronos/Managers/IpcManager.cs b/MareSynchronos/Managers/IpcManager.cs index c14f14b..8b31701 100644 --- a/MareSynchronos/Managers/IpcManager.cs +++ b/MareSynchronos/Managers/IpcManager.cs @@ -167,7 +167,7 @@ public class IpcManager : IDisposable { try { - return _penumbraApiVersion.Invoke() is { Item1: 4, Item2: >= 13 }; + return _penumbraApiVersion.Invoke() is { Item1: 4, Item2: >= 17 }; } catch { diff --git a/MareSynchronos/MareSynchronos.csproj b/MareSynchronos/MareSynchronos.csproj index 80fd1c2..bf6d32f 100644 --- a/MareSynchronos/MareSynchronos.csproj +++ b/MareSynchronos/MareSynchronos.csproj @@ -3,7 +3,7 @@ - 0.5.17 + 0.5.18 https://github.com/Penumbra-Sync/client diff --git a/MareSynchronos/WebAPI/ApIController.Functions.Files.cs b/MareSynchronos/WebAPI/ApIController.Functions.Files.cs index c00c2cb..738c5ec 100644 --- a/MareSynchronos/WebAPI/ApIController.Functions.Files.cs +++ b/MareSynchronos/WebAPI/ApIController.Functions.Files.cs @@ -39,6 +39,7 @@ public partial class ApiController public async Task FilesDeleteAll() { + _verifiedUploadedHashes.Clear(); await _mareHub!.SendAsync(nameof(FilesDeleteAll)).ConfigureAwait(false); } @@ -356,7 +357,7 @@ public partial class ApiController public async Task FilesUploadStreamAsync(string hash, IAsyncEnumerable fileContent) { - await _mareHub!.SendAsync(nameof(FilesUploadStreamAsync), hash, fileContent).ConfigureAwait(false); + await _mareHub!.InvokeAsync(nameof(FilesUploadStreamAsync), hash, fileContent).ConfigureAwait(false); } public async Task FilesIsUploadFinished()