From 374fe07ababf037640f653baaa7c171fafca3505 Mon Sep 17 00:00:00 2001 From: Taloth Saldono Date: Sun, 16 Nov 2014 01:43:39 +0100 Subject: [PATCH] Remove PostQueue from NzbGetProxy coz it's useless anyway. --- .../NzbgetTests/NzbgetFixture.cs | 4 ---- .../Download/Clients/Nzbget/Nzbget.cs | 15 +-------------- .../Download/Clients/Nzbget/NzbgetProxy.cs | 8 -------- 3 files changed, 1 insertion(+), 26 deletions(-) diff --git a/src/NzbDrone.Core.Test/Download/DownloadClientTests/NzbgetTests/NzbgetFixture.cs b/src/NzbDrone.Core.Test/Download/DownloadClientTests/NzbgetTests/NzbgetFixture.cs index 45d92f4e0..87d193506 100644 --- a/src/NzbDrone.Core.Test/Download/DownloadClientTests/NzbgetTests/NzbgetFixture.cs +++ b/src/NzbDrone.Core.Test/Download/DownloadClientTests/NzbgetTests/NzbgetFixture.cs @@ -119,10 +119,6 @@ protected virtual void GivenQueue(NzbgetQueueItem queue) Mocker.GetMock() .Setup(s => s.GetQueue(It.IsAny())) .Returns(list); - - Mocker.GetMock() - .Setup(s => s.GetPostQueue(It.IsAny())) - .Returns(new List()); } protected virtual void GivenHistory(NzbgetHistoryItem history) diff --git a/src/NzbDrone.Core/Download/Clients/Nzbget/Nzbget.cs b/src/NzbDrone.Core/Download/Clients/Nzbget/Nzbget.cs index 94fbeeda2..cd03da3ed 100644 --- a/src/NzbDrone.Core/Download/Clients/Nzbget/Nzbget.cs +++ b/src/NzbDrone.Core/Download/Clients/Nzbget/Nzbget.cs @@ -51,7 +51,6 @@ private IEnumerable GetQueue() { globalStatus = _proxy.GetGlobalStatus(Settings); queue = _proxy.GetQueue(Settings); - postQueue = _proxy.GetPostQueue(Settings).ToDictionary(v => v.NzbId); } catch (DownloadClientException ex) { @@ -65,8 +64,6 @@ private IEnumerable GetQueue() foreach (var item in queue) { - var postQueueItem = postQueue.GetValueOrDefault(item.NzbId); - var totalSize = MakeInt64(item.FileSizeHi, item.FileSizeLo); var pausedSize = MakeInt64(item.PausedSizeHi, item.PausedSizeLo); var remainingSize = MakeInt64(item.RemainingSizeHi, item.RemainingSizeLo); @@ -79,17 +76,7 @@ private IEnumerable GetQueue() queueItem.TotalSize = totalSize; queueItem.Category = item.Category; - if (postQueueItem != null) - { - queueItem.Status = DownloadItemStatus.Downloading; - queueItem.Message = postQueueItem.ProgressLabel; - - if (postQueueItem.StageProgress != 0) - { - queueItem.RemainingTime = TimeSpan.FromSeconds(postQueueItem.StageTimeSec * 1000 / postQueueItem.StageProgress - postQueueItem.StageTimeSec); - } - } - else if (globalStatus.DownloadPaused || remainingSize == pausedSize) + if (globalStatus.DownloadPaused || remainingSize == pausedSize) { queueItem.Status = DownloadItemStatus.Paused; queueItem.RemainingSize = remainingSize; diff --git a/src/NzbDrone.Core/Download/Clients/Nzbget/NzbgetProxy.cs b/src/NzbDrone.Core/Download/Clients/Nzbget/NzbgetProxy.cs index 0bf05218d..3771bd795 100644 --- a/src/NzbDrone.Core/Download/Clients/Nzbget/NzbgetProxy.cs +++ b/src/NzbDrone.Core/Download/Clients/Nzbget/NzbgetProxy.cs @@ -13,7 +13,6 @@ public interface INzbgetProxy string DownloadNzb(Byte[] nzbData, string title, string category, int priority, NzbgetSettings settings); NzbgetGlobalStatus GetGlobalStatus(NzbgetSettings settings); List GetQueue(NzbgetSettings settings); - List GetPostQueue(NzbgetSettings settings); List GetHistory(NzbgetSettings settings); String GetVersion(NzbgetSettings settings); Dictionary GetConfig(NzbgetSettings settings); @@ -76,13 +75,6 @@ public List GetQueue(NzbgetSettings settings) return Json.Deserialize>>(ProcessRequest(request, settings)).Result; } - public List GetPostQueue(NzbgetSettings settings) - { - var request = BuildRequest(new JsonRequest("postqueue")); - - return Json.Deserialize>>(ProcessRequest(request, settings)).Result; - } - public List GetHistory(NzbgetSettings settings) { var request = BuildRequest(new JsonRequest("history"));