Skip to content

fix(sabnzbd): Fix delete implementation to respect finished action #991

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rogerfar merged 1 commit into from
May 31, 2026
Merged

fix(sabnzbd): Fix delete implementation to respect finished action #991

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 58 additions & 0 deletions server/RdtClient.Service.Test/Services/SabnzbdTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,6 +366,64 @@ public async Task GetHistory_ShouldReturnFailedStatus_WhenTorrentHasError()
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()
{
Expand Down
14 changes: 7 additions & 7 deletions server/RdtClient.Service/Services/Sabnzbd.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ public virtual async Task<String> AddUrl(String url, String? category, Int32? pr
return result.Hash;
}

public virtual async Task Delete(String hash)
public virtual async Task Delete(String hash, Boolean deleteFiles = false)
{
var torrent = await torrents.GetByHash(hash);

Expand All @@ -189,18 +189,18 @@ public virtual async Task Delete(String hash)
switch (settings.Current.Integrations.Default.FinishedAction)
{
case TorrentFinishedAction.RemoveAllTorrents:
logger.LogDebug("Removing nzb from debrid provider and RDT-Client, no files");
await torrents.Delete(torrent.TorrentId, true, true, true);
logger.LogDebug("Removing nzb from debrid provider and RDT-Client, {Files}", deleteFiles ? "with files" : "no files");
await torrents.Delete(torrent.TorrentId, true, true, deleteFiles);

break;
case TorrentFinishedAction.RemoveRealDebrid:
logger.LogDebug("Removing nzb from debrid provider, no files");
await torrents.Delete(torrent.TorrentId, false, true, true);
logger.LogDebug("Removing nzb from debrid provider, {Files}", deleteFiles ? "with files" : "no files");
await torrents.Delete(torrent.TorrentId, false, true, deleteFiles);

break;
case TorrentFinishedAction.RemoveClient:
logger.LogDebug("Removing nzb from client, no files");
await torrents.Delete(torrent.TorrentId, true, false, true);
logger.LogDebug("Removing nzb from client, {Files}", deleteFiles ? "with files" : "no files");
await torrents.Delete(torrent.TorrentId, true, false, deleteFiles);

break;
case TorrentFinishedAction.None:
Expand Down
44 changes: 44 additions & 0 deletions server/RdtClient.Web.Test/Controllers/SabnzbdControllerTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,30 @@ public async Task GetQueue_WithMaAuth_ReturnsOk()
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()
{
Expand All @@ -129,6 +153,26 @@ public async Task GetHistory_ReturnsOk()
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()
{
Expand Down
53 changes: 37 additions & 16 deletions server/RdtClient.Web/Controllers/SabnzbdController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,22 +56,7 @@ public async Task<ActionResult> Queue()

if (name == "delete")
{
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 await DeleteDownloads();
}

return Ok(new SabnzbdResponse
Expand All @@ -85,6 +70,12 @@ public async Task<ActionResult> Queue()
public async Task<ActionResult> History()
{
logger.LogDebug("Sabnzbd mode: history");
var name = GetParam("name");

if (name == "delete")
{
return await DeleteDownloads();
}

return Ok(new SabnzbdResponse
{
Expand Down Expand Up @@ -183,6 +174,31 @@ public async Task<ActionResult> FullStatus()
});
}

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();
Expand All @@ -194,4 +210,9 @@ public async Task<ActionResult> FullStatus()

return value;
}

private static Boolean IsTrue(String? value)
{
return value is "1" || Boolean.TryParse(value, out var result) && result;
}
}