Fix Log Messages. Fix Cache for Queue Items

ShokoAnime · Mar 12, 2024 · 3db37d1 · 3db37d1
1 parent a3e57d3
commit 3db37d1
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 14 deletions.
diff --git a/Shoko.CLI/Program.cs b/Shoko.CLI/Program.cs
@@ -68,7 +68,7 @@ private static void QueueStateEventHandlerOnQueueItemAdded(object? sender, Queue
 
         foreach (var addedItem in e.AddedItems)
         {
-            _logger.LogTrace("Job Added: {Type} | {Details}", addedItem.JobType ?? addedItem.Key, GetDetails(addedItem.Details));
+            _logger.LogTrace("Job Added: {Type} | {Details}", addedItem.Title, GetDetails(addedItem.Details));
         }
 
         _logger.LogTrace("Waiting: {Waiting} | Blocked: {Blocked} | Executing: {Executing}/{Pool} | Total: {Total}", e.WaitingJobsCount,
@@ -81,15 +81,15 @@ private static void ExecutingJobsStateEventHandlerOnExecutingJobsChanged(object?
         {
             foreach (var addedItem in e.AddedItems)
             {
-                _logger.LogTrace("Job Started: {Type} | {Details}", addedItem.JobType ?? addedItem.Title, GetDetails(addedItem.Details));
+                _logger.LogTrace("Job Started: {Type} | {Details}", addedItem.Title, GetDetails(addedItem.Details));
             }
         }
 
         if (e.RemovedItems is { Count: > 0 })
         {
             foreach (var removedItem in e.RemovedItems)
             {
-                _logger.LogTrace("Job Completed: {Type} | {Details}", removedItem.JobType, GetDetails(removedItem.Details));
+                _logger.LogTrace("Job Completed: {Type} | {Details}", removedItem.Title, GetDetails(removedItem.Details));
             }
         }
 

diff --git a/Shoko.Server/API/v3/Controllers/QueueController.cs b/Shoko.Server/API/v3/Controllers/QueueController.cs
@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
@@ -121,19 +122,26 @@ public async Task<ActionResult> Clear()
             ? _queueHandler.WaitingCount + _queueHandler.BlockedCount + _queueHandler.GetExecutingJobs().Length
             : _queueHandler.WaitingCount + _queueHandler.GetExecutingJobs().Length;
 
+        var offset = (page - 1) * pageSize;
         // simplified from (page - 1) * pageSize + pageSize
         if (page * pageSize <= _settingsProvider.GetSettings().Quartz.WaitingCacheSize)
-            return new ListResult<Queue.QueueItem>(total, _queueHandler.GetWaitingJobs().Select(a => new Queue.QueueItem
-            {
-                Key = a.Key,
-                Type = a.JobType,
-                Title = a.Title,
-                Details = a.Details,
-                IsRunning = a.Running,
-                IsBlocked = a.Blocked
-            }).ToList());
+        {
+            var results = _queueHandler.GetExecutingJobs().Skip(offset).Take(pageSize).ToList();
+            if (pageSize - results.Count > 0)
+                results.AddRange(_queueHandler.GetWaitingJobs().Skip(offset - results.Count).Take(pageSize - results.Count));
+            return new ListResult<Queue.QueueItem>(total, results.Select(a =>
+                new Queue.QueueItem
+                {
+                    Key = a.Key,
+                    Type = a.JobType,
+                    Title = a.Title,
+                    Details = a.Details,
+                    IsRunning = a.Running,
+                    IsBlocked = a.Blocked
+                }).ToList());
+        }
 
-        return new ListResult<Queue.QueueItem>(total, (await _queueHandler.GetJobs(pageSize, (page - 1) * pageSize, !showAll))
+        return new ListResult<Queue.QueueItem>(total, (await _queueHandler.GetJobs(pageSize, offset, !showAll))
             .Select(a => new Queue.QueueItem
             {
                 Key = a.Key,

diff --git a/Shoko.Server/Scheduling/ThreadPooledJobStore.cs b/Shoko.Server/Scheduling/ThreadPooledJobStore.cs
@@ -479,7 +479,9 @@ public Task<List<QueueItem>> GetJobs(int maxCount, int offset, bool excludeBlock
             }
         }
 
-        var jobs = await Delegate.SelectJobs(conn, _typeLoadHelper, maxCount - result.Count, offset, NoLaterThan, NoEarlierThan, types, excludeBlocked,
+        if (maxCount - result.Count <= 0) return result;
+
+        var jobs = await Delegate.SelectJobs(conn, _typeLoadHelper, maxCount - result.Count, Math.Max(offset - result.Count, 0), NoLaterThan, NoEarlierThan, types, excludeBlocked,
             cancellationToken);
         result.AddRange(jobs.Select(a =>
         {