Skip to content

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

C#

[Refactor] Move queue processing to `Queue` namespace.

nzbdav-dev303f10e52d69
diff --git a/backend/Api/SabControllers/AddFile/AddFileController.cs b/backend/Api/SabControllers/AddFile/AddFileController.cs
index ad2f260e..b78507cb 100644
--- a/backend/Api/SabControllers/AddFile/AddFileController.cs
+++ b/backend/Api/SabControllers/AddFile/AddFileController.cs
@@ -4,7 +4,7 @@ using Microsoft.AspNetCore.Mvc;
using NzbWebDAV.Config;
using NzbWebDAV.Database;
using NzbWebDAV.Database.Models;
-using NzbWebDAV.Services;
+using NzbWebDAV.Queue;
using Usenet.Nzb;
namespace NzbWebDAV.Api.SabControllers.AddFile;
diff --git a/backend/Api/SabControllers/GetQueue/GetQueueController.cs b/backend/Api/SabControllers/GetQueue/GetQueueController.cs
index 17ed59d3..d33afded 100644
--- a/backend/Api/SabControllers/GetQueue/GetQueueController.cs
+++ b/backend/Api/SabControllers/GetQueue/GetQueueController.cs
@@ -2,7 +2,7 @@
using Microsoft.AspNetCore.Mvc;
using NzbWebDAV.Config;
using NzbWebDAV.Database;
-using NzbWebDAV.Services;
+using NzbWebDAV.Queue;
namespace NzbWebDAV.Api.SabControllers.GetQueue;
diff --git a/backend/Api/SabControllers/RemoveFromQueue/RemoveFromQueueController.cs b/backend/Api/SabControllers/RemoveFromQueue/RemoveFromQueueController.cs
index ef8ff93c..5e6a4560 100644
--- a/backend/Api/SabControllers/RemoveFromQueue/RemoveFromQueueController.cs
+++ b/backend/Api/SabControllers/RemoveFromQueue/RemoveFromQueueController.cs
@@ -2,7 +2,7 @@
using Microsoft.AspNetCore.Mvc;
using NzbWebDAV.Config;
using NzbWebDAV.Database;
-using NzbWebDAV.Services;
+using NzbWebDAV.Queue;
namespace NzbWebDAV.Api.SabControllers.RemoveFromQueue;
diff --git a/backend/Api/SabControllers/SabApiController.cs b/backend/Api/SabControllers/SabApiController.cs
index 40052b8a..fe5ee8bd 100644
--- a/backend/Api/SabControllers/SabApiController.cs
+++ b/backend/Api/SabControllers/SabApiController.cs
@@ -11,7 +11,7 @@ using NzbWebDAV.Api.SabControllers.RemoveFromQueue;
using NzbWebDAV.Config;
using NzbWebDAV.Database;
using NzbWebDAV.Extensions;
-using NzbWebDAV.Services;
+using NzbWebDAV.Queue;
using NzbWebDAV.Utils;
namespace NzbWebDAV.Api.SabControllers;
diff --git a/backend/Program.cs b/backend/Program.cs
index d1774385..5c7b07c8 100644
--- a/backend/Program.cs
+++ b/backend/Program.cs
@@ -12,7 +12,7 @@ using NzbWebDAV.Config;
using NzbWebDAV.Database;
using NzbWebDAV.Extensions;
using NzbWebDAV.Middlewares;
-using NzbWebDAV.Services;
+using NzbWebDAV.Queue;
using NzbWebDAV.Utils;
using NzbWebDAV.WebDav;
using NzbWebDAV.WebDav.Base;
diff --git a/backend/Services/FileAggregators/FileAggregator.cs b/backend/Queue/FileAggregators/FileAggregator.cs
similarity index 92%
rename from backend/Services/FileAggregators/FileAggregator.cs
rename to backend/Queue/FileAggregators/FileAggregator.cs
index 0f1273b4..18cbd602 100644
--- a/backend/Services/FileAggregators/FileAggregator.cs
+++ b/backend/Queue/FileAggregators/FileAggregator.cs
@@ -1,8 +1,8 @@
using NzbWebDAV.Database;
using NzbWebDAV.Database.Models;
-using NzbWebDAV.Services.FileProcessors;
+using NzbWebDAV.Queue.FileProcessors;
-namespace NzbWebDAV.Services.FileAggregators;
+namespace NzbWebDAV.Queue.FileAggregators;
public class FileAggregator(DavDatabaseClient dbClient, DavItem mountDirectory) : IAggregator
{
diff --git a/backend/Services/FileAggregators/IAggregator.cs b/backend/Queue/FileAggregators/IAggregator.cs
similarity index 54%
rename from backend/Services/FileAggregators/IAggregator.cs
rename to backend/Queue/FileAggregators/IAggregator.cs
index c9a73b65..48a5068f 100644
--- a/backend/Services/FileAggregators/IAggregator.cs
+++ b/backend/Queue/FileAggregators/IAggregator.cs
@@ -1,6 +1,6 @@
-using NzbWebDAV.Services.FileProcessors;
+using NzbWebDAV.Queue.FileProcessors;
-namespace NzbWebDAV.Services.FileAggregators;
+namespace NzbWebDAV.Queue.FileAggregators;
public interface IAggregator
{
diff --git a/backend/Services/FileAggregators/RarAggregator.cs b/backend/Queue/FileAggregators/RarAggregator.cs
similarity index 97%
rename from backend/Services/FileAggregators/RarAggregator.cs
rename to backend/Queue/FileAggregators/RarAggregator.cs
index 557c409b..ea4522ff 100644
--- a/backend/Services/FileAggregators/RarAggregator.cs
+++ b/backend/Queue/FileAggregators/RarAggregator.cs
@@ -1,8 +1,8 @@
using NzbWebDAV.Database;
using NzbWebDAV.Database.Models;
-using NzbWebDAV.Services.FileProcessors;
+using NzbWebDAV.Queue.FileProcessors;
-namespace NzbWebDAV.Services.FileAggregators;
+namespace NzbWebDAV.Queue.FileAggregators;
public class RarAggregator(DavDatabaseClient dbClient, DavItem mountDirectory) : IAggregator
{
diff --git a/backend/Services/FileProcessors/BaseProcessor.cs b/backend/Queue/FileProcessors/BaseProcessor.cs
similarity index 70%
rename from backend/Services/FileProcessors/BaseProcessor.cs
rename to backend/Queue/FileProcessors/BaseProcessor.cs
index 55096324..3a7228b8 100644
--- a/backend/Services/FileProcessors/BaseProcessor.cs
+++ b/backend/Queue/FileProcessors/BaseProcessor.cs
@@ -1,4 +1,4 @@
-namespace NzbWebDAV.Services.FileProcessors;
+namespace NzbWebDAV.Queue.FileProcessors;
public abstract class BaseProcessor
{
diff --git a/backend/Services/FileProcessors/FileProcessor.cs b/backend/Queue/FileProcessors/FileProcessor.cs
similarity index 92%
rename from backend/Services/FileProcessors/FileProcessor.cs
rename to backend/Queue/FileProcessors/FileProcessor.cs
index 2625cde1..0ae97758 100644
--- a/backend/Services/FileProcessors/FileProcessor.cs
+++ b/backend/Queue/FileProcessors/FileProcessor.cs
@@ -1,8 +1,7 @@
using NzbWebDAV.Clients;
-using NzbWebDAV.Extensions;
using Usenet.Nzb;
-namespace NzbWebDAV.Services.FileProcessors;
+namespace NzbWebDAV.Queue.FileProcessors;
public class FileProcessor(NzbFile nzbFile, string filename, UsenetStreamingClient usenet, CancellationToken ct) : BaseProcessor
{
diff --git a/backend/Services/FileProcessors/RarProcessor.cs b/backend/Queue/FileProcessors/RarProcessor.cs
similarity index 98%
rename from backend/Services/FileProcessors/RarProcessor.cs
rename to backend/Queue/FileProcessors/RarProcessor.cs
index 23019365..5df32f32 100644
--- a/backend/Services/FileProcessors/RarProcessor.cs
+++ b/backend/Queue/FileProcessors/RarProcessor.cs
@@ -7,9 +7,8 @@ using SharpCompress.Common.Rar.Headers;
using SharpCompress.IO;
using SharpCompress.Readers;
using Usenet.Nzb;
-using Usenet.Yenc;
-namespace NzbWebDAV.Services.FileProcessors;
+namespace NzbWebDAV.Queue.FileProcessors;
public class RarProcessor(
NzbFile nzbFile,
diff --git a/backend/Services/QueueItemProcessor.cs b/backend/Queue/QueueItemProcessor.cs
similarity index 97%
rename from backend/Services/QueueItemProcessor.cs
rename to backend/Queue/QueueItemProcessor.cs
index 0d3ed9f6..eb4e0cbe 100644
--- a/backend/Services/QueueItemProcessor.cs
+++ b/backend/Queue/QueueItemProcessor.cs
@@ -5,14 +5,14 @@ using NzbWebDAV.Config;
using NzbWebDAV.Database;
using NzbWebDAV.Database.Models;
using NzbWebDAV.Extensions;
-using NzbWebDAV.Services.FileAggregators;
-using NzbWebDAV.Services.FileProcessors;
-using NzbWebDAV.Services.Validators;
+using NzbWebDAV.Queue.FileAggregators;
+using NzbWebDAV.Queue.FileProcessors;
+using NzbWebDAV.Queue.Validators;
using NzbWebDAV.Utils;
using Serilog;
using Usenet.Nzb;
-namespace NzbWebDAV.Services;
+namespace NzbWebDAV.Queue;
public class QueueItemProcessor(
QueueItem queueItem,
diff --git a/backend/Services/QueueManager.cs b/backend/Queue/QueueManager.cs
similarity index 99%
rename from backend/Services/QueueManager.cs
rename to backend/Queue/QueueManager.cs
index 8a00bbc2..fa972f99 100644
--- a/backend/Services/QueueManager.cs
+++ b/backend/Queue/QueueManager.cs
@@ -4,7 +4,7 @@ using NzbWebDAV.Database;
using NzbWebDAV.Database.Models;
using Serilog;
-namespace NzbWebDAV.Services;
+namespace NzbWebDAV.Queue;
public class QueueManager : IDisposable
{
diff --git a/backend/Services/Validators/EnsureImportableVideoValidator.cs b/backend/Queue/Validators/EnsureImportableVideoValidator.cs
similarity index 96%
rename from backend/Services/Validators/EnsureImportableVideoValidator.cs
rename to backend/Queue/Validators/EnsureImportableVideoValidator.cs
index 27fc7b08..47d08f8c 100644
--- a/backend/Services/Validators/EnsureImportableVideoValidator.cs
+++ b/backend/Queue/Validators/EnsureImportableVideoValidator.cs
@@ -3,7 +3,7 @@ using NzbWebDAV.Database;
using NzbWebDAV.Database.Models;
using NzbWebDAV.Exceptions;
-namespace NzbWebDAV.Services.Validators;
+namespace NzbWebDAV.Queue.Validators;
public class EnsureImportableVideoValidator(DavDatabaseClient dbClient)
{
diff --git a/backend/WebDav/DatabaseStore.cs b/backend/WebDav/DatabaseStore.cs
index 19924656..ce8591b1 100644
--- a/backend/WebDav/DatabaseStore.cs
+++ b/backend/WebDav/DatabaseStore.cs
@@ -3,7 +3,7 @@ using NzbWebDAV.Clients;
using NzbWebDAV.Config;
using NzbWebDAV.Database;
using NzbWebDAV.Database.Models;
-using NzbWebDAV.Services;
+using NzbWebDAV.Queue;
namespace NzbWebDAV.WebDav;
diff --git a/backend/WebDav/DatabaseStoreCollection.cs b/backend/WebDav/DatabaseStoreCollection.cs
index 9240c810..069152d4 100644
--- a/backend/WebDav/DatabaseStoreCollection.cs
+++ b/backend/WebDav/DatabaseStoreCollection.cs
@@ -5,7 +5,7 @@ using NzbWebDAV.Config;
using NzbWebDAV.Database;
using NzbWebDAV.Database.Models;
using NzbWebDAV.Extensions;
-using NzbWebDAV.Services;
+using NzbWebDAV.Queue;
using NzbWebDAV.WebDav.Base;
using NzbWebDAV.WebDav.Requests;
diff --git a/backend/WebDav/DatabaseStoreWatchFolder.cs b/backend/WebDav/DatabaseStoreWatchFolder.cs
index 0d9b8e35..0f06fa84 100644
--- a/backend/WebDav/DatabaseStoreWatchFolder.cs
+++ b/backend/WebDav/DatabaseStoreWatchFolder.cs
@@ -7,7 +7,7 @@ using NzbWebDAV.Clients;
using NzbWebDAV.Config;
using NzbWebDAV.Database;
using NzbWebDAV.Database.Models;
-using NzbWebDAV.Services;
+using NzbWebDAV.Queue;
using NzbWebDAV.WebDav.Requests;
namespace NzbWebDAV.WebDav;