Fixed: Ignore deleted duplicates from Nzbget

Fixes #1721
This commit is contained in:
Mark McDowall 2019-05-08 22:25:10 -07:00
parent 5fe1ce1eff
commit 0c2331f638
1 changed files with 3 additions and 5 deletions

View File

@ -9,6 +9,7 @@ using NzbDrone.Common.Disk;
using NzbDrone.Common.Extensions; using NzbDrone.Common.Extensions;
using NzbDrone.Common.Http; using NzbDrone.Common.Http;
using NzbDrone.Core.Configuration; using NzbDrone.Core.Configuration;
using NzbDrone.Core.Exceptions;
using NzbDrone.Core.Parser.Model; using NzbDrone.Core.Parser.Model;
using NzbDrone.Core.RemotePathMappings; using NzbDrone.Core.RemotePathMappings;
using NzbDrone.Core.Validation; using NzbDrone.Core.Validation;
@ -36,16 +37,13 @@ namespace NzbDrone.Core.Download.Clients.Nzbget
protected override string AddFromNzbFile(RemoteEpisode remoteEpisode, string filename, byte[] fileContent) protected override string AddFromNzbFile(RemoteEpisode remoteEpisode, string filename, byte[] fileContent)
{ {
var category = Settings.TvCategory; var category = Settings.TvCategory;
var priority = remoteEpisode.IsRecentEpisode() ? Settings.RecentTvPriority : Settings.OlderTvPriority; var priority = remoteEpisode.IsRecentEpisode() ? Settings.RecentTvPriority : Settings.OlderTvPriority;
var addpaused = Settings.AddPaused; var addpaused = Settings.AddPaused;
var response = _proxy.DownloadNzb(fileContent, filename, category, priority, addpaused, Settings); var response = _proxy.DownloadNzb(fileContent, filename, category, priority, addpaused, Settings);
if (response == null) if (response == null)
{ {
throw new DownloadClientException("Failed to add nzb {0}", filename); throw new DownloadClientRejectedReleaseException(remoteEpisode.Release, "NZBGet rejected the NZB for an unknown reason");
} }
return response; return response;
@ -132,7 +130,7 @@ namespace NzbDrone.Core.Download.Clients.Nzbget
historyItem.CanMoveFiles = true; historyItem.CanMoveFiles = true;
historyItem.CanBeRemoved = true; historyItem.CanBeRemoved = true;
if (item.DeleteStatus == "MANUAL") if (item.DeleteStatus == "MANUAL" || item.DeleteStatus == "COPY")
{ {
continue; continue;
} }