From a116545c9e18a8a4814ebb7be780b44af91e472c Mon Sep 17 00:00:00 2001 From: Stanley Dimant Date: Sat, 4 May 2024 15:21:53 +0200 Subject: [PATCH] requeue requests where files are still downloading --- .../Services/RequestQueueService.cs | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/MareSynchronosServer/MareSynchronosStaticFilesServer/Services/RequestQueueService.cs b/MareSynchronosServer/MareSynchronosStaticFilesServer/Services/RequestQueueService.cs index 280a1fb..ac0b2da 100644 --- a/MareSynchronosServer/MareSynchronosStaticFilesServer/Services/RequestQueueService.cs +++ b/MareSynchronosServer/MareSynchronosStaticFilesServer/Services/RequestQueueService.cs @@ -156,30 +156,30 @@ public class RequestQueueService : IHostedService while (true) { - if (_priorityQueue.TryPeek(out var prioRequest)) + if (_priorityQueue.TryDequeue(out var prioRequest)) { if (prioRequest.IsCancelled) { - _priorityQueue.TryDequeue(out var _); continue; } - if (_cachedFileProvider.AnyFilesDownloading(prioRequest.FileIds)) continue; - _priorityQueue.TryDequeue(out var priorityRequest); - DequeueIntoSlot(priorityRequest, i); + if (_cachedFileProvider.AnyFilesDownloading(prioRequest.FileIds)) + _priorityQueue.Enqueue(prioRequest); + + DequeueIntoSlot(prioRequest, i); break; } - if (_queue.TryPeek(out var request)) + if (_queue.TryDequeue(out var request)) { if (request.IsCancelled) { - _queue.TryDequeue(out var _); continue; } - if (_cachedFileProvider.AnyFilesDownloading(request.FileIds)) continue; - _queue.TryDequeue(out var priorityRequest); + if (_cachedFileProvider.AnyFilesDownloading(request.FileIds)) + _queue.Enqueue(request); + DequeueIntoSlot(request, i); break; }