ToxicMushroom/mare.client
1
0
Fork 0
mirror of https://github.com/Caraxi/mare.client.git synced 2025-12-12 22:17:22 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

handle download cancellation better

Browse source
This commit is contained in:
Stanley Dimant 2022-07-10 21:51:42 +02:00
parent 98c1802d63
commit 2307b43c65
7 changed files with 47 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

16
MareSynchronos/Managers/CachedPlayer.cs
View file

@ -107,18 +107,20 @@ public class CachedPlayer
_downloadCancellationTokenSource?.Cancel();
_downloadCancellationTokenSource = new CancellationTokenSource();
var downloadToken = _downloadCancellationTokenSource.Token;
var downloadId = _apiController.GetDownloadId();
Task.Run(async () =>
{
List<FileReplacementDto> toDownloadReplacements;
Dictionary<string, string> moddedPaths;
while ((toDownloadReplacements = TryCalculateModdedDictionary(_cache[_lastAppliedEquipmentHash], out moddedPaths)).Count > 0)
int attempts = 0;
while ((toDownloadReplacements = TryCalculateModdedDictionary(_cache[_lastAppliedEquipmentHash], out moddedPaths)).Count > 0 && attempts++ <= 10)
{
Logger.Debug("Downloading missing files for player " + PlayerName);
await _apiController.DownloadFiles(toDownloadReplacements, downloadToken);
await _apiController.DownloadFiles(downloadId, toDownloadReplacements, downloadToken);
if (downloadToken.IsCancellationRequested)
{
Logger.Verbose("Detected cancellation");
return;
}
@ -129,7 +131,13 @@ public class CachedPlayer
}
ApplyCharacterData(_cache[_lastAppliedEquipmentHash], moddedPaths);
}, downloadToken);
}, downloadToken).ContinueWith(task =>
{
if (!task.IsCanceled) return;
Logger.Debug("Download Task was cancelled");
_apiController.CancelDownload(downloadId);
});
}
private List<FileReplacementDto> TryCalculateModdedDictionary(CharacterCacheDto cache,