From f9312eb3e564cf692b47f7201ba653325e560a33 Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Mon, 17 Feb 2014 17:57:20 -0800 Subject: [PATCH] Fixed a copy pasta error for SAB history --- src/NzbDrone.Core/Download/Clients/Blackhole/Blackhole.cs | 2 +- src/NzbDrone.Core/Download/Clients/Nzbget/Nzbget.cs | 2 +- src/NzbDrone.Core/Download/Clients/Pneumatic/Pneumatic.cs | 2 +- src/NzbDrone.Core/Download/Clients/Sabnzbd/Sabnzbd.cs | 2 +- src/NzbDrone.Core/Download/Clients/Sabnzbd/SabnzbdProxy.cs | 2 +- src/NzbDrone.Core/Download/DownloadClientBase.cs | 2 +- src/UI/.idea/jsLinters/jshint.xml | 4 ++-- .../Settings/DownloadClient/Add/DownloadClientAddItemView.js | 4 +--- 8 files changed, 9 insertions(+), 11 deletions(-) diff --git a/src/NzbDrone.Core/Download/Clients/Blackhole/Blackhole.cs b/src/NzbDrone.Core/Download/Clients/Blackhole/Blackhole.cs index 28cc9eb9e..8b5ff0242 100644 --- a/src/NzbDrone.Core/Download/Clients/Blackhole/Blackhole.cs +++ b/src/NzbDrone.Core/Download/Clients/Blackhole/Blackhole.cs @@ -45,7 +45,7 @@ namespace NzbDrone.Core.Download.Clients.Blackhole return new QueueItem[0]; } - public override IEnumerable GetHistory(int start = 0, int limit = 0) + public override IEnumerable GetHistory(int start = 0, int limit = 10) { return new HistoryItem[0]; } diff --git a/src/NzbDrone.Core/Download/Clients/Nzbget/Nzbget.cs b/src/NzbDrone.Core/Download/Clients/Nzbget/Nzbget.cs index 6133a631f..aa172e449 100644 --- a/src/NzbDrone.Core/Download/Clients/Nzbget/Nzbget.cs +++ b/src/NzbDrone.Core/Download/Clients/Nzbget/Nzbget.cs @@ -65,7 +65,7 @@ namespace NzbDrone.Core.Download.Clients.Nzbget } } - public override IEnumerable GetHistory(int start = 0, int limit = 0) + public override IEnumerable GetHistory(int start = 0, int limit = 10) { return new HistoryItem[0]; } diff --git a/src/NzbDrone.Core/Download/Clients/Pneumatic/Pneumatic.cs b/src/NzbDrone.Core/Download/Clients/Pneumatic/Pneumatic.cs index 3b63d5383..3c875b9c8 100644 --- a/src/NzbDrone.Core/Download/Clients/Pneumatic/Pneumatic.cs +++ b/src/NzbDrone.Core/Download/Clients/Pneumatic/Pneumatic.cs @@ -67,7 +67,7 @@ namespace NzbDrone.Core.Download.Clients.Pneumatic return new QueueItem[0]; } - public override IEnumerable GetHistory(int start = 0, int limit = 0) + public override IEnumerable GetHistory(int start = 0, int limit = 10) { return new HistoryItem[0]; } diff --git a/src/NzbDrone.Core/Download/Clients/Sabnzbd/Sabnzbd.cs b/src/NzbDrone.Core/Download/Clients/Sabnzbd/Sabnzbd.cs index c9c7ef395..79777d009 100644 --- a/src/NzbDrone.Core/Download/Clients/Sabnzbd/Sabnzbd.cs +++ b/src/NzbDrone.Core/Download/Clients/Sabnzbd/Sabnzbd.cs @@ -89,7 +89,7 @@ namespace NzbDrone.Core.Download.Clients.Sabnzbd }, TimeSpan.FromSeconds(10)); } - public override IEnumerable GetHistory(int start = 0, int limit = 0) + public override IEnumerable GetHistory(int start = 0, int limit = 10) { var items = _sabnzbdProxy.GetHistory(start, limit, Settings).Items; var historyItems = new List(); diff --git a/src/NzbDrone.Core/Download/Clients/Sabnzbd/SabnzbdProxy.cs b/src/NzbDrone.Core/Download/Clients/Sabnzbd/SabnzbdProxy.cs index 59fac17dd..be2c499d4 100644 --- a/src/NzbDrone.Core/Download/Clients/Sabnzbd/SabnzbdProxy.cs +++ b/src/NzbDrone.Core/Download/Clients/Sabnzbd/SabnzbdProxy.cs @@ -108,7 +108,7 @@ namespace NzbDrone.Core.Download.Clients.Sabnzbd public SabnzbdHistory GetHistory(int start, int limit, SabnzbdSettings settings) { var request = new RestRequest(); - var action = String.Format("mode=queue&start={0}&limit={1}", start, limit); + var action = String.Format("mode=history&start={0}&limit={1}", start, limit); var response = ProcessRequest(request, action, settings); return Json.Deserialize(JObject.Parse(response).SelectToken("history").ToString()); diff --git a/src/NzbDrone.Core/Download/DownloadClientBase.cs b/src/NzbDrone.Core/Download/DownloadClientBase.cs index b86eda48f..157b1e855 100644 --- a/src/NzbDrone.Core/Download/DownloadClientBase.cs +++ b/src/NzbDrone.Core/Download/DownloadClientBase.cs @@ -41,7 +41,7 @@ namespace NzbDrone.Core.Download public abstract string DownloadNzb(RemoteEpisode remoteEpisode); public abstract IEnumerable GetQueue(); - public abstract IEnumerable GetHistory(int start = 0, int limit = 0); + public abstract IEnumerable GetHistory(int start = 0, int limit = 10); public abstract void RemoveFromQueue(string id); public abstract void RemoveFromHistory(string id); } diff --git a/src/UI/.idea/jsLinters/jshint.xml b/src/UI/.idea/jsLinters/jshint.xml index e85398a55..4e0df49ad 100644 --- a/src/UI/.idea/jsLinters/jshint.xml +++ b/src/UI/.idea/jsLinters/jshint.xml @@ -8,16 +8,16 @@