CHANGELOG.md

@@ -6,10 +6,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased
 
-## [2.0.138] - 2026-06-05
-### Fixed
-- SABnzbd fixes.
-
 ## [2.0.137] - 2026-06-05
 ### Fixed
 - Fix torbox save path mapping for single file downloads.

server/RdtClient.Service.Test/Services/SabnzbdTest.cs

@@ -366,64 +366,6 @@ public class SabnzbdTest
         Assert.Equal("Failed", result.Slots[0].Status);
     }
 
-    [Theory]
-    [InlineData(TorrentFinishedAction.RemoveAllTorrents, true, true, true, true)]
-    [InlineData(TorrentFinishedAction.RemoveAllTorrents, false, true, true, false)]
-    [InlineData(TorrentFinishedAction.RemoveRealDebrid, true, false, true, true)]
-    [InlineData(TorrentFinishedAction.RemoveRealDebrid, false, false, true, false)]
-    [InlineData(TorrentFinishedAction.RemoveClient, true, true, false, true)]
-    [InlineData(TorrentFinishedAction.RemoveClient, false, true, false, false)]
-    public async Task Delete_ShouldRespectFinishedActionAndDeleteFiles(
-        TorrentFinishedAction finishedAction,
-        Boolean deleteFiles,
-        Boolean expectedDeleteData,
-        Boolean expectedDeleteRdTorrent,
-        Boolean expectedDeleteLocalFiles)
-    {
-        // Arrange
-        var torrentId = Guid.NewGuid();
-        _settings.Current.Integrations.Default.FinishedAction = finishedAction;
-
-        _torrentsMock.Setup(t => t.GetByHash("hash1"))
-                     .ReturnsAsync(new Torrent
-                     {
-                         TorrentId = torrentId,
-                         Hash = "hash1",
-                         Type = DownloadType.Nzb
-                     });
-
-        var sabnzbd = new Sabnzbd(_loggerMock.Object, _torrentsMock.Object, _appSettings, _settings);
-
-        // Act
-        await sabnzbd.Delete("hash1", deleteFiles);
-
-        // Assert
-        _torrentsMock.Verify(t => t.Delete(torrentId, expectedDeleteData, expectedDeleteRdTorrent, expectedDeleteLocalFiles), Times.Once);
-    }
-
-    [Fact]
-    public async Task Delete_ShouldNotDelete_WhenFinishedActionIsNone()
-    {
-        // Arrange
-        _settings.Current.Integrations.Default.FinishedAction = TorrentFinishedAction.None;
-
-        _torrentsMock.Setup(t => t.GetByHash("hash1"))
-                     .ReturnsAsync(new Torrent
-                     {
-                         TorrentId = Guid.NewGuid(),
-                         Hash = "hash1",
-                         Type = DownloadType.Nzb
-                     });
-
-        var sabnzbd = new Sabnzbd(_loggerMock.Object, _torrentsMock.Object, _appSettings, _settings);
-
-        // Act
-        await sabnzbd.Delete("hash1", true);
-
-        // Assert
-        _torrentsMock.Verify(t => t.Delete(It.IsAny<Guid>(), It.IsAny<Boolean>(), It.IsAny<Boolean>(), It.IsAny<Boolean>()), Times.Never);
-    }
-
     [Fact]
     public void GetConfig_ShouldReturnCorrectConfig()
     {

server/RdtClient.Service/Services/Sabnzbd.cs

@@ -177,7 +177,7 @@ public class Sabnzbd(ILogger<Sabnzbd> logger, Torrents torrents, AppSettings app
         return result.Hash;
     }
 
-    public virtual async Task Delete(String hash, Boolean deleteFiles = false)
+    public virtual async Task Delete(String hash)
     {
         var torrent = await torrents.GetByHash(hash);
 
@@ -189,18 +189,18 @@ public class Sabnzbd(ILogger<Sabnzbd> logger, Torrents torrents, AppSettings app
         switch (settings.Current.Integrations.Default.FinishedAction)
         {
             case TorrentFinishedAction.RemoveAllTorrents:
-                logger.LogDebug("Removing nzb from debrid provider and RDT-Client, {Files}", deleteFiles ? "with files" : "no files");
-                await torrents.Delete(torrent.TorrentId, true, true, deleteFiles);
+                logger.LogDebug("Removing nzb from debrid provider and RDT-Client, no files");
+                await torrents.Delete(torrent.TorrentId, true, true, true);
 
                 break;
             case TorrentFinishedAction.RemoveRealDebrid:
-                logger.LogDebug("Removing nzb from debrid provider, {Files}", deleteFiles ? "with files" : "no files");
-                await torrents.Delete(torrent.TorrentId, false, true, deleteFiles);
+                logger.LogDebug("Removing nzb from debrid provider, no files");
+                await torrents.Delete(torrent.TorrentId, false, true, true);
 
                 break;
             case TorrentFinishedAction.RemoveClient:
-                logger.LogDebug("Removing nzb from client, {Files}", deleteFiles ? "with files" : "no files");
-                await torrents.Delete(torrent.TorrentId, true, false, deleteFiles);
+                logger.LogDebug("Removing nzb from client, no files");
+                await torrents.Delete(torrent.TorrentId, true, false, true);
 
                 break;
             case TorrentFinishedAction.None:

server/RdtClient.Web.Test/Controllers/SabnzbdControllerTest.cs

@@ -108,30 +108,6 @@ public class SabnzbdControllerTest
         Assert.IsType<OkObjectResult>(result);
     }
 
-    [Theory]
-    [InlineData("?name=delete&value=hash1&del_files=1", true)]
-    [InlineData("?name=delete&value=hash1&del_files=true", true)]
-    [InlineData("?name=delete&value=hash1&del_files=0", false)]
-    [InlineData("?name=delete&value=hash1", false)]
-    public async Task Queue_Delete_PassesDeleteFilesFlag(String queryString, Boolean expectedDeleteFiles)
-    {
-        // Arrange
-        var httpContext = new DefaultHttpContext();
-        httpContext.Request.QueryString = new(queryString);
-        _controller.ControllerContext.HttpContext = httpContext;
-
-        _sabnzbdMock.Setup(s => s.Delete("hash1", expectedDeleteFiles)).Returns(Task.CompletedTask);
-
-        // Act
-        var result = await _controller.Queue();
-
-        // Assert
-        var okResult = Assert.IsType<OkObjectResult>(result);
-        var response = Assert.IsType<SabnzbdResponse>(okResult.Value);
-        Assert.True(response.Status);
-        _sabnzbdMock.Verify(s => s.Delete("hash1", expectedDeleteFiles), Times.Once);
-    }
-
     [Fact]
     public async Task GetHistory_ReturnsOk()
     {
@@ -153,26 +129,6 @@ public class SabnzbdControllerTest
         Assert.Equal(1, response.History.NoOfSlots);
     }
 
-    [Fact]
-    public async Task History_Delete_PassesDeleteFilesFlag()
-    {
-        // Arrange
-        var httpContext = new DefaultHttpContext();
-        httpContext.Request.QueryString = new("?name=delete&value=hash1&del_files=1");
-        _controller.ControllerContext.HttpContext = httpContext;
-
-        _sabnzbdMock.Setup(s => s.Delete("hash1", true)).Returns(Task.CompletedTask);
-
-        // Act
-        var result = await _controller.History();
-
-        // Assert
-        var okResult = Assert.IsType<OkObjectResult>(result);
-        var response = Assert.IsType<SabnzbdResponse>(okResult.Value);
-        Assert.True(response.Status);
-        _sabnzbdMock.Verify(s => s.Delete("hash1", true), Times.Once);
-    }
-
     [Fact]
     public void GetVersion_HasAllowAnonymousAttribute()
     {

server/RdtClient.Web/Controllers/SabnzbdController.cs

@@ -56,7 +56,22 @@ public class SabnzbdController(ILogger<SabnzbdController> logger, Sabnzbd sabnzb
 
         if (name == "delete")
         {
-            return await DeleteDownloads();
+            var value = GetParam("value");
+
+            if (String.IsNullOrWhiteSpace(value))
+            {
+                return BadRequest(new SabnzbdResponse
+                {
+                    Error = "No value specified for delete operation"
+                });
+            }
+
+            await sabnzbd.Delete(value ?? "");
+
+            return Ok(new SabnzbdResponse
+            {
+                Status = true
+            });
         }
 
         return Ok(new SabnzbdResponse
@@ -70,12 +85,6 @@ public class SabnzbdController(ILogger<SabnzbdController> logger, Sabnzbd sabnzb
     public async Task<ActionResult> History()
     {
         logger.LogDebug("Sabnzbd mode: history");
-        var name = GetParam("name");
-
-        if (name == "delete")
-        {
-            return await DeleteDownloads();
-        }
 
         return Ok(new SabnzbdResponse
         {
@@ -174,31 +183,6 @@ public class SabnzbdController(ILogger<SabnzbdController> logger, Sabnzbd sabnzb
         });
     }
 
-    private async Task<ActionResult> DeleteDownloads()
-    {
-        var value = GetParam("value");
-
-        if (String.IsNullOrWhiteSpace(value))
-        {
-            return BadRequest(new SabnzbdResponse
-            {
-                Error = "No value specified for delete operation"
-            });
-        }
-
-        var deleteFiles = IsTrue(GetParam("del_files"));
-
-        foreach (var hash in value.Split(",", StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries))
-        {
-            await sabnzbd.Delete(hash, deleteFiles);
-        }
-
-        return Ok(new SabnzbdResponse
-        {
-            Status = true
-        });
-    }
-
     private String? GetParam(String name)
     {
         var value = Request.Query[name].ToString();
@@ -210,9 +194,4 @@ public class SabnzbdController(ILogger<SabnzbdController> logger, Sabnzbd sabnzb
 
         return value;
     }
-
-    private static Boolean IsTrue(String? value)
-    {
-        return value is "1" || Boolean.TryParse(value, out var result) && result;
-    }
 }