From 40accd835b82880332a3beca2a35d18fcfdadefd Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Thu, 18 Oct 2012 11:50:52 -0700 Subject: [PATCH] Fixed: Issues with Custom Start Date --- .../CustomStartDateSpecificationFixture.cs | 7 +++++++ .../DecisionEngine/CustomStartDateSpecification.cs | 2 +- NzbDrone.Web/Controllers/SeriesController.cs | 3 +++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/NzbDrone.Core.Test/ProviderTests/DecisionEngineTests/CustomStartDateSpecificationFixture.cs b/NzbDrone.Core.Test/ProviderTests/DecisionEngineTests/CustomStartDateSpecificationFixture.cs index 6e5b5d0da..21e50db85 100644 --- a/NzbDrone.Core.Test/ProviderTests/DecisionEngineTests/CustomStartDateSpecificationFixture.cs +++ b/NzbDrone.Core.Test/ProviderTests/DecisionEngineTests/CustomStartDateSpecificationFixture.cs @@ -141,5 +141,12 @@ namespace NzbDrone.Core.Test.ProviderTests.DecisionEngineTests WithFirstEpisodeLastYear(); _customStartDateSpecification.IsSatisfiedBy(parseResultSingle).Should().BeFalse(); } + + [Test] + public void should_return_true_if_episode_airs_the_same_day_as_the_cutoff() + { + fakeSeries.CustomStartDate = DateTime.Today; + _customStartDateSpecification.IsSatisfiedBy(parseResultSingle).Should().BeTrue(); + } } } \ No newline at end of file diff --git a/NzbDrone.Core/Providers/DecisionEngine/CustomStartDateSpecification.cs b/NzbDrone.Core/Providers/DecisionEngine/CustomStartDateSpecification.cs index 53db72ff1..c25a83e22 100644 --- a/NzbDrone.Core/Providers/DecisionEngine/CustomStartDateSpecification.cs +++ b/NzbDrone.Core/Providers/DecisionEngine/CustomStartDateSpecification.cs @@ -31,7 +31,7 @@ namespace NzbDrone.Core.Providers.DecisionEngine var episodes = _episodeProvider.GetEpisodesByParseResult(subject); - if (episodes.Any(episode => episode.AirDate > subject.Series.CustomStartDate.Value)) + if (episodes.Any(episode => episode.AirDate >= subject.Series.CustomStartDate.Value)) { logger.Debug("One or more episodes aired after cutoff, downloading."); return true; diff --git a/NzbDrone.Web/Controllers/SeriesController.cs b/NzbDrone.Web/Controllers/SeriesController.cs index 9987eeec7..c0c44f6ee 100644 --- a/NzbDrone.Web/Controllers/SeriesController.cs +++ b/NzbDrone.Web/Controllers/SeriesController.cs @@ -82,6 +82,9 @@ namespace NzbDrone.Web.Controllers if (!String.IsNullOrWhiteSpace(seriesModel.CustomStartDate)) series.CustomStartDate = DateTime.Parse(seriesModel.CustomStartDate, null, DateTimeStyles.RoundtripKind); + else + series.CustomStartDate = null; + _seriesProvider.UpdateSeries(series); return new EmptyResult();