mirror/Radarr
1
0
Fork 0
mirror of https://github.com/Radarr/Radarr synced 2025-02-23 14:51:17 +00:00
Code Issues Releases Wiki Activity

New: Filter SABnzbd queue by category

Browse source 
(cherry picked from commit 49fd9c4462741e756e0cd43c287939f929de11b2)
This commit is contained in:
Mark McDowall 2023-05-26 17:13:58 -07:00 committed by Bogdan
parent 1bf3302ec2
commit bbcd0b7861
3 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/NzbDrone.Core.Test/Download/DownloadClientTests/SabnzbdTests/SabnzbdFixture.cs
View file

@ -174,7 +174,7 @@ protected virtual void GivenHistory(SabnzbdHistory history)
}
Mocker.GetMock<ISabnzbdProxy>()
.Setup(s => s.GetHistory(It.IsAny<int>(), It.IsAny<int>(), It.IsAny<string>(), It.IsAny<SabnzbdSettings>()))
.Setup(s => s.GetHistory(It.IsAny<int>(), It.IsAny<int>(), It.IsAny<SabnzbdSettings>()))
.Returns(history);
}

2
src/NzbDrone.Core/Download/Clients/Sabnzbd/Sabnzbd.cs
View file

@ -107,7 +107,7 @@ private IEnumerable<DownloadClientItem> GetQueue()
private IEnumerable<DownloadClientItem> GetHistory()
{
var sabHistory = _proxy.GetHistory(0, _configService.DownloadClientHistoryLimit, Settings.MovieCategory, Settings);
var sabHistory = _proxy.GetHistory(0, _configService.DownloadClientHistoryLimit, Settings);
var historyItems = new List<DownloadClientItem>();

15
src/NzbDrone.Core/Download/Clients/Sabnzbd/SabnzbdProxy.cs
View file

@ -19,7 +19,7 @@ public interface ISabnzbdProxy
SabnzbdConfig GetConfig(SabnzbdSettings settings);
SabnzbdFullStatus GetFullStatus(SabnzbdSettings settings);
SabnzbdQueue GetQueue(int start, int limit, SabnzbdSettings settings);
SabnzbdHistory GetHistory(int start, int limit, string category, SabnzbdSettings settings);
SabnzbdHistory GetHistory(int start, int limit, SabnzbdSettings settings);
string RetryDownload(string id, SabnzbdSettings settings);
}
@ -46,7 +46,7 @@ public SabnzbdAddResponse DownloadNzb(byte[] nzbData, string filename, string ca
{
var request = BuildRequest("addfile", settings).Post();
request.AddQueryParam("cat", category);
request.AddQueryParam("cat", settings.MovieCategory);
request.AddQueryParam("priority", priority);
request.AddFormUpload("name", filename, nzbData, "application/x-nzb");
@ -111,20 +111,25 @@ public SabnzbdQueue GetQueue(int start, int limit, SabnzbdSettings settings)
request.AddQueryParam("start", start);
request.AddQueryParam("limit", limit);
if (settings.MovieCategory.IsNotNullOrWhiteSpace())
{
request.AddQueryParam("category", settings.MovieCategory);
}
var response = ProcessRequest(request, settings);
return Json.Deserialize<SabnzbdQueue>(JObject.Parse(response).SelectToken("queue").ToString());
}
public SabnzbdHistory GetHistory(int start, int limit, string category, SabnzbdSettings settings)
public SabnzbdHistory GetHistory(int start, int limit, SabnzbdSettings settings)
{
var request = BuildRequest("history", settings);
request.AddQueryParam("start", start);
request.AddQueryParam("limit", limit);
if (category.IsNotNullOrWhiteSpace())
if (settings.MovieCategory.IsNotNullOrWhiteSpace())
{
request.AddQueryParam("category", category);
request.AddQueryParam("category", settings.MovieCategory);
}
var response = ProcessRequest(request, settings);