diff --git a/src/NzbDrone.Core.Test/DecisionEngineTests/CutoffSpecificationFixture.cs b/src/NzbDrone.Core.Test/DecisionEngineTests/CutoffSpecificationFixture.cs deleted file mode 100644 index 784b285ed..000000000 --- a/src/NzbDrone.Core.Test/DecisionEngineTests/CutoffSpecificationFixture.cs +++ /dev/null @@ -1,269 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using FizzWare.NBuilder; -using FluentAssertions; -using Moq; -using NUnit.Framework; -using NzbDrone.Common.Serializer; -using NzbDrone.Core.CustomFormats; -using NzbDrone.Core.DecisionEngine.Specifications; -using NzbDrone.Core.Languages; -using NzbDrone.Core.MediaFiles; -using NzbDrone.Core.Parser; -using NzbDrone.Core.Parser.Model; -using NzbDrone.Core.Profiles.Qualities; -using NzbDrone.Core.Qualities; -using NzbDrone.Core.Test.CustomFormats; -using NzbDrone.Core.Test.Framework; -using NzbDrone.Core.Tv; - -namespace NzbDrone.Core.Test.DecisionEngineTests -{ - [TestFixture] - public class CutoffSpecificationFixture : CoreTest - { - private CustomFormat _customFormat; - private RemoteEpisode _remoteMovie; - - [SetUp] - public void Setup() - { - Mocker.SetConstant(Mocker.Resolve()); - - _remoteMovie = new RemoteEpisode() - { - Series = Builder.CreateNew().Build(), - Episodes = new List { Builder.CreateNew().Build() }, - ParsedEpisodeInfo = Builder.CreateNew().With(x => x.Quality = null).Build() - }; - - GivenOldCustomFormats(new List()); - } - - private void GivenProfile(QualityProfile profile) - { - CustomFormatsTestHelpers.GivenCustomFormats(); - profile.FormatItems = CustomFormatsTestHelpers.GetSampleFormatItems(); - profile.MinFormatScore = 0; - _remoteMovie.Series.QualityProfile = profile; - - Console.WriteLine(profile.ToJson()); - } - - private void GivenFileQuality(QualityModel quality, Language language) - { - _remoteMovie.Episodes.First().EpisodeFile = Builder.CreateNew().With(x => x.Quality = quality).With(x => x.Languages = new List { language }).Build(); - } - - private void GivenNewQuality(QualityModel quality) - { - _remoteMovie.ParsedEpisodeInfo.Quality = quality; - } - - private void GivenOldCustomFormats(List formats) - { - Mocker.GetMock() - .Setup(x => x.ParseCustomFormat(It.IsAny())) - .Returns(formats); - } - - private void GivenNewCustomFormats(List formats) - { - _remoteMovie.CustomFormats = formats; - } - - private void GivenCustomFormatHigher() - { - _customFormat = new CustomFormat("My Format", new ResolutionSpecification { Value = (int)Resolution.R1080p }) { Id = 1 }; - - CustomFormatsTestHelpers.GivenCustomFormats(_customFormat); - } - - [Test] - public void should_return_true_if_current_episode_is_less_than_cutoff() - { - GivenProfile(new QualityProfile - { - Cutoff = Quality.Bluray1080p.Id, - Items = Qualities.QualityFixture.GetDefaultQualities(), - UpgradeAllowed = true - }); - - GivenFileQuality(new QualityModel(Quality.DVD, new Revision(version: 2)), Language.English); - Subject.IsSatisfiedBy(_remoteMovie, null).Accepted.Should().BeTrue(); - } - - [Test] - public void should_return_false_if_current_episode_is_equal_to_cutoff() - { - GivenProfile(new QualityProfile - { - Cutoff = Quality.HDTV720p.Id, - Items = Qualities.QualityFixture.GetDefaultQualities(), - UpgradeAllowed = true - }); - - GivenFileQuality(new QualityModel(Quality.HDTV720p, new Revision(version: 2)), Language.English); - Subject.IsSatisfiedBy(_remoteMovie, null).Accepted.Should().BeFalse(); - } - - [Test] - public void should_return_false_if_current_episode_is_greater_than_cutoff() - { - GivenProfile(new QualityProfile - { - Cutoff = Quality.HDTV720p.Id, - Items = Qualities.QualityFixture.GetDefaultQualities(), - UpgradeAllowed = true - }); - - GivenFileQuality(new QualityModel(Quality.Bluray1080p, new Revision(version: 2)), Language.English); - Subject.IsSatisfiedBy(_remoteMovie, null).Accepted.Should().BeFalse(); - } - - [Test] - public void should_return_true_when_new_episode_is_proper_but_existing_is_not() - { - GivenProfile(new QualityProfile - { - Cutoff = Quality.HDTV720p.Id, - Items = Qualities.QualityFixture.GetDefaultQualities(), - UpgradeAllowed = true - }); - - GivenFileQuality(new QualityModel(Quality.HDTV720p, new Revision(version: 1)), Language.English); - GivenNewQuality(new QualityModel(Quality.HDTV720p, new Revision(version: 2))); - Subject.IsSatisfiedBy(_remoteMovie, null).Accepted.Should().BeTrue(); - } - - [Test] - public void should_return_false_if_cutoff_is_met_and_quality_is_higher() - { - GivenProfile(new QualityProfile - { - Cutoff = Quality.HDTV720p.Id, - Items = Qualities.QualityFixture.GetDefaultQualities(), - UpgradeAllowed = true - }); - - GivenFileQuality(new QualityModel(Quality.HDTV720p, new Revision(version: 2)), Language.English); - GivenNewQuality(new QualityModel(Quality.Bluray1080p, new Revision(version: 2))); - Subject.IsSatisfiedBy(_remoteMovie, null).Accepted.Should().BeFalse(); - } - - [Test] - public void should_return_false_if_quality_cutoff_is_met_and_quality_is_higher_but_language_is_met() - { - GivenProfile(new QualityProfile - { - Cutoff = Quality.HDTV720p.Id, - Items = Qualities.QualityFixture.GetDefaultQualities(), - UpgradeAllowed = true - }); - - GivenFileQuality(new QualityModel(Quality.HDTV720p, new Revision(version: 2)), Language.Spanish); - GivenNewQuality(new QualityModel(Quality.Bluray1080p, new Revision(version: 2))); - Subject.IsSatisfiedBy(_remoteMovie, null).Accepted.Should().BeFalse(); - } - - [Test] - public void should_return_false_if_cutoff_is_met_and_quality_is_higher_and_language_is_higher() - { - GivenProfile(new QualityProfile - { - Cutoff = Quality.HDTV720p.Id, - Items = Qualities.QualityFixture.GetDefaultQualities(), - UpgradeAllowed = true - }); - - GivenFileQuality(new QualityModel(Quality.HDTV720p, new Revision(version: 2)), Language.French); - GivenNewQuality(new QualityModel(Quality.Bluray1080p, new Revision(version: 2))); - Subject.IsSatisfiedBy(_remoteMovie, null).Accepted.Should().BeFalse(); - } - - [Test] - public void should_return_true_if_cutoff_is_not_met_and_new_quality_is_higher_and_language_is_higher() - { - GivenProfile(new QualityProfile - { - Cutoff = Quality.HDTV720p.Id, - Items = Qualities.QualityFixture.GetDefaultQualities(), - UpgradeAllowed = true - }); - - GivenFileQuality(new QualityModel(Quality.SDTV, new Revision(version: 2)), Language.French); - GivenNewQuality(new QualityModel(Quality.Bluray1080p, new Revision(version: 2))); - Subject.IsSatisfiedBy(_remoteMovie, null).Accepted.Should().BeTrue(); - } - - [Test] - public void should_return_true_if_cutoff_is_not_met_and_language_is_higher() - { - GivenProfile(new QualityProfile - { - Cutoff = Quality.HDTV720p.Id, - Items = Qualities.QualityFixture.GetDefaultQualities(), - UpgradeAllowed = true - }); - - GivenFileQuality(new QualityModel(Quality.SDTV, new Revision(version: 2)), Language.French); - Subject.IsSatisfiedBy(_remoteMovie, null).Accepted.Should().BeTrue(); - } - - [Test] - public void should_return_false_if_custom_formats_is_met_and_quality_and_format_higher() - { - GivenProfile(new QualityProfile - { - Cutoff = Quality.HDTV720p.Id, - Items = Qualities.QualityFixture.GetDefaultQualities(), - MinFormatScore = 0, - FormatItems = CustomFormatsTestHelpers.GetSampleFormatItems("My Format"), - UpgradeAllowed = true - }); - - GivenFileQuality(new QualityModel(Quality.HDTV720p), Language.English); - GivenNewQuality(new QualityModel(Quality.Bluray1080p)); - - GivenCustomFormatHigher(); - - GivenOldCustomFormats(new List()); - GivenNewCustomFormats(new List { _customFormat }); - - Subject.IsSatisfiedBy(_remoteMovie, null).Accepted.Should().BeFalse(); - } - - [Test] - public void should_return_true_if_cutoffs_are_met_but_is_a_revision_upgrade() - { - GivenProfile(new QualityProfile - { - Cutoff = Quality.HDTV1080p.Id, - Items = Qualities.QualityFixture.GetDefaultQualities(), - UpgradeAllowed = true - }); - - GivenFileQuality(new QualityModel(Quality.WEBDL1080p, new Revision(version: 1)), Language.English); - GivenNewQuality(new QualityModel(Quality.WEBDL1080p, new Revision(version: 2))); - - Subject.IsSatisfiedBy(_remoteMovie, null).Accepted.Should().BeTrue(); - } - - [Test] - public void should_return_false_if_quality_profile_does_not_allow_upgrades_but_cutoff_is_set_to_highest_quality() - { - GivenProfile(new QualityProfile - { - Cutoff = Quality.RAWHD.Id, - Items = Qualities.QualityFixture.GetDefaultQualities(), - UpgradeAllowed = false - }); - - GivenFileQuality(new QualityModel(Quality.WEBDL1080p), Language.English); - GivenNewQuality(new QualityModel(Quality.Bluray1080p)); - - Subject.IsSatisfiedBy(_remoteMovie, null).Accepted.Should().BeFalse(); - } - } -} diff --git a/src/NzbDrone.Core.Test/DecisionEngineTests/RssSync/DelaySpecificationFixture.cs b/src/NzbDrone.Core.Test/DecisionEngineTests/RssSync/DelaySpecificationFixture.cs index 4a8ba8a6d..493785e70 100644 --- a/src/NzbDrone.Core.Test/DecisionEngineTests/RssSync/DelaySpecificationFixture.cs +++ b/src/NzbDrone.Core.Test/DecisionEngineTests/RssSync/DelaySpecificationFixture.cs @@ -6,6 +6,7 @@ using FluentAssertions; using Moq; using NUnit.Framework; using NzbDrone.Core.CustomFormats; +using NzbDrone.Core.DecisionEngine; using NzbDrone.Core.DecisionEngine.Specifications; using NzbDrone.Core.DecisionEngine.Specifications.RssSync; using NzbDrone.Core.Download.Pending; @@ -86,7 +87,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests.RssSync { Mocker.GetMock() .Setup(s => s.IsUpgradable(It.IsAny(), It.IsAny(), It.IsAny>(), It.IsAny(), It.IsAny>())) - .Returns(true); + .Returns(UpgradeableRejectReason.None); } [Test] diff --git a/src/NzbDrone.Core.Test/DecisionEngineTests/UpgradeDiskSpecificationFixture.cs b/src/NzbDrone.Core.Test/DecisionEngineTests/UpgradeDiskSpecificationFixture.cs index a58f873ad..66a38f076 100644 --- a/src/NzbDrone.Core.Test/DecisionEngineTests/UpgradeDiskSpecificationFixture.cs +++ b/src/NzbDrone.Core.Test/DecisionEngineTests/UpgradeDiskSpecificationFixture.cs @@ -4,10 +4,12 @@ using FizzWare.NBuilder; using FluentAssertions; using Moq; using NUnit.Framework; +using NzbDrone.Common.Serializer; using NzbDrone.Core.CustomFormats; using NzbDrone.Core.DecisionEngine.Specifications; using NzbDrone.Core.Languages; using NzbDrone.Core.MediaFiles; +using NzbDrone.Core.Parser; using NzbDrone.Core.Parser.Model; using NzbDrone.Core.Profiles.Qualities; using NzbDrone.Core.Qualities; @@ -74,6 +76,42 @@ namespace NzbDrone.Core.Test.DecisionEngineTests .Returns(new List()); } + private void GivenProfile(QualityProfile profile) + { + CustomFormatsTestHelpers.GivenCustomFormats(); + profile.FormatItems = CustomFormatsTestHelpers.GetSampleFormatItems(); + profile.MinFormatScore = 0; + _parseResultMulti.Series.QualityProfile = profile; + _parseResultSingle.Series.QualityProfile = profile; + + Console.WriteLine(profile.ToJson()); + } + + private void GivenFileQuality(QualityModel quality) + { + _firstFile.Quality = quality; + _secondFile.Quality = quality; + } + + private void GivenNewQuality(QualityModel quality) + { + _parseResultMulti.ParsedEpisodeInfo.Quality = quality; + _parseResultSingle.ParsedEpisodeInfo.Quality = quality; + } + + private void GivenOldCustomFormats(List formats) + { + Mocker.GetMock() + .Setup(x => x.ParseCustomFormat(It.IsAny())) + .Returns(formats); + } + + private void GivenNewCustomFormats(List formats) + { + _parseResultMulti.CustomFormats = formats; + _parseResultSingle.CustomFormats = formats; + } + private void WithFirstFileUpgradable() { _firstFile.Quality = new QualityModel(Quality.SDTV); @@ -155,5 +193,177 @@ namespace NzbDrone.Core.Test.DecisionEngineTests _parseResultSingle.ParsedEpisodeInfo.Quality = new QualityModel(Quality.WEBDL1080p); _upgradeDisk.IsSatisfiedBy(_parseResultSingle, null).Accepted.Should().BeFalse(); } + + [Test] + public void should_return_false_if_current_episode_is_equal_to_cutoff() + { + GivenProfile(new QualityProfile + { + Cutoff = Quality.HDTV720p.Id, + Items = Qualities.QualityFixture.GetDefaultQualities(), + UpgradeAllowed = true + }); + + GivenFileQuality(new QualityModel(Quality.HDTV720p, new Revision(version: 2))); + Subject.IsSatisfiedBy(_parseResultSingle, null).Accepted.Should().BeFalse(); + } + + [Test] + public void should_return_false_if_current_episode_is_greater_than_cutoff() + { + GivenProfile(new QualityProfile + { + Cutoff = Quality.HDTV720p.Id, + Items = Qualities.QualityFixture.GetDefaultQualities(), + UpgradeAllowed = true + }); + + GivenFileQuality(new QualityModel(Quality.Bluray1080p, new Revision(version: 2))); + Subject.IsSatisfiedBy(_parseResultSingle, null).Accepted.Should().BeFalse(); + } + + [Test] + public void should_return_true_when_new_episode_is_proper_but_existing_is_not() + { + GivenProfile(new QualityProfile + { + Cutoff = Quality.HDTV720p.Id, + Items = Qualities.QualityFixture.GetDefaultQualities(), + UpgradeAllowed = true + }); + + GivenFileQuality(new QualityModel(Quality.HDTV720p, new Revision(version: 1))); + GivenNewQuality(new QualityModel(Quality.HDTV720p, new Revision(version: 2))); + Subject.IsSatisfiedBy(_parseResultSingle, null).Accepted.Should().BeTrue(); + } + + [Test] + public void should_return_false_if_cutoff_is_met_and_quality_is_higher() + { + GivenProfile(new QualityProfile + { + Cutoff = Quality.HDTV720p.Id, + Items = Qualities.QualityFixture.GetDefaultQualities(), + UpgradeAllowed = true + }); + + GivenFileQuality(new QualityModel(Quality.HDTV720p, new Revision(version: 2))); + GivenNewQuality(new QualityModel(Quality.Bluray1080p, new Revision(version: 2))); + Subject.IsSatisfiedBy(_parseResultSingle, null).Accepted.Should().BeFalse(); + } + + [Test] + public void should_return_false_if_quality_cutoff_is_met_and_quality_is_higher_but_language_is_met() + { + GivenProfile(new QualityProfile + { + Cutoff = Quality.HDTV720p.Id, + Items = Qualities.QualityFixture.GetDefaultQualities(), + UpgradeAllowed = true + }); + + GivenFileQuality(new QualityModel(Quality.HDTV720p, new Revision(version: 2))); + GivenNewQuality(new QualityModel(Quality.Bluray1080p, new Revision(version: 2))); + Subject.IsSatisfiedBy(_parseResultSingle, null).Accepted.Should().BeFalse(); + } + + [Test] + public void should_return_false_if_cutoff_is_met_and_quality_is_higher_and_language_is_higher() + { + GivenProfile(new QualityProfile + { + Cutoff = Quality.HDTV720p.Id, + Items = Qualities.QualityFixture.GetDefaultQualities(), + UpgradeAllowed = true + }); + + GivenFileQuality(new QualityModel(Quality.HDTV720p, new Revision(version: 2))); + GivenNewQuality(new QualityModel(Quality.Bluray1080p, new Revision(version: 2))); + Subject.IsSatisfiedBy(_parseResultSingle, null).Accepted.Should().BeFalse(); + } + + [Test] + public void should_return_true_if_cutoff_is_not_met_and_new_quality_is_higher_and_language_is_higher() + { + GivenProfile(new QualityProfile + { + Cutoff = Quality.HDTV720p.Id, + Items = Qualities.QualityFixture.GetDefaultQualities(), + UpgradeAllowed = true + }); + + GivenFileQuality(new QualityModel(Quality.SDTV, new Revision(version: 2))); + GivenNewQuality(new QualityModel(Quality.Bluray1080p, new Revision(version: 2))); + Subject.IsSatisfiedBy(_parseResultSingle, null).Accepted.Should().BeTrue(); + } + + [Test] + public void should_return_true_if_cutoff_is_not_met_and_language_is_higher() + { + GivenProfile(new QualityProfile + { + Cutoff = Quality.HDTV720p.Id, + Items = Qualities.QualityFixture.GetDefaultQualities(), + UpgradeAllowed = true + }); + + GivenFileQuality(new QualityModel(Quality.SDTV, new Revision(version: 2))); + Subject.IsSatisfiedBy(_parseResultSingle, null).Accepted.Should().BeTrue(); + } + + [Test] + public void should_return_false_if_custom_formats_is_met_and_quality_and_format_higher() + { + var customFormat = new CustomFormat("My Format", new ResolutionSpecification { Value = (int)Resolution.R1080p }) { Id = 1 }; + + GivenProfile(new QualityProfile + { + Cutoff = Quality.HDTV720p.Id, + Items = Qualities.QualityFixture.GetDefaultQualities(), + MinFormatScore = 0, + FormatItems = CustomFormatsTestHelpers.GetSampleFormatItems("My Format"), + UpgradeAllowed = true + }); + + GivenFileQuality(new QualityModel(Quality.HDTV720p)); + GivenNewQuality(new QualityModel(Quality.Bluray1080p)); + + GivenOldCustomFormats(new List()); + GivenNewCustomFormats(new List { customFormat }); + + Subject.IsSatisfiedBy(_parseResultSingle, null).Accepted.Should().BeFalse(); + } + + [Test] + public void should_return_true_if_cutoffs_are_met_but_is_a_revision_upgrade() + { + GivenProfile(new QualityProfile + { + Cutoff = Quality.HDTV1080p.Id, + Items = Qualities.QualityFixture.GetDefaultQualities(), + UpgradeAllowed = true + }); + + GivenFileQuality(new QualityModel(Quality.WEBDL1080p, new Revision(version: 1))); + GivenNewQuality(new QualityModel(Quality.WEBDL1080p, new Revision(version: 2))); + + Subject.IsSatisfiedBy(_parseResultSingle, null).Accepted.Should().BeTrue(); + } + + [Test] + public void should_return_false_if_quality_profile_does_not_allow_upgrades_but_cutoff_is_set_to_highest_quality() + { + GivenProfile(new QualityProfile + { + Cutoff = Quality.RAWHD.Id, + Items = Qualities.QualityFixture.GetDefaultQualities(), + UpgradeAllowed = false + }); + + GivenFileQuality(new QualityModel(Quality.WEBDL1080p)); + GivenNewQuality(new QualityModel(Quality.Bluray1080p)); + + Subject.IsSatisfiedBy(_parseResultSingle, null).Accepted.Should().BeFalse(); + } } } diff --git a/src/NzbDrone.Core.Test/DecisionEngineTests/UpgradeSpecificationFixture.cs b/src/NzbDrone.Core.Test/DecisionEngineTests/UpgradeSpecificationFixture.cs index 4d8b4f955..9bf70fa13 100644 --- a/src/NzbDrone.Core.Test/DecisionEngineTests/UpgradeSpecificationFixture.cs +++ b/src/NzbDrone.Core.Test/DecisionEngineTests/UpgradeSpecificationFixture.cs @@ -3,8 +3,8 @@ using FluentAssertions; using NUnit.Framework; using NzbDrone.Core.Configuration; using NzbDrone.Core.CustomFormats; +using NzbDrone.Core.DecisionEngine; using NzbDrone.Core.DecisionEngine.Specifications; -using NzbDrone.Core.Languages; using NzbDrone.Core.Profiles.Qualities; using NzbDrone.Core.Qualities; using NzbDrone.Core.Test.Framework; @@ -17,23 +17,13 @@ namespace NzbDrone.Core.Test.DecisionEngineTests { public static object[] IsUpgradeTestCases = { - new object[] { Quality.SDTV, 1, Quality.SDTV, 2, Quality.SDTV, true }, - new object[] { Quality.WEBDL720p, 1, Quality.WEBDL720p, 2, Quality.WEBDL720p, true }, - new object[] { Quality.SDTV, 1, Quality.SDTV, 1, Quality.SDTV, false }, - new object[] { Quality.WEBDL720p, 1, Quality.HDTV720p, 2, Quality.Bluray720p, false }, - new object[] { Quality.WEBDL720p, 1, Quality.HDTV720p, 2, Quality.WEBDL720p, false }, - new object[] { Quality.WEBDL720p, 1, Quality.WEBDL720p, 1, Quality.WEBDL720p, false }, - new object[] { Quality.WEBDL1080p, 1, Quality.WEBDL1080p, 1, Quality.WEBDL1080p, false } - }; - - public static object[] IsUpgradeTestCasesLanguages = - { - new object[] { Quality.SDTV, 1, Language.English, Quality.SDTV, 2, Language.English, Quality.SDTV, Language.Spanish, true }, - new object[] { Quality.SDTV, 1, Language.English, Quality.SDTV, 1, Language.Spanish, Quality.SDTV, Language.Spanish, true }, - new object[] { Quality.WEBDL720p, 1, Language.French, Quality.WEBDL720p, 2, Language.English, Quality.WEBDL720p, Language.Spanish, true }, - new object[] { Quality.SDTV, 1, Language.English, Quality.SDTV, 1, Language.English, Quality.SDTV, Language.English, false }, - new object[] { Quality.WEBDL720p, 1, Language.English, Quality.HDTV720p, 2, Language.Spanish, Quality.Bluray720p, Language.Spanish, false }, - new object[] { Quality.WEBDL720p, 1, Language.Spanish, Quality.HDTV720p, 2, Language.French, Quality.WEBDL720p, Language.Spanish, false } + new object[] { Quality.SDTV, 1, Quality.SDTV, 2, Quality.SDTV, UpgradeableRejectReason.None }, + new object[] { Quality.WEBDL720p, 1, Quality.WEBDL720p, 2, Quality.WEBDL720p, UpgradeableRejectReason.None }, + new object[] { Quality.SDTV, 1, Quality.SDTV, 1, Quality.SDTV, UpgradeableRejectReason.CustomFormatScore }, + new object[] { Quality.WEBDL720p, 1, Quality.HDTV720p, 2, Quality.Bluray720p, UpgradeableRejectReason.BetterQuality }, + new object[] { Quality.WEBDL720p, 1, Quality.HDTV720p, 2, Quality.WEBDL720p, UpgradeableRejectReason.BetterQuality }, + new object[] { Quality.WEBDL720p, 1, Quality.WEBDL720p, 1, Quality.WEBDL720p, UpgradeableRejectReason.CustomFormatScore }, + new object[] { Quality.WEBDL1080p, 1, Quality.WEBDL1080p, 1, Quality.WEBDL1080p, UpgradeableRejectReason.CustomFormatScore } }; private void GivenAutoDownloadPropers(ProperDownloadTypes type) @@ -45,7 +35,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests [Test] [TestCaseSource(nameof(IsUpgradeTestCases))] - public void IsUpgradeTest(Quality current, int currentVersion, Quality newQuality, int newVersion, Quality cutoff, bool expected) + public void IsUpgradeTest(Quality current, int currentVersion, Quality newQuality, int newVersion, Quality cutoff, UpgradeableRejectReason expected) { GivenAutoDownloadPropers(ProperDownloadTypes.PreferAndUpgrade); @@ -80,7 +70,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests new List(), new QualityModel(Quality.DVD, new Revision(version: 2)), new List()) - .Should().BeTrue(); + .Should().Be(UpgradeableRejectReason.None); } [Test] @@ -99,7 +89,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests new List(), new QualityModel(Quality.DVD, new Revision(version: 2)), new List()) - .Should().BeFalse(); + .Should().Be(UpgradeableRejectReason.CustomFormatScore); } [Test] @@ -107,7 +97,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests { var profile = new QualityProfile { - Items = Qualities.QualityFixture.GetDefaultQualities(), + Items = Qualities.QualityFixture.GetDefaultQualities() }; Subject.IsUpgradable( @@ -116,7 +106,45 @@ namespace NzbDrone.Core.Test.DecisionEngineTests new List(), new QualityModel(Quality.HDTV720p, new Revision(version: 1)), new List()) - .Should().BeFalse(); + .Should().Be(UpgradeableRejectReason.CustomFormatScore); + } + + [Test] + public void should_return_true_if_release_has_higher_quality_and_cutoff_is_not_already_met() + { + var profile = new QualityProfile + { + Items = Qualities.QualityFixture.GetDefaultQualities(), + UpgradeAllowed = true, + Cutoff = Quality.HDTV1080p.Id + }; + + Subject.IsUpgradable( + profile, + new QualityModel(Quality.HDTV720p, new Revision(version: 1)), + new List(), + new QualityModel(Quality.HDTV1080p, new Revision(version: 1)), + new List()) + .Should().Be(UpgradeableRejectReason.None); + } + + [Test] + public void should_return_false_if_release_has_higher_quality_and_cutoff_is_already_met() + { + var profile = new QualityProfile + { + Items = Qualities.QualityFixture.GetDefaultQualities(), + UpgradeAllowed = true, + Cutoff = Quality.HDTV720p.Id + }; + + Subject.IsUpgradable( + profile, + new QualityModel(Quality.HDTV720p, new Revision(version: 1)), + new List(), + new QualityModel(Quality.HDTV1080p, new Revision(version: 1)), + new List()) + .Should().Be(UpgradeableRejectReason.QualityCutoff); } } } diff --git a/src/NzbDrone.Core/DecisionEngine/Specifications/CutoffSpecification.cs b/src/NzbDrone.Core/DecisionEngine/Specifications/CutoffSpecification.cs deleted file mode 100644 index 07006315d..000000000 --- a/src/NzbDrone.Core/DecisionEngine/Specifications/CutoffSpecification.cs +++ /dev/null @@ -1,58 +0,0 @@ -using System.Linq; -using NLog; -using NzbDrone.Core.CustomFormats; -using NzbDrone.Core.IndexerSearch.Definitions; -using NzbDrone.Core.Parser.Model; - -namespace NzbDrone.Core.DecisionEngine.Specifications -{ - public class CutoffSpecification : IDecisionEngineSpecification - { - private readonly UpgradableSpecification _upgradableSpecification; - private readonly ICustomFormatCalculationService _formatService; - private readonly Logger _logger; - - public CutoffSpecification(UpgradableSpecification upgradableSpecification, ICustomFormatCalculationService formatService, Logger logger) - { - _upgradableSpecification = upgradableSpecification; - _formatService = formatService; - _logger = logger; - } - - public SpecificationPriority Priority => SpecificationPriority.Default; - public RejectionType Type => RejectionType.Permanent; - - public virtual Decision IsSatisfiedBy(RemoteEpisode subject, SearchCriteriaBase searchCriteria) - { - var qualityProfile = subject.Series.QualityProfile.Value; - - foreach (var file in subject.Episodes.Where(c => c.EpisodeFileId != 0).Select(c => c.EpisodeFile.Value)) - { - if (file == null) - { - _logger.Debug("File is no longer available, skipping this file."); - continue; - } - - _logger.Debug("Comparing file quality with report. Existing file is {0}", file.Quality); - - var customFormats = _formatService.ParseCustomFormat(file); - - if (!_upgradableSpecification.CutoffNotMet(qualityProfile, - file.Quality, - _formatService.ParseCustomFormat(file), - subject.ParsedEpisodeInfo.Quality)) - { - _logger.Debug("Cutoff already met, rejecting."); - - var qualityCutoffIndex = qualityProfile.GetIndex(qualityProfile.Cutoff); - var qualityCutoff = qualityProfile.Items[qualityCutoffIndex.Index]; - - return Decision.Reject("Existing file meets cutoff: {0}", qualityCutoff); - } - } - - return Decision.Accept(); - } - } -} diff --git a/src/NzbDrone.Core/DecisionEngine/Specifications/QueueSpecification.cs b/src/NzbDrone.Core/DecisionEngine/Specifications/QueueSpecification.cs index c26fede45..63c4b51e9 100644 --- a/src/NzbDrone.Core/DecisionEngine/Specifications/QueueSpecification.cs +++ b/src/NzbDrone.Core/DecisionEngine/Specifications/QueueSpecification.cs @@ -70,13 +70,28 @@ namespace NzbDrone.Core.DecisionEngine.Specifications _logger.Debug("Checking if release is higher quality than queued release. Queued: {0}", remoteEpisode.ParsedEpisodeInfo.Quality); - if (!_upgradableSpecification.IsUpgradable(qualityProfile, - remoteEpisode.ParsedEpisodeInfo.Quality, - queuedItemCustomFormats, - subject.ParsedEpisodeInfo.Quality, - subject.CustomFormats)) + var upgradeableRejectReason = _upgradableSpecification.IsUpgradable(qualityProfile, + remoteEpisode.ParsedEpisodeInfo.Quality, + queuedItemCustomFormats, + subject.ParsedEpisodeInfo.Quality, + subject.CustomFormats); + + switch (upgradeableRejectReason) { - return Decision.Reject("Release in queue is of equal or higher preference: {0}", remoteEpisode.ParsedEpisodeInfo.Quality); + case UpgradeableRejectReason.BetterQuality: + return Decision.Reject("Release in queue on disk is of equal or higher preference: {0}", remoteEpisode.ParsedEpisodeInfo.Quality); + + case UpgradeableRejectReason.BetterRevision: + return Decision.Reject("Release in queue on disk is of equal or higher revision: {0}", remoteEpisode.ParsedEpisodeInfo.Quality.Revision); + + case UpgradeableRejectReason.QualityCutoff: + return Decision.Reject("Release in queue on disk meets quality cutoff: {0}", qualityProfile.Items[qualityProfile.GetIndex(qualityProfile.Cutoff).Index]); + + case UpgradeableRejectReason.CustomFormatCutoff: + return Decision.Reject("Release in queue on disk meets Custom Format cutoff: {0}", qualityProfile.CutoffFormatScore); + + case UpgradeableRejectReason.CustomFormatScore: + return Decision.Reject("Release in queue on disk has an equal or higher custom format score: {0}", qualityProfile.CalculateCustomFormatScore(queuedItemCustomFormats)); } _logger.Debug("Checking if profiles allow upgrading. Queued: {0}", remoteEpisode.ParsedEpisodeInfo.Quality); diff --git a/src/NzbDrone.Core/DecisionEngine/Specifications/RssSync/HistorySpecification.cs b/src/NzbDrone.Core/DecisionEngine/Specifications/RssSync/HistorySpecification.cs index c168f6f60..b9c9429f0 100644 --- a/src/NzbDrone.Core/DecisionEngine/Specifications/RssSync/HistorySpecification.cs +++ b/src/NzbDrone.Core/DecisionEngine/Specifications/RssSync/HistorySpecification.cs @@ -42,8 +42,10 @@ namespace NzbDrone.Core.DecisionEngine.Specifications.RssSync } var cdhEnabled = _configService.EnableCompletedDownloadHandling; + var qualityProfile = subject.Series.QualityProfile.Value; _logger.Debug("Performing history status check on report"); + foreach (var episode in subject.Episodes) { _logger.Debug("Checking current status of episode [{0}] in history", episode.Id); @@ -68,7 +70,7 @@ namespace NzbDrone.Core.DecisionEngine.Specifications.RssSync customFormats, subject.ParsedEpisodeInfo.Quality); - var upgradeable = _upgradableSpecification.IsUpgradable( + var upgradeableRejectReason = _upgradableSpecification.IsUpgradable( subject.Series.QualityProfile, mostRecent.Quality, customFormats, @@ -85,14 +87,26 @@ namespace NzbDrone.Core.DecisionEngine.Specifications.RssSync return Decision.Reject("CDH is disabled and grab event in history already meets cutoff: {0}", mostRecent.Quality); } - if (!upgradeable) + var rejectionSubject = recent ? "Recent" : "CDH is disabled and"; + + switch (upgradeableRejectReason) { - if (recent) - { - return Decision.Reject("Recent grab event in history is of equal or higher quality: {0}", mostRecent.Quality); - } + case UpgradeableRejectReason.None: + continue; + case UpgradeableRejectReason.BetterQuality: + return Decision.Reject("{0} grab event in history is of equal or higher preference: {1}", rejectionSubject, mostRecent.Quality); + + case UpgradeableRejectReason.BetterRevision: + return Decision.Reject("{0} grab event in history is of equal or higher revision: {1}", rejectionSubject, mostRecent.Quality.Revision); + + case UpgradeableRejectReason.QualityCutoff: + return Decision.Reject("{0} grab event in history meets quality cutoff: {1}", rejectionSubject, qualityProfile.Items[qualityProfile.GetIndex(qualityProfile.Cutoff).Index]); + + case UpgradeableRejectReason.CustomFormatCutoff: + return Decision.Reject("{0} grab event in history meets Custom Format cutoff: {1}", rejectionSubject, qualityProfile.CutoffFormatScore); - return Decision.Reject("CDH is disabled and grab event in history is of equal or higher quality: {0}", mostRecent.Quality); + case UpgradeableRejectReason.CustomFormatScore: + return Decision.Reject("{0} grab event in history has an equal or higher custom format score: {1}", rejectionSubject, qualityProfile.CalculateCustomFormatScore(customFormats)); } } } diff --git a/src/NzbDrone.Core/DecisionEngine/Specifications/UpgradableSpecification.cs b/src/NzbDrone.Core/DecisionEngine/Specifications/UpgradableSpecification.cs index 5b16bb046..c4ecbd19a 100644 --- a/src/NzbDrone.Core/DecisionEngine/Specifications/UpgradableSpecification.cs +++ b/src/NzbDrone.Core/DecisionEngine/Specifications/UpgradableSpecification.cs @@ -10,7 +10,7 @@ namespace NzbDrone.Core.DecisionEngine.Specifications { public interface IUpgradableSpecification { - bool IsUpgradable(QualityProfile profile, QualityModel currentQuality, List currentCustomFormats, QualityModel newQuality, List newCustomFormats); + UpgradeableRejectReason IsUpgradable(QualityProfile profile, QualityModel currentQuality, List currentCustomFormats, QualityModel newQuality, List newCustomFormats); bool QualityCutoffNotMet(QualityProfile profile, QualityModel currentQuality, QualityModel newQuality = null); bool CutoffNotMet(QualityProfile profile, QualityModel currentQuality, List currentCustomFormats, QualityModel newQuality = null); bool IsRevisionUpgrade(QualityModel currentQuality, QualityModel newQuality); @@ -28,22 +28,22 @@ namespace NzbDrone.Core.DecisionEngine.Specifications _logger = logger; } - public bool IsUpgradable(QualityProfile qualityProfile, QualityModel currentQuality, List currentCustomFormats, QualityModel newQuality, List newCustomFormats) + public UpgradeableRejectReason IsUpgradable(QualityProfile qualityProfile, QualityModel currentQuality, List currentCustomFormats, QualityModel newQuality, List newCustomFormats) { var qualityComparer = new QualityModelComparer(qualityProfile); var qualityCompare = qualityComparer.Compare(newQuality?.Quality, currentQuality.Quality); var downloadPropersAndRepacks = _configService.DownloadPropersAndRepacks; - if (qualityCompare > 0) + if (qualityCompare > 0 && QualityCutoffNotMet(qualityProfile, currentQuality, newQuality)) { _logger.Debug("New item has a better quality. Existing: {0}. New: {1}", currentQuality, newQuality); - return true; + return UpgradeableRejectReason.None; } if (qualityCompare < 0) { _logger.Debug("Existing item has better quality, skipping. Existing: {0}. New: {1}", currentQuality, newQuality); - return false; + return UpgradeableRejectReason.BetterQuality; } var qualityRevisionCompare = newQuality?.Revision.CompareTo(currentQuality.Revision); @@ -54,7 +54,7 @@ namespace NzbDrone.Core.DecisionEngine.Specifications qualityRevisionCompare > 0) { _logger.Debug("New item has a better quality revision, skipping. Existing: {0}. New: {1}", currentQuality, newQuality); - return true; + return UpgradeableRejectReason.None; } // Reject unless the user does not prefer propers/repacks and it's a revision downgrade. @@ -62,29 +62,37 @@ namespace NzbDrone.Core.DecisionEngine.Specifications qualityRevisionCompare < 0) { _logger.Debug("Existing item has a better quality revision, skipping. Existing: {0}. New: {1}", currentQuality, newQuality); - return false; + return UpgradeableRejectReason.BetterRevision; + } + + if (qualityCompare > 0) + { + _logger.Debug("Existing item meets cut-off for quality, skipping. Existing: {0}. Cutoff: {1}", + currentQuality, + qualityProfile.Items[qualityProfile.GetIndex(qualityProfile.Cutoff).Index]); + return UpgradeableRejectReason.QualityCutoff; } var currentFormatScore = qualityProfile.CalculateCustomFormatScore(currentCustomFormats); var newFormatScore = qualityProfile.CalculateCustomFormatScore(newCustomFormats); + if (newFormatScore <= currentFormatScore) + { + _logger.Debug("New item's custom formats [{0}] ({1}) do not improve on [{2}] ({3}), skipping", + newCustomFormats.ConcatToString(), + newFormatScore, + currentCustomFormats.ConcatToString(), + currentFormatScore); + return UpgradeableRejectReason.CustomFormatScore; + } + if (qualityProfile.UpgradeAllowed && currentFormatScore >= qualityProfile.CutoffFormatScore) { _logger.Debug("Existing item meets cut-off for custom formats, skipping. Existing: [{0}] ({1}). Cutoff score: {2}", currentCustomFormats.ConcatToString(), currentFormatScore, qualityProfile.CutoffFormatScore); - return false; - } - - if (newFormatScore <= currentFormatScore) - { - _logger.Debug("New item's custom formats [{0}] ({1}) do not improve on [{2}] ({3}), skipping", - newCustomFormats.ConcatToString(), - newFormatScore, - currentCustomFormats.ConcatToString(), - currentFormatScore); - return false; + return UpgradeableRejectReason.CustomFormatCutoff; } _logger.Debug("New item's custom formats [{0}] ({1}) improve on [{2}] ({3}), accepting", @@ -92,7 +100,7 @@ namespace NzbDrone.Core.DecisionEngine.Specifications newFormatScore, currentCustomFormats.ConcatToString(), currentFormatScore); - return true; + return UpgradeableRejectReason.None; } public bool QualityCutoffNotMet(QualityProfile profile, QualityModel currentQuality, QualityModel newQuality = null) @@ -132,7 +140,10 @@ namespace NzbDrone.Core.DecisionEngine.Specifications return true; } - _logger.Debug("Existing item meets cut-off, skipping. Existing: {0}", currentQuality); + _logger.Debug("Existing item meets cut-off, skipping. Existing: {0} [{1}] ({2})", + currentQuality, + currentFormats.ConcatToString(), + profile.CalculateCustomFormatScore(currentFormats)); return false; } diff --git a/src/NzbDrone.Core/DecisionEngine/Specifications/UpgradeDiskSpecification.cs b/src/NzbDrone.Core/DecisionEngine/Specifications/UpgradeDiskSpecification.cs index 9e825cfe6..15168e15f 100644 --- a/src/NzbDrone.Core/DecisionEngine/Specifications/UpgradeDiskSpecification.cs +++ b/src/NzbDrone.Core/DecisionEngine/Specifications/UpgradeDiskSpecification.cs @@ -26,6 +26,8 @@ namespace NzbDrone.Core.DecisionEngine.Specifications public virtual Decision IsSatisfiedBy(RemoteEpisode subject, SearchCriteriaBase searchCriteria) { + var qualityProfile = subject.Series.QualityProfile.Value; + foreach (var file in subject.Episodes.Where(c => c.EpisodeFileId != 0).Select(c => c.EpisodeFile.Value)) { if (file == null) @@ -36,15 +38,45 @@ namespace NzbDrone.Core.DecisionEngine.Specifications var customFormats = _formatService.ParseCustomFormat(file); - _logger.Debug("Comparing file quality with report. Existing file is {0}", file.Quality); + _logger.Debug("Comparing file quality with report. Existing file is {0}.", file.Quality); - if (!_upgradableSpecification.IsUpgradable(subject.Series.QualityProfile, - file.Quality, - customFormats, - subject.ParsedEpisodeInfo.Quality, - subject.CustomFormats)) + if (!_upgradableSpecification.CutoffNotMet(qualityProfile, + file.Quality, + _formatService.ParseCustomFormat(file), + subject.ParsedEpisodeInfo.Quality)) { - return Decision.Reject("Existing file on disk is of equal or higher preference: {0}", file.Quality); + _logger.Debug("Cutoff already met, rejecting."); + + var qualityCutoffIndex = qualityProfile.GetIndex(qualityProfile.Cutoff); + var qualityCutoff = qualityProfile.Items[qualityCutoffIndex.Index]; + + return Decision.Reject("Existing file meets cutoff: {0}", qualityCutoff); + } + + var upgradeableRejectReason = _upgradableSpecification.IsUpgradable(qualityProfile, + file.Quality, + customFormats, + subject.ParsedEpisodeInfo.Quality, + subject.CustomFormats); + + switch (upgradeableRejectReason) + { + case UpgradeableRejectReason.None: + continue; + case UpgradeableRejectReason.BetterQuality: + return Decision.Reject("Existing file on disk is of equal or higher preference: {0}", file.Quality); + + case UpgradeableRejectReason.BetterRevision: + return Decision.Reject("Existing file on disk is of equal or higher revision: {0}", file.Quality.Revision); + + case UpgradeableRejectReason.QualityCutoff: + return Decision.Reject("Existing file on disk meets quality cutoff: {0}", qualityProfile.Items[qualityProfile.GetIndex(qualityProfile.Cutoff).Index]); + + case UpgradeableRejectReason.CustomFormatCutoff: + return Decision.Reject("Existing file on disk meets Custom Format cutoff: {0}", qualityProfile.CutoffFormatScore); + + case UpgradeableRejectReason.CustomFormatScore: + return Decision.Reject("Existing file on disk has a equal or higher custom format score: {0}", qualityProfile.CalculateCustomFormatScore(customFormats)); } } diff --git a/src/NzbDrone.Core/DecisionEngine/UpgradeableRejectReason.cs b/src/NzbDrone.Core/DecisionEngine/UpgradeableRejectReason.cs new file mode 100644 index 000000000..7ed6d6a0f --- /dev/null +++ b/src/NzbDrone.Core/DecisionEngine/UpgradeableRejectReason.cs @@ -0,0 +1,12 @@ +namespace NzbDrone.Core.DecisionEngine +{ + public enum UpgradeableRejectReason + { + None, + BetterQuality, + BetterRevision, + QualityCutoff, + CustomFormatScore, + CustomFormatCutoff + } +}