Download decision rejection reasons are no longer static messages

New: Better messaging on manual search when release is rejected
This commit is contained in:
Mark McDowall
2014-10-26 22:51:50 -07:00
parent e82b29e346
commit 95d67ef9f4
41 changed files with 265 additions and 378 deletions
@@ -1,6 +1,7 @@
using System;
using System.Linq;
using NLog;
using NzbDrone.Common.Extensions;
using NzbDrone.Core.IndexerSearch.Definitions;
using NzbDrone.Core.Parser.Model;
using NzbDrone.Core.Qualities;
@@ -22,14 +23,9 @@ namespace NzbDrone.Core.DecisionEngine.Specifications
_logger = logger;
}
public String RejectionReason
{
get { return "File size too big or small"; }
}
public RejectionType Type { get { return RejectionType.Permanent; } }
public bool IsSatisfiedBy(RemoteEpisode subject, SearchCriteriaBase searchCriteria)
public Decision IsSatisfiedBy(RemoteEpisode subject, SearchCriteriaBase searchCriteria)
{
_logger.Debug("Beginning size check for: {0}", subject);
@@ -38,13 +34,13 @@ namespace NzbDrone.Core.DecisionEngine.Specifications
if (quality == Quality.RAWHD)
{
_logger.Debug("Raw-HD release found, skipping size check.");
return true;
return Decision.Accept();
}
if (quality == Quality.Unknown)
{
_logger.Debug("Unknown quality. skipping size check.");
return false;
return Decision.Accept();
}
var qualityDefinition = _qualityDefinitionService.Get(quality);
@@ -56,8 +52,8 @@ namespace NzbDrone.Core.DecisionEngine.Specifications
//If the parsed size is smaller than minSize we don't want it
if (subject.Release.Size < minSize)
{
_logger.Debug("Item: {0}, Size: {1} is smaller than minimum allowed size ({2}), rejecting.", subject, subject.Release.Size, minSize);
return false;
_logger.Debug("Item: {0}, Size: {1:0n} is smaller than minimum allowed size ({2:0}), rejecting.", subject, subject.Release.Size, minSize);
return Decision.Reject("{0} is smaller than minimum allowed: {1}", subject.Release.Size.SizeSuffix(), minSize.SizeSuffix());
}
if (qualityDefinition.MaxSize == 0)
{
@@ -97,11 +93,12 @@ namespace NzbDrone.Core.DecisionEngine.Specifications
if (subject.Release.Size > maxSize)
{
_logger.Debug("Item: {0}, Size: {1} is greater than maximum allowed size ({2}), rejecting.", subject, subject.Release.Size, maxSize);
return false;
return Decision.Reject("{0} is larger than maximum allowed: {1}", subject.Release.Size, maxSize);
}
}
_logger.Debug("Item: {0}, meets size constraints.", subject);
return true;
return Decision.Accept();
}
}
}
@@ -18,23 +18,15 @@ namespace NzbDrone.Core.DecisionEngine.Specifications
_logger = logger;
}
public string RejectionReason
{
get
{
return "Version upgrade for a different release group";
}
}
public RejectionType Type { get { return RejectionType.Permanent; } }
public virtual bool IsSatisfiedBy(RemoteEpisode subject, SearchCriteriaBase searchCriteria)
public virtual Decision IsSatisfiedBy(RemoteEpisode subject, SearchCriteriaBase searchCriteria)
{
var releaseGroup = subject.ParsedEpisodeInfo.ReleaseGroup;
if (subject.Series.SeriesType != SeriesTypes.Anime)
{
return true;
return Decision.Accept();
}
foreach (var file in subject.Episodes.Where(c => c.EpisodeFileId != 0).Select(c => c.EpisodeFile.Value))
@@ -44,24 +36,24 @@ namespace NzbDrone.Core.DecisionEngine.Specifications
if (file.ReleaseGroup.IsNullOrWhiteSpace())
{
_logger.Debug("Unable to compare release group, existing file's release group is unknown");
return false;
return Decision.Reject("Existing release group is unknown");
}
if (releaseGroup.IsNullOrWhiteSpace())
{
_logger.Debug("Unable to compare release group, release's release group is unknown");
return false;
return Decision.Reject("Release group is unknown");
}
if (file.ReleaseGroup != releaseGroup)
{
_logger.Debug("Existing Release group is: {0} - release's release group is: {1}", file.ReleaseGroup, releaseGroup);
return false;
return Decision.Reject("{0} does not match existing release group {1}", releaseGroup, file.ReleaseGroup);
}
}
}
return true;
return Decision.Accept();
}
}
}
@@ -19,31 +19,23 @@ namespace NzbDrone.Core.DecisionEngine.Specifications
_logger = logger;
}
public string RejectionReason
{
get
{
return "Release is blacklisted";
}
}
public RejectionType Type { get { return RejectionType.Permanent; } }
public bool IsSatisfiedBy(RemoteEpisode subject, SearchCriteriaBase searchCriteria)
public Decision IsSatisfiedBy(RemoteEpisode subject, SearchCriteriaBase searchCriteria)
{
if (!_configService.EnableFailedDownloadHandling)
{
_logger.Debug("Failed Download Handling is not enabled");
return true;
return Decision.Accept();
}
if (_blacklistService.Blacklisted(subject.Series.Id, subject.Release.Title, subject.Release.PublishDate))
{
_logger.Debug("{0} is blacklisted, rejecting.", subject.Release.Title);
return false;
return Decision.Reject("Release is blacklisted");
}
return true;
return Decision.Accept();
}
}
}
@@ -16,17 +16,9 @@ namespace NzbDrone.Core.DecisionEngine.Specifications
_logger = logger;
}
public string RejectionReason
{
get
{
return "Cutoff has already been met";
}
}
public RejectionType Type { get { return RejectionType.Permanent; } }
public virtual bool IsSatisfiedBy(RemoteEpisode subject, SearchCriteriaBase searchCriteria)
public virtual Decision IsSatisfiedBy(RemoteEpisode subject, SearchCriteriaBase searchCriteria)
{
foreach (var file in subject.Episodes.Where(c => c.EpisodeFileId != 0).Select(c => c.EpisodeFile.Value))
{
@@ -36,11 +28,11 @@ namespace NzbDrone.Core.DecisionEngine.Specifications
if (!_qualityUpgradableSpecification.CutoffNotMet(subject.Series.Profile, file.Quality, subject.ParsedEpisodeInfo.Quality))
{
_logger.Debug("Cutoff already met, rejecting.");
return false;
return Decision.Reject("Existing file meets cutoff: {0}", subject.Series.Profile);
}
}
return true;
return Decision.Accept();
}
}
}
@@ -13,17 +13,9 @@ namespace NzbDrone.Core.DecisionEngine.Specifications
_logger = logger;
}
public string RejectionReason
{
get
{
return "Language is not wanted";
}
}
public RejectionType Type { get { return RejectionType.Permanent; } }
public virtual bool IsSatisfiedBy(RemoteEpisode subject, SearchCriteriaBase searchCriteria)
public virtual Decision IsSatisfiedBy(RemoteEpisode subject, SearchCriteriaBase searchCriteria)
{
var wantedLanguage = subject.Series.Profile.Value.Language;
@@ -32,10 +24,10 @@ namespace NzbDrone.Core.DecisionEngine.Specifications
if (subject.ParsedEpisodeInfo.Language != wantedLanguage)
{
_logger.Debug("Report Language: {0} rejected because it is not wanted, wanted {1}", subject.ParsedEpisodeInfo.Language, wantedLanguage);
return false;
return Decision.Reject("{0} is wanted, but found {1}", wantedLanguage, subject.ParsedEpisodeInfo.Language);
}
return true;
return Decision.Accept();
}
}
}
@@ -19,17 +19,9 @@ namespace NzbDrone.Core.DecisionEngine.Specifications
_logger = logger;
}
public string RejectionReason
{
get
{
return "Already in download queue.";
}
}
public RejectionType Type { get { return RejectionType.Permanent; } }
public bool IsSatisfiedBy(RemoteEpisode subject, SearchCriteriaBase searchCriteria)
public Decision IsSatisfiedBy(RemoteEpisode subject, SearchCriteriaBase searchCriteria)
{
var queue = _downloadTrackingService.GetQueuedDownloads()
.Where(v => v.State == TrackedDownloadState.Downloading)
@@ -38,10 +30,10 @@ namespace NzbDrone.Core.DecisionEngine.Specifications
if (IsInQueue(subject, queue))
{
_logger.Debug("Already in queue, rejecting.");
return false;
return Decision.Reject("Already in download queue");
}
return true;
return Decision.Accept();
}
private bool IsInQueue(RemoteEpisode newEpisode, IEnumerable<RemoteEpisode> queue)
@@ -17,17 +17,9 @@ namespace NzbDrone.Core.DecisionEngine.Specifications
_logger = logger;
}
public string RejectionReason
{
get
{
return "Contains restricted term.";
}
}
public RejectionType Type { get { return RejectionType.Permanent; } }
public virtual bool IsSatisfiedBy(RemoteEpisode subject, SearchCriteriaBase searchCriteria)
public virtual Decision IsSatisfiedBy(RemoteEpisode subject, SearchCriteriaBase searchCriteria)
{
_logger.Debug("Checking if release contains any restricted terms: {0}", subject);
@@ -36,7 +28,7 @@ namespace NzbDrone.Core.DecisionEngine.Specifications
if (String.IsNullOrWhiteSpace(restrictionsString))
{
_logger.Debug("No restrictions configured, allowing: {0}", subject);
return true;
return Decision.Accept();
}
var restrictions = restrictionsString.Split(new []{ '\n' }, StringSplitOptions.RemoveEmptyEntries);
@@ -46,12 +38,12 @@ namespace NzbDrone.Core.DecisionEngine.Specifications
if (subject.Release.Title.ToLowerInvariant().Contains(restriction.ToLowerInvariant()))
{
_logger.Debug("{0} is restricted: {1}", subject, restriction);
return false;
return Decision.Reject("Contains restricted term: {0}", restriction);
}
}
_logger.Debug("No restrictions apply, allowing: {0}", subject);
return true;
return Decision.Accept();
}
}
}
@@ -8,7 +8,6 @@ namespace NzbDrone.Core.DecisionEngine.Specifications
{
private readonly Logger _logger;
public string RejectionReason { get { return "Sample"; } }
public RejectionType Type { get { return RejectionType.Permanent; } }
public NotSampleSpecification(Logger logger)
@@ -16,15 +15,15 @@ namespace NzbDrone.Core.DecisionEngine.Specifications
_logger = logger;
}
public bool IsSatisfiedBy(RemoteEpisode subject, SearchCriteriaBase searchCriteria)
public Decision IsSatisfiedBy(RemoteEpisode subject, SearchCriteriaBase searchCriteria)
{
if (subject.Release.Title.ToLower().Contains("sample") && subject.Release.Size < 70.Megabytes())
{
_logger.Debug("Sample release, rejecting.");
return false;
return Decision.Reject("Sample");
}
return true;
return Decision.Accept();
}
}
}
@@ -13,26 +13,18 @@ namespace NzbDrone.Core.DecisionEngine.Specifications
_logger = logger;
}
public string RejectionReason
{
get
{
return "Quality rejected by series profile";
}
}
public RejectionType Type { get { return RejectionType.Permanent; } }
public virtual bool IsSatisfiedBy(RemoteEpisode subject, SearchCriteriaBase searchCriteria)
public virtual Decision IsSatisfiedBy(RemoteEpisode subject, SearchCriteriaBase searchCriteria)
{
_logger.Debug("Checking if report meets quality requirements. {0}", subject.ParsedEpisodeInfo.Quality);
if (!subject.Series.Profile.Value.Items.Exists(v => v.Allowed && v.Quality == subject.ParsedEpisodeInfo.Quality.Quality))
{
_logger.Debug("Quality {0} rejected by Series' quality profile", subject.ParsedEpisodeInfo.Quality);
return false;
return Decision.Reject("{0} is not wanted in profile", subject.ParsedEpisodeInfo.Quality.Quality);
}
return true;
return Decision.Accept();
}
}
}
@@ -16,18 +16,9 @@ namespace NzbDrone.Core.DecisionEngine.Specifications
_logger = logger;
}
public string RejectionReason
{
get
{
return "Report past retention limit.";
}
}
public RejectionType Type { get { return RejectionType.Permanent; } }
public virtual bool IsSatisfiedBy(RemoteEpisode subject, SearchCriteriaBase searchCriteria)
public virtual Decision IsSatisfiedBy(RemoteEpisode subject, SearchCriteriaBase searchCriteria)
{
var age = subject.Release.Age;
var retention = _configService.Retention;
@@ -36,10 +27,10 @@ namespace NzbDrone.Core.DecisionEngine.Specifications
if (retention > 0 && age > retention)
{
_logger.Debug("Report age: {0} rejected by user's retention limit", age);
return false;
return Decision.Reject("Older than configured retention");
}
return true;
return Decision.Accept();
}
}
}
@@ -22,22 +22,14 @@ namespace NzbDrone.Core.DecisionEngine.Specifications
_logger = logger;
}
public string RejectionReason
{
get
{
return "Release has been retried too many times";
}
}
public RejectionType Type { get { return RejectionType.Permanent; } }
public bool IsSatisfiedBy(RemoteEpisode subject, SearchCriteriaBase searchCriteria)
public Decision IsSatisfiedBy(RemoteEpisode subject, SearchCriteriaBase searchCriteria)
{
if (!_configService.EnableFailedDownloadHandling)
{
_logger.Debug("Failed Download Handling is not enabled");
return true;
return Decision.Accept();
}
var history = _historyService.FindBySourceTitle(subject.Release.Title);
@@ -47,10 +39,10 @@ namespace NzbDrone.Core.DecisionEngine.Specifications
_configService.BlacklistRetryLimit)
{
_logger.Debug("Release has been attempted more times than allowed, rejecting");
return false;
return Decision.Reject("Retried too many times");
}
return true;
return Decision.Accept();
}
private bool HasSamePublishedDate(History.History item, DateTime publishedDate)
@@ -21,17 +21,9 @@ namespace NzbDrone.Core.DecisionEngine.Specifications.RssSync
_logger = logger;
}
public string RejectionReason
{
get
{
return "Waiting for better quality release";
}
}
public RejectionType Type { get { return RejectionType.Temporary; } }
public virtual bool IsSatisfiedBy(RemoteEpisode subject, SearchCriteriaBase searchCriteria)
public virtual Decision IsSatisfiedBy(RemoteEpisode subject, SearchCriteriaBase searchCriteria)
{
//How do we want to handle drone being off and the automatic search being triggered?
//TODO: Add a flag to the search to state it is a "scheduled" search
@@ -39,7 +31,7 @@ namespace NzbDrone.Core.DecisionEngine.Specifications.RssSync
if (searchCriteria != null)
{
_logger.Debug("Ignore delay for searches");
return true;
return Decision.Accept();
}
var profile = subject.Series.Profile.Value;
@@ -47,7 +39,7 @@ namespace NzbDrone.Core.DecisionEngine.Specifications.RssSync
if (profile.GrabDelay == 0)
{
_logger.Debug("Profile does not delay before download");
return true;
return Decision.Accept();
}
var comparer = new QualityModelComparer(profile);
@@ -63,7 +55,7 @@ namespace NzbDrone.Core.DecisionEngine.Specifications.RssSync
if (revisionUpgrade)
{
_logger.Debug("New quality is a better revision for existing quality, skipping delay");
return true;
return Decision.Accept();
}
}
}
@@ -75,7 +67,7 @@ namespace NzbDrone.Core.DecisionEngine.Specifications.RssSync
if (bestCompare >= 0)
{
_logger.Debug("Quality is highest in profile, will not delay");
return true;
return Decision.Accept();
}
if (profile.GrabDelayMode == GrabDelayMode.Cutoff)
@@ -86,7 +78,7 @@ namespace NzbDrone.Core.DecisionEngine.Specifications.RssSync
if (cutoffCompare >= 0)
{
_logger.Debug("Quality meets or exceeds the cutoff, will not delay");
return true;
return Decision.Accept();
}
}
@@ -101,17 +93,17 @@ namespace NzbDrone.Core.DecisionEngine.Specifications.RssSync
if (oldest != null && oldest.Release.AgeHours > profile.GrabDelay)
{
return true;
return Decision.Accept();
}
}
if (subject.Release.AgeHours < profile.GrabDelay)
{
_logger.Debug("Age ({0}) is less than delay {1}, delaying", subject.Release.AgeHours, profile.GrabDelay);
return false;
return Decision.Reject("Waiting for better quality release");
}
return true;
return Decision.Accept();
}
}
}
@@ -26,22 +26,14 @@ namespace NzbDrone.Core.DecisionEngine.Specifications.RssSync
_logger = logger;
}
public string RejectionReason
{
get
{
return "Existing file in history is of equal or higher quality";
}
}
public RejectionType Type { get { return RejectionType.Permanent; } }
public virtual bool IsSatisfiedBy(RemoteEpisode subject, SearchCriteriaBase searchCriteria)
public virtual Decision IsSatisfiedBy(RemoteEpisode subject, SearchCriteriaBase searchCriteria)
{
if (searchCriteria != null)
{
_logger.Debug("Skipping history check during search");
return true;
return Decision.Accept();
}
var downloadClients = _downloadClientProvider.GetDownloadClients();
@@ -57,10 +49,10 @@ namespace NzbDrone.Core.DecisionEngine.Specifications.RssSync
if (mostRecent != null && mostRecent.EventType == HistoryEventType.Grabbed)
{
_logger.Debug("Latest history item is downloading, rejecting.");
return false;
return Decision.Reject("Download has not been imported yet");
}
}
return true;
return Decision.Accept();
}
foreach (var episode in subject.Episodes)
@@ -69,12 +61,15 @@ namespace NzbDrone.Core.DecisionEngine.Specifications.RssSync
if (bestQualityInHistory != null)
{
_logger.Debug("Comparing history quality with report. History is {0}", bestQualityInHistory);
if (!_qualityUpgradableSpecification.IsUpgradable(subject.Series.Profile, bestQualityInHistory, subject.ParsedEpisodeInfo.Quality))
return false;
{
return Decision.Reject("Existing file in history is of equal or higher quality: {0}", bestQualityInHistory);
}
}
}
return true;
return Decision.Accept();
}
}
}
@@ -14,38 +14,30 @@ namespace NzbDrone.Core.DecisionEngine.Specifications.RssSync
_logger = logger;
}
public string RejectionReason
{
get
{
return "Series or Episode is not monitored";
}
}
public RejectionType Type { get { return RejectionType.Permanent; } }
public virtual bool IsSatisfiedBy(RemoteEpisode subject, SearchCriteriaBase searchCriteria)
public virtual Decision IsSatisfiedBy(RemoteEpisode subject, SearchCriteriaBase searchCriteria)
{
if (searchCriteria != null)
{
_logger.Debug("Skipping monitored check during search");
return true;
return Decision.Accept();
}
if (!subject.Series.Monitored)
{
_logger.Debug("{0} is present in the DB but not tracked. skipping.", subject.Series);
return false;
return Decision.Reject("Series is not monitored");
}
//return monitored if any of the episodes are monitored
if (subject.Episodes.Any(episode => episode.Monitored))
{
return true;
return Decision.Accept();
}
_logger.Debug("No episodes are monitored. skipping.");
return false;
return Decision.Reject("Episode is not monitored");
}
}
}
@@ -20,21 +20,13 @@ namespace NzbDrone.Core.DecisionEngine.Specifications.RssSync
_logger = logger;
}
public string RejectionReason
{
get
{
return "Proper for old episode";
}
}
public RejectionType Type { get { return RejectionType.Permanent; } }
public virtual bool IsSatisfiedBy(RemoteEpisode subject, SearchCriteriaBase searchCriteria)
public virtual Decision IsSatisfiedBy(RemoteEpisode subject, SearchCriteriaBase searchCriteria)
{
if (searchCriteria != null)
{
return true;
return Decision.Accept();
}
foreach (var file in subject.Episodes.Where(c => c.EpisodeFileId != 0).Select(c => c.EpisodeFile.Value))
@@ -44,18 +36,18 @@ namespace NzbDrone.Core.DecisionEngine.Specifications.RssSync
if (file.DateAdded < DateTime.Today.AddDays(-7))
{
_logger.Debug("Proper for old file, rejecting: {0}", subject);
return false;
return Decision.Reject("Proper for old file");
}
if (!_configService.AutoDownloadPropers)
{
_logger.Debug("Auto downloading of propers is disabled");
return false;
return Decision.Reject("Proper downloading is disabled");
}
}
}
return true;
return Decision.Accept();
}
}
}
@@ -16,36 +16,28 @@ namespace NzbDrone.Core.DecisionEngine.Specifications.Search
_episodeService = episodeService;
}
public string RejectionReason
{
get
{
return "Episode doesn't match";
}
}
public RejectionType Type { get { return RejectionType.Permanent; } }
public bool IsSatisfiedBy(RemoteEpisode remoteEpisode, SearchCriteriaBase searchCriteria)
public Decision IsSatisfiedBy(RemoteEpisode remoteEpisode, SearchCriteriaBase searchCriteria)
{
if (searchCriteria == null)
{
return true;
return Decision.Accept();
}
var dailySearchSpec = searchCriteria as DailyEpisodeSearchCriteria;
if (dailySearchSpec == null) return true;
if (dailySearchSpec == null) return Decision.Accept();
var episode = _episodeService.GetEpisode(dailySearchSpec.Series.Id, dailySearchSpec.AirDate.ToString(Episode.AIR_DATE_FORMAT));
if (!remoteEpisode.ParsedEpisodeInfo.IsDaily || remoteEpisode.ParsedEpisodeInfo.AirDate != episode.AirDate)
{
_logger.Debug("Episode AirDate does not match searched episode number, skipping.");
return false;
return Decision.Reject("Episode does not match");
}
return true;
return Decision.Accept();
}
}
}
@@ -15,31 +15,25 @@ namespace NzbDrone.Core.DecisionEngine.Specifications.Search
_logger = logger;
}
public string RejectionReason
{
get
{
return "Episode wasn't requested";
}
}
public RejectionType Type { get { return RejectionType.Permanent; } }
public bool IsSatisfiedBy(RemoteEpisode remoteEpisode, SearchCriteriaBase searchCriteria)
public Decision IsSatisfiedBy(RemoteEpisode remoteEpisode, SearchCriteriaBase searchCriteria)
{
if (searchCriteria == null)
{
return true;
return Decision.Accept();
}
var criteriaEpisodes = searchCriteria.Episodes.Select(v => v.Id).ToList();
var remoteEpisodes = remoteEpisode.Episodes.Select(v => v.Id).ToList();
if (!criteriaEpisodes.Intersect(remoteEpisodes).Any())
{
_logger.Debug("Release rejected since the episode wasn't requested: {0}", remoteEpisode.ParsedEpisodeInfo);
return false;
return Decision.Reject("Episode wasn't requested");
}
return true;
return Decision.Accept();
}
}
}
@@ -13,33 +13,25 @@ namespace NzbDrone.Core.DecisionEngine.Specifications.Search
_logger = logger;
}
public string RejectionReason
{
get
{
return "Episode doesn't match";
}
}
public RejectionType Type { get { return RejectionType.Permanent; } }
public bool IsSatisfiedBy(RemoteEpisode remoteEpisode, SearchCriteriaBase searchCriteria)
public Decision IsSatisfiedBy(RemoteEpisode remoteEpisode, SearchCriteriaBase searchCriteria)
{
if (searchCriteria == null)
{
return true;
return Decision.Accept();
}
var singleEpisodeSpec = searchCriteria as SeasonSearchCriteria;
if (singleEpisodeSpec == null) return true;
if (singleEpisodeSpec == null) return Decision.Accept();
if (singleEpisodeSpec.SeasonNumber != remoteEpisode.ParsedEpisodeInfo.SeasonNumber)
{
_logger.Debug("Season number does not match searched season number, skipping.");
return false;
return Decision.Reject("Wrong season");
}
return true;
return Decision.Accept();
}
}
}
@@ -13,21 +13,13 @@ namespace NzbDrone.Core.DecisionEngine.Specifications.Search
_logger = logger;
}
public string RejectionReason
{
get
{
return "Wrong series";
}
}
public RejectionType Type { get { return RejectionType.Permanent; } }
public bool IsSatisfiedBy(RemoteEpisode remoteEpisode, SearchCriteriaBase searchCriteria)
public Decision IsSatisfiedBy(RemoteEpisode remoteEpisode, SearchCriteriaBase searchCriteria)
{
if (searchCriteria == null)
{
return true;
return Decision.Accept();
}
_logger.Debug("Checking if series matches searched series");
@@ -35,10 +27,10 @@ namespace NzbDrone.Core.DecisionEngine.Specifications.Search
if (remoteEpisode.Series.Id != searchCriteria.Series.Id)
{
_logger.Debug("Series {0} does not match {1}", remoteEpisode.Series, searchCriteria.Series);
return false;
return Decision.Reject("Wrong series");
}
return true;
return Decision.Accept();
}
}
}
@@ -14,39 +14,31 @@ namespace NzbDrone.Core.DecisionEngine.Specifications.Search
_logger = logger;
}
public string RejectionReason
{
get
{
return "Episode doesn't match";
}
}
public RejectionType Type { get { return RejectionType.Permanent; } }
public bool IsSatisfiedBy(RemoteEpisode remoteEpisode, SearchCriteriaBase searchCriteria)
public Decision IsSatisfiedBy(RemoteEpisode remoteEpisode, SearchCriteriaBase searchCriteria)
{
if (searchCriteria == null)
{
return true;
return Decision.Accept();
}
var singleEpisodeSpec = searchCriteria as SingleEpisodeSearchCriteria;
if (singleEpisodeSpec == null) return true;
if (singleEpisodeSpec == null) return Decision.Accept();
if (singleEpisodeSpec.SeasonNumber != remoteEpisode.ParsedEpisodeInfo.SeasonNumber)
{
_logger.Debug("Season number does not match searched season number, skipping.");
return false;
return Decision.Reject("Wrong season");
}
if (!remoteEpisode.ParsedEpisodeInfo.EpisodeNumbers.Contains(singleEpisodeSpec.EpisodeNumber))
{
_logger.Debug("Episode number does not match searched episode number, skipping.");
return false;
return Decision.Reject("Wrong episode");
}
return true;
return Decision.Accept();
}
}
}
@@ -16,17 +16,9 @@ namespace NzbDrone.Core.DecisionEngine.Specifications
_logger = logger;
}
public string RejectionReason
{
get
{
return "Existing file on disk is of equal or higher quality";
}
}
public RejectionType Type { get { return RejectionType.Permanent; } }
public virtual bool IsSatisfiedBy(RemoteEpisode subject, SearchCriteriaBase searchCriteria)
public virtual Decision IsSatisfiedBy(RemoteEpisode subject, SearchCriteriaBase searchCriteria)
{
foreach (var file in subject.Episodes.Where(c => c.EpisodeFileId != 0).Select(c => c.EpisodeFile.Value))
{
@@ -34,11 +26,11 @@ namespace NzbDrone.Core.DecisionEngine.Specifications
if (!_qualityUpgradableSpecification.IsUpgradable(subject.Series.Profile, file.Quality, subject.ParsedEpisodeInfo.Quality))
{
return false;
return Decision.Reject("Existing file on disk is of equal or higher quality: {0}", file.Quality);
}
}
return true;
return Decision.Accept();
}
}
}