From fcf38994bc98996fd832aee37cdf9bf0a8ae3f5b Mon Sep 17 00:00:00 2001 From: Stanley Dimant Date: Fri, 22 Jul 2022 02:17:52 +0200 Subject: [PATCH 1/2] mak server read files synchronous --- MareAPI | 2 +- .../MareSynchronosServer/Hubs/MareHub.Files.cs | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/MareAPI b/MareAPI index af8516d..ffc0a48 160000 --- a/MareAPI +++ b/MareAPI @@ -1 +1 @@ -Subproject commit af8516d44a99d3a46e2a0de36c848732937f9c6a +Subproject commit ffc0a48fdadd71d33b015e4e46ef15303f1d2f60 diff --git a/MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.Files.cs b/MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.Files.cs index fdd1199..1b18b4e 100644 --- a/MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.Files.cs +++ b/MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.Files.cs @@ -68,9 +68,8 @@ namespace MareSynchronosServer.Hubs var path = Path.Combine(BasePath, hash); await using var fs = File.Open(path, FileMode.Open, FileAccess.Read, FileShare.Read); - while ((readByteCount = await fs.ReadAsync(buffer, 0, chunkSize, ct)) > 0) + while ((readByteCount = fs.Read(buffer, 0, chunkSize)) > 0) { - await Task.Delay(10, ct); yield return readByteCount == chunkSize ? buffer.ToArray() : buffer.Take(readByteCount).ToArray(); } From 65a962740b0168794735f157963807ca6b93cfee Mon Sep 17 00:00:00 2001 From: Stanley Dimant Date: Sun, 24 Jul 2022 14:35:32 +0200 Subject: [PATCH 2/2] push mareapi changes --- MareAPI | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MareAPI b/MareAPI index ffc0a48..a649b36 160000 --- a/MareAPI +++ b/MareAPI @@ -1 +1 @@ -Subproject commit ffc0a48fdadd71d33b015e4e46ef15303f1d2f60 +Subproject commit a649b364955ce431f41c53c016823763febde708