t0w0bi/ClubPenguinClient
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes uploads cancelling early

Browse Source
This commit is contained in:
rootdarkarchon
2022-11-03 20:45:44 +01:00
parent 56dd3c2f65
commit 605c1d3774
2 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
MareSynchronos/MareSynchronos.csproj
View File

@@ -3,7 +3,7 @@
<PropertyGroup> <PropertyGroup>
<Authors></Authors> <Authors></Authors>
<Company></Company> <Company></Company>
<Version>0.5.7</Version> <Version>0.5.8</Version>
<Description></Description> <Description></Description>
<Copyright></Copyright> <Copyright></Copyright>
<PackageProjectUrl>https://github.com/Penumbra-Sync/client</PackageProjectUrl> <PackageProjectUrl>https://github.com/Penumbra-Sync/client</PackageProjectUrl>

13
MareSynchronos/WebAPI/ApIController.Functions.Files.cs
View File

@@ -239,22 +239,13 @@ public partial class ApiController
Logger.Debug($"Compressed {totalSize} to {compressedSize} ({(compressedSize / (double)totalSize):P2})"); Logger.Debug($"Compressed {totalSize} to {compressedSize} ({(compressedSize / (double)totalSize):P2})");
Logger.Debug("Upload tasks complete, waiting for server to confirm"); Logger.Debug("Upload tasks complete, waiting for server to confirm");
var anyUploadsOpen = await FilesIsUploadFinished().ConfigureAwait(false); Logger.Debug("Uploads open: " + CurrentUploads.Any(c => c.IsInTransfer));
Logger.Debug("Uploads open: " + anyUploadsOpen);
double timeWaited = 0;
const double waitStep = 1.0d; const double waitStep = 1.0d;
while (anyUploadsOpen && !uploadToken.IsCancellationRequested && timeWaited < 5) while (CurrentUploads.Any(c => c.IsInTransfer) && !uploadToken.IsCancellationRequested)
{ {
anyUploadsOpen = await FilesIsUploadFinished().ConfigureAwait(false);
timeWaited += waitStep;
await Task.Delay(TimeSpan.FromSeconds(waitStep), uploadToken).ConfigureAwait(false); await Task.Delay(TimeSpan.FromSeconds(waitStep), uploadToken).ConfigureAwait(false);
Logger.Debug("Waiting for uploads to finish"); Logger.Debug("Waiting for uploads to finish");
} }
if(timeWaited > waitStep)
{
await FilesAbortUpload().ConfigureAwait(false);
}
} }
foreach (var item in unverifiedUploadHashes) foreach (var item in unverifiedUploadHashes)