From 8380c25eaf7efc59e26a409cd87e4e4a36d69a7a Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Fri, 8 Apr 2011 08:18:01 -0700 Subject: [PATCH] Removed IUpcomingEpisodesProvider --- NzbDrone.Core/CentralDispatch.cs | 2 +- NzbDrone.Core/NzbDrone.Core.csproj | 1 - .../Providers/IUpcomingEpisodesProvider.cs | 17 ----------------- .../Providers/UpcomingEpisodesProvider.cs | 12 ++++++------ NzbDrone.Web/Controllers/UpcomingController.cs | 4 ++-- 5 files changed, 9 insertions(+), 27 deletions(-) delete mode 100644 NzbDrone.Core/Providers/IUpcomingEpisodesProvider.cs diff --git a/NzbDrone.Core/CentralDispatch.cs b/NzbDrone.Core/CentralDispatch.cs index 14724ad1d..5450655c1 100644 --- a/NzbDrone.Core/CentralDispatch.cs +++ b/NzbDrone.Core/CentralDispatch.cs @@ -64,7 +64,7 @@ namespace NzbDrone.Core _kernel.Bind().To().InSingletonScope(); _kernel.Bind().To(); _kernel.Bind().To(); - _kernel.Bind().To(); + _kernel.Bind().To(); _kernel.Bind().To(); _kernel.Bind().To(); _kernel.Bind().To(); diff --git a/NzbDrone.Core/NzbDrone.Core.csproj b/NzbDrone.Core/NzbDrone.Core.csproj index c19fc7961..f2925292f 100644 --- a/NzbDrone.Core/NzbDrone.Core.csproj +++ b/NzbDrone.Core/NzbDrone.Core.csproj @@ -191,7 +191,6 @@ - diff --git a/NzbDrone.Core/Providers/IUpcomingEpisodesProvider.cs b/NzbDrone.Core/Providers/IUpcomingEpisodesProvider.cs deleted file mode 100644 index 137813105..000000000 --- a/NzbDrone.Core/Providers/IUpcomingEpisodesProvider.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using NzbDrone.Core.Model; -using NzbDrone.Core.Repository; - -namespace NzbDrone.Core.Providers -{ - public interface IUpcomingEpisodesProvider - { - UpcomingEpisodesModel Upcoming(); - List Yesterday(); - List Today(); - List Week(); - } -} diff --git a/NzbDrone.Core/Providers/UpcomingEpisodesProvider.cs b/NzbDrone.Core/Providers/UpcomingEpisodesProvider.cs index 4fd87711c..de24334a2 100644 --- a/NzbDrone.Core/Providers/UpcomingEpisodesProvider.cs +++ b/NzbDrone.Core/Providers/UpcomingEpisodesProvider.cs @@ -8,7 +8,7 @@ using SubSonic.Repository; namespace NzbDrone.Core.Providers { - public class UpcomingEpisodesProvider : IUpcomingEpisodesProvider + public class UpcomingEpisodesProvider { private IRepository _sonicRepo; @@ -17,9 +17,9 @@ namespace NzbDrone.Core.Providers _sonicRepo = sonicRepo; } - #region IUpcomingEpisodesProvider + #region UpcomingEpisodesProvider Members - public UpcomingEpisodesModel Upcoming() + public virtual UpcomingEpisodesModel Upcoming() { var allEps = _sonicRepo.All().Where(e => e.AirDate >= DateTime.Today.AddDays(-1) && e.AirDate < DateTime.Today.AddDays(8)); @@ -30,17 +30,17 @@ namespace NzbDrone.Core.Providers return new UpcomingEpisodesModel {Yesterday = yesterday, Today = today, Week = week}; } - public List Yesterday() + public virtual List Yesterday() { return _sonicRepo.All().Where(e => e.AirDate == DateTime.Today.AddDays(-1)).ToList(); } - public List Today() + public virtual List Today() { return _sonicRepo.All().Where(e => e.AirDate == DateTime.Today).ToList(); } - public List Week() + public virtual List Week() { return _sonicRepo.All().Where(e => e.AirDate > DateTime.Today && e.AirDate < DateTime.Today.AddDays(8)).ToList(); } diff --git a/NzbDrone.Web/Controllers/UpcomingController.cs b/NzbDrone.Web/Controllers/UpcomingController.cs index 13de33206..dcf66cf55 100644 --- a/NzbDrone.Web/Controllers/UpcomingController.cs +++ b/NzbDrone.Web/Controllers/UpcomingController.cs @@ -11,9 +11,9 @@ namespace NzbDrone.Web.Controllers { public class UpcomingController : Controller { - private IUpcomingEpisodesProvider _upcomingEpisodesProvider; + private UpcomingEpisodesProvider _upcomingEpisodesProvider; - public UpcomingController(IUpcomingEpisodesProvider upcomingEpisodesProvider) + public UpcomingController(UpcomingEpisodesProvider upcomingEpisodesProvider) { _upcomingEpisodesProvider = upcomingEpisodesProvider; }