From 440a128f286ef2ad6dab7048499d8c4848198bb3 Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Mon, 15 Jul 2013 15:52:00 -0700 Subject: [PATCH] Calendar will now only show monitored episodes --- .../EpisodeRepositoryTests/EpisodesBetweenDatesFixture.cs | 2 ++ NzbDrone.Core/Tv/EpisodeRepository.cs | 8 ++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/NzbDrone.Core.Test/TvTests/EpisodeRepositoryTests/EpisodesBetweenDatesFixture.cs b/NzbDrone.Core.Test/TvTests/EpisodeRepositoryTests/EpisodesBetweenDatesFixture.cs index b21b731d2..dbb2861e7 100644 --- a/NzbDrone.Core.Test/TvTests/EpisodeRepositoryTests/EpisodesBetweenDatesFixture.cs +++ b/NzbDrone.Core.Test/TvTests/EpisodeRepositoryTests/EpisodesBetweenDatesFixture.cs @@ -16,6 +16,7 @@ namespace NzbDrone.Core.Test.TvTests.EpisodeRepositoryTests var series = Builder.CreateNew() .With(s => s.Id = 0) .With(s => s.Runtime = 30) + .With(s => s.Monitored = true) .Build(); series.Id = Db.Insert(series).Id; @@ -23,6 +24,7 @@ namespace NzbDrone.Core.Test.TvTests.EpisodeRepositoryTests var episode = Builder.CreateNew() .With(e => e.Id = 0) .With(e => e.SeriesId = series.Id) + .With(e => e.Monitored = true) .Build(); Db.Insert(episode); diff --git a/NzbDrone.Core/Tv/EpisodeRepository.cs b/NzbDrone.Core/Tv/EpisodeRepository.cs index fdd921b4c..178bc4e9c 100644 --- a/NzbDrone.Core/Tv/EpisodeRepository.cs +++ b/NzbDrone.Core/Tv/EpisodeRepository.cs @@ -119,8 +119,12 @@ namespace NzbDrone.Core.Tv public List EpisodesBetweenDates(DateTime startDate, DateTime endDate) { - return Query.Where(e => e.AirDate >= startDate) - .AndWhere(e => e.AirDate <= endDate).ToList(); + return Query.Join(JoinType.Inner, e => e.Series, (e, s) => e.SeriesId == s.Id) + .Where(e => e.AirDate >= startDate) + .AndWhere(e => e.AirDate <= endDate) + .AndWhere(e => e.Monitored) + .AndWhere(e => e.Series.Monitored) + .ToList(); } public void SetMonitoredFlat(Episode episode, bool monitored)