Skip to content

Usenet streaming with a WebDAV server and a SABnzbd-compatible API

C#

Added total number of items to GetQueue api response.

nzbdav-deve6fe8623686e
diff --git a/backend/Api/SabControllers/GetQueue/GetQueueController.cs b/backend/Api/SabControllers/GetQueue/GetQueueController.cs
index 7d4dbae9..c25d5847 100644
--- a/backend/Api/SabControllers/GetQueue/GetQueueController.cs
+++ b/backend/Api/SabControllers/GetQueue/GetQueueController.cs
@@ -18,8 +18,11 @@ public class GetQueueController(
// get in progress item
var (inProgressQueueItem, progressPercentage) = queueManager.GetInProgressQueueItem();
- // get queued items
+ // get total count
var ct = request.CancellationToken;
+ var totalCount = await dbClient.GetQueueItemsCount(request.Category, ct);
+
+ // get queued items
var queueItems = (await dbClient.GetQueueItems(request.Category, request.Start, request.Limit, ct))
.Where(x => x.Id != inProgressQueueItem?.Id)
.ToArray();
@@ -43,6 +46,7 @@ public class GetQueueController(
{
Paused = false,
Slots = slots,
+ TotalCount = totalCount,
}
};
}
diff --git a/backend/Api/SabControllers/GetQueue/GetQueueResponse.cs b/backend/Api/SabControllers/GetQueue/GetQueueResponse.cs
index ac99b8fe..2bd118ef 100644
--- a/backend/Api/SabControllers/GetQueue/GetQueueResponse.cs
+++ b/backend/Api/SabControllers/GetQueue/GetQueueResponse.cs
@@ -16,6 +16,9 @@ public class GetQueueResponse : SabBaseResponse
[JsonPropertyName("slots")]
public List<QueueSlot> Slots { get; init; } = new();
+
+ [JsonPropertyName("noofslots")]
+ public int TotalCount { get; set; }
}
public class QueueSlot
diff --git a/backend/Database/DavDatabaseClient.cs b/backend/Database/DavDatabaseClient.cs
index ca058bc5..4a0c293d 100644
--- a/backend/Database/DavDatabaseClient.cs
+++ b/backend/Database/DavDatabaseClient.cs
@@ -114,6 +114,14 @@ public sealed class DavDatabaseClient(DavDatabaseContext ctx)
.ToArrayAsync(cancellationToken: ct);
}
+ public Task<int> GetQueueItemsCount(string? category, CancellationToken ct = default)
+ {
+ var queueItems = category != null
+ ? Ctx.QueueItems.Where(q => q.Category == category)
+ : Ctx.QueueItems;
+ return queueItems.CountAsync(cancellationToken: ct);
+ }
+
public async Task RemoveQueueItemsAsync(List<Guid> ids, CancellationToken ct = default)
{
await Ctx.QueueItems