diff --git a/NzbDrone.Core/CentralDispatch.cs b/NzbDrone.Core/CentralDispatch.cs index 3c49072db..010006b64 100644 --- a/NzbDrone.Core/CentralDispatch.cs +++ b/NzbDrone.Core/CentralDispatch.cs @@ -67,7 +67,7 @@ namespace NzbDrone.Core _kernel.Bind().To(); _kernel.Bind().To(); _kernel.Bind().ToSelf(); - _kernel.Bind().To(); + _kernel.Bind().ToSelf(); _kernel.Bind().ToSelf(); _kernel.Bind().ToSelf(); _kernel.Bind().ToSelf(); diff --git a/NzbDrone.Core/NzbDrone.Core.csproj b/NzbDrone.Core/NzbDrone.Core.csproj index 1fda7cced..fe7c61bed 100644 --- a/NzbDrone.Core/NzbDrone.Core.csproj +++ b/NzbDrone.Core/NzbDrone.Core.csproj @@ -183,7 +183,6 @@ - diff --git a/NzbDrone.Core/Providers/EpisodeProvider.cs b/NzbDrone.Core/Providers/EpisodeProvider.cs index 0942f1282..fc183f7ce 100644 --- a/NzbDrone.Core/Providers/EpisodeProvider.cs +++ b/NzbDrone.Core/Providers/EpisodeProvider.cs @@ -17,13 +17,13 @@ namespace NzbDrone.Core.Providers private readonly SeriesProvider _series; private readonly ISeasonProvider _seasons; private readonly TvDbProvider _tvDb; - private readonly IHistoryProvider _history; + private readonly HistoryProvider _history; private readonly QualityProvider _quality; private static readonly Logger Logger = LogManager.GetCurrentClassLogger(); public EpisodeProvider(IRepository sonicRepo, SeriesProvider seriesProvider, ISeasonProvider seasonProvider, TvDbProvider tvDbProvider, - IHistoryProvider history, QualityProvider quality) + HistoryProvider history, QualityProvider quality) { _sonicRepo = sonicRepo; _series = seriesProvider; diff --git a/NzbDrone.Core/Providers/HistoryProvider.cs b/NzbDrone.Core/Providers/HistoryProvider.cs index fd09a0520..5db117432 100644 --- a/NzbDrone.Core/Providers/HistoryProvider.cs +++ b/NzbDrone.Core/Providers/HistoryProvider.cs @@ -9,7 +9,7 @@ using SubSonic.Repository; namespace NzbDrone.Core.Providers { - public class HistoryProvider : IHistoryProvider + public class HistoryProvider { private readonly IRepository _sonicRepo; @@ -20,34 +20,34 @@ namespace NzbDrone.Core.Providers _sonicRepo = sonicRepo; } - #region IHistoryProvider Members + #region HistoryProvider Members - public List AllItems() + public virtual List AllItems() { return _sonicRepo.All().ToList(); } - - public void Purge() + + public virtual void Purge() { var all = _sonicRepo.All(); _sonicRepo.DeleteMany(all); Logger.Info("History has been Purged"); } - - public void Trim() + + public virtual void Trim() { var old = _sonicRepo.All().Where(h => h.Date < DateTime.Now.AddDays(-30)); _sonicRepo.DeleteMany(old); Logger.Info("History has been trimmed, items older than 30 days have been removed"); } - - public void Insert(History item) + + public virtual void Insert(History item) { _sonicRepo.Add(item); //Logger.Info("Item added to history: {0} - {1}x{2:00}", item.Episode.Series.Title, item.Episode.SeasonNumber, item.Episode.EpisodeNumber); } - - public bool Exists(int episodeId, QualityTypes quality, bool proper) + + public virtual bool Exists(int episodeId, QualityTypes quality, bool proper) { //Looks for the existance of this episode in History if (_sonicRepo.Exists(h => h.EpisodeId == episodeId && (QualityTypes)h.Quality == quality && h.IsProper == proper)) diff --git a/NzbDrone.Core/Providers/IHistoryProvider.cs b/NzbDrone.Core/Providers/IHistoryProvider.cs deleted file mode 100644 index 6eb9aed3d..000000000 --- a/NzbDrone.Core/Providers/IHistoryProvider.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using NzbDrone.Core.Model; -using NzbDrone.Core.Repository; -using NzbDrone.Core.Repository.Quality; - -namespace NzbDrone.Core.Providers -{ - public interface IHistoryProvider - { - List AllItems(); - void Purge(); - void Trim(); - void Insert(History item); - bool Exists(int episodeId, QualityTypes quality, bool proper); - } -} diff --git a/NzbDrone.Web/Controllers/HistoryController.cs b/NzbDrone.Web/Controllers/HistoryController.cs index add1a68d5..3465f000c 100644 --- a/NzbDrone.Web/Controllers/HistoryController.cs +++ b/NzbDrone.Web/Controllers/HistoryController.cs @@ -12,9 +12,9 @@ namespace NzbDrone.Web.Controllers { public class HistoryController : Controller { - private IHistoryProvider _historyProvider; + private HistoryProvider _historyProvider; - public HistoryController(IHistoryProvider historyProvider) + public HistoryController(HistoryProvider historyProvider) { _historyProvider = historyProvider; }