Archive-Team
/
sonarr-repo-only
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove PostQueue from NzbGetProxy coz it's useless anyway.

This commit is contained in:
Taloth Saldono 2014-11-16 01:43:39 +01:00
parent c0a46e04b8
commit 374fe07aba
3 changed files with 1 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/NzbDrone.Core.Test/Download/DownloadClientTests/NzbgetTests/NzbgetFixture.cs
View File

@ -119,10 +119,6 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.NzbgetTests
Mocker.GetMock<INzbgetProxy>() Mocker.GetMock<INzbgetProxy>()
.Setup(s => s.GetQueue(It.IsAny<NzbgetSettings>())) .Setup(s => s.GetQueue(It.IsAny<NzbgetSettings>()))
.Returns(list); .Returns(list);
Mocker.GetMock<INzbgetProxy>()
.Setup(s => s.GetPostQueue(It.IsAny<NzbgetSettings>()))
.Returns(new List<NzbgetPostQueueItem>());
} }
protected virtual void GivenHistory(NzbgetHistoryItem history) protected virtual void GivenHistory(NzbgetHistoryItem history)

15
src/NzbDrone.Core/Download/Clients/Nzbget/Nzbget.cs
View File

@ -51,7 +51,6 @@ namespace NzbDrone.Core.Download.Clients.Nzbget
{ {
globalStatus = _proxy.GetGlobalStatus(Settings); globalStatus = _proxy.GetGlobalStatus(Settings);
queue = _proxy.GetQueue(Settings); queue = _proxy.GetQueue(Settings);
postQueue = _proxy.GetPostQueue(Settings).ToDictionary(v => v.NzbId);
} }
catch (DownloadClientException ex) catch (DownloadClientException ex)
{ {
@ -65,8 +64,6 @@ namespace NzbDrone.Core.Download.Clients.Nzbget
foreach (var item in queue) foreach (var item in queue)
{ {
var postQueueItem = postQueue.GetValueOrDefault(item.NzbId);
var totalSize = MakeInt64(item.FileSizeHi, item.FileSizeLo); var totalSize = MakeInt64(item.FileSizeHi, item.FileSizeLo);
var pausedSize = MakeInt64(item.PausedSizeHi, item.PausedSizeLo); var pausedSize = MakeInt64(item.PausedSizeHi, item.PausedSizeLo);
var remainingSize = MakeInt64(item.RemainingSizeHi, item.RemainingSizeLo); var remainingSize = MakeInt64(item.RemainingSizeHi, item.RemainingSizeLo);
@ -79,17 +76,7 @@ namespace NzbDrone.Core.Download.Clients.Nzbget
queueItem.TotalSize = totalSize; queueItem.TotalSize = totalSize;
queueItem.Category = item.Category; queueItem.Category = item.Category;
if (postQueueItem != null) if (globalStatus.DownloadPaused || remainingSize == pausedSize)
{
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)
{ {
queueItem.Status = DownloadItemStatus.Paused; queueItem.Status = DownloadItemStatus.Paused;
queueItem.RemainingSize = remainingSize; queueItem.RemainingSize = remainingSize;

8
src/NzbDrone.Core/Download/Clients/Nzbget/NzbgetProxy.cs
View File

@ -13,7 +13,6 @@ namespace NzbDrone.Core.Download.Clients.Nzbget
string DownloadNzb(Byte[] nzbData, string title, string category, int priority, NzbgetSettings settings); string DownloadNzb(Byte[] nzbData, string title, string category, int priority, NzbgetSettings settings);
NzbgetGlobalStatus GetGlobalStatus(NzbgetSettings settings); NzbgetGlobalStatus GetGlobalStatus(NzbgetSettings settings);
List<NzbgetQueueItem> GetQueue(NzbgetSettings settings); List<NzbgetQueueItem> GetQueue(NzbgetSettings settings);
List<NzbgetPostQueueItem> GetPostQueue(NzbgetSettings settings);
List<NzbgetHistoryItem> GetHistory(NzbgetSettings settings); List<NzbgetHistoryItem> GetHistory(NzbgetSettings settings);
String GetVersion(NzbgetSettings settings); String GetVersion(NzbgetSettings settings);
Dictionary<String, String> GetConfig(NzbgetSettings settings); Dictionary<String, String> GetConfig(NzbgetSettings settings);
@ -76,13 +75,6 @@ namespace NzbDrone.Core.Download.Clients.Nzbget
return Json.Deserialize<NzbgetResponse<List<NzbgetQueueItem>>>(ProcessRequest(request, settings)).Result; return Json.Deserialize<NzbgetResponse<List<NzbgetQueueItem>>>(ProcessRequest(request, settings)).Result;
} }
public List<NzbgetPostQueueItem> GetPostQueue(NzbgetSettings settings)
{
var request = BuildRequest(new JsonRequest("postqueue"));
return Json.Deserialize<NzbgetResponse<List<NzbgetPostQueueItem>>>(ProcessRequest(request, settings)).Result;
}
public List<NzbgetHistoryItem> GetHistory(NzbgetSettings settings) public List<NzbgetHistoryItem> GetHistory(NzbgetSettings settings)
{ {
var request = BuildRequest(new JsonRequest("history")); var request = BuildRequest(new JsonRequest("history"));