diff --git a/NzbDrone.Core.Test/EpisodeProviderTest.cs b/NzbDrone.Core.Test/EpisodeProviderTest.cs index 4828141c3..036c3dd76 100644 --- a/NzbDrone.Core.Test/EpisodeProviderTest.cs +++ b/NzbDrone.Core.Test/EpisodeProviderTest.cs @@ -66,7 +66,7 @@ namespace NzbDrone.Core.Test { //Setup var season = new Mock(); - var series = new Mock(); + var series = new Mock(); //var history = new Mock(); //var quality = new Mock(); var repo = new Mock(); diff --git a/NzbDrone.Core.Test/RssProviderTest.cs b/NzbDrone.Core.Test/RssProviderTest.cs index 217fd81a1..9dc68ecbb 100644 --- a/NzbDrone.Core.Test/RssProviderTest.cs +++ b/NzbDrone.Core.Test/RssProviderTest.cs @@ -43,7 +43,7 @@ namespace NzbDrone.Core.Test public class MockFeedProvider : FeedProviderBase { - public MockFeedProvider(ISeriesProvider seriesProvider, ISeasonProvider seasonProvider, IEpisodeProvider episodeProvider, IConfigProvider configProvider, HttpProvider httpProvider) + public MockFeedProvider(SeriesProvider seriesProvider, ISeasonProvider seasonProvider, IEpisodeProvider episodeProvider, IConfigProvider configProvider, HttpProvider httpProvider) : base(seriesProvider, seasonProvider, episodeProvider, configProvider, httpProvider) { } diff --git a/NzbDrone.Core/CentralDispatch.cs b/NzbDrone.Core/CentralDispatch.cs index 94208603f..3c49072db 100644 --- a/NzbDrone.Core/CentralDispatch.cs +++ b/NzbDrone.Core/CentralDispatch.cs @@ -60,23 +60,23 @@ namespace NzbDrone.Core _kernel.Bind().ToSelf(); _kernel.Bind().ToSelf(); _kernel.Bind().ToSelf(); - _kernel.Bind().To().InSingletonScope(); + _kernel.Bind().ToSelf().InSingletonScope(); _kernel.Bind().To().InSingletonScope(); _kernel.Bind().To(); _kernel.Bind().To(); _kernel.Bind().To(); _kernel.Bind().To(); - _kernel.Bind().To(); + _kernel.Bind().ToSelf(); _kernel.Bind().To(); - _kernel.Bind().To(); - _kernel.Bind().To(); - _kernel.Bind().To(); - _kernel.Bind().To(); + _kernel.Bind().ToSelf(); + _kernel.Bind().ToSelf(); + _kernel.Bind().ToSelf(); + _kernel.Bind().ToSelf(); _kernel.Bind().To().InSingletonScope(); _kernel.Bind().To().InSingletonScope(); _kernel.Bind().To().InSingletonScope(); _kernel.Bind().To().InSingletonScope(); - _kernel.Bind().To().InSingletonScope(); + _kernel.Bind().ToSelf().InSingletonScope(); _kernel.Bind().To().InSingletonScope(); _kernel.Bind().To().InSingletonScope(); _kernel.Bind().To().InSingletonScope(); diff --git a/NzbDrone.Core/NzbDrone.Core.csproj b/NzbDrone.Core/NzbDrone.Core.csproj index 1d4895b00..1fda7cced 100644 --- a/NzbDrone.Core/NzbDrone.Core.csproj +++ b/NzbDrone.Core/NzbDrone.Core.csproj @@ -213,7 +213,6 @@ - diff --git a/NzbDrone.Core/Providers/EpisodeProvider.cs b/NzbDrone.Core/Providers/EpisodeProvider.cs index a5bd0660e..0942f1282 100644 --- a/NzbDrone.Core/Providers/EpisodeProvider.cs +++ b/NzbDrone.Core/Providers/EpisodeProvider.cs @@ -14,14 +14,14 @@ namespace NzbDrone.Core.Providers //TODO: Remove parsing of the series name, it should be done in series provider private readonly IRepository _sonicRepo; - private readonly ISeriesProvider _series; + private readonly SeriesProvider _series; private readonly ISeasonProvider _seasons; private readonly TvDbProvider _tvDb; private readonly IHistoryProvider _history; private readonly QualityProvider _quality; private static readonly Logger Logger = LogManager.GetCurrentClassLogger(); - public EpisodeProvider(IRepository sonicRepo, ISeriesProvider seriesProvider, + public EpisodeProvider(IRepository sonicRepo, SeriesProvider seriesProvider, ISeasonProvider seasonProvider, TvDbProvider tvDbProvider, IHistoryProvider history, QualityProvider quality) { diff --git a/NzbDrone.Core/Providers/Feed/FeedProviderBase.cs b/NzbDrone.Core/Providers/Feed/FeedProviderBase.cs index 790d286d9..2e6f4cc21 100644 --- a/NzbDrone.Core/Providers/Feed/FeedProviderBase.cs +++ b/NzbDrone.Core/Providers/Feed/FeedProviderBase.cs @@ -8,14 +8,14 @@ namespace NzbDrone.Core.Providers.Feed { public abstract class FeedProviderBase { - protected readonly ISeriesProvider _seriesProvider; + protected readonly SeriesProvider _seriesProvider; protected readonly ISeasonProvider _seasonProvider; protected readonly IEpisodeProvider _episodeProvider; protected readonly IConfigProvider _configProvider; private readonly HttpProvider _httpProvider; protected static readonly Logger Logger = LogManager.GetCurrentClassLogger(); - public FeedProviderBase(ISeriesProvider seriesProvider, ISeasonProvider seasonProvider, + public FeedProviderBase(SeriesProvider seriesProvider, ISeasonProvider seasonProvider, IEpisodeProvider episodeProvider, IConfigProvider configProvider, HttpProvider httpProvider) { _seriesProvider = seriesProvider; diff --git a/NzbDrone.Core/Providers/Feed/NzbsOrgFeedProvider.cs b/NzbDrone.Core/Providers/Feed/NzbsOrgFeedProvider.cs index 27a996be1..f23f53d32 100644 --- a/NzbDrone.Core/Providers/Feed/NzbsOrgFeedProvider.cs +++ b/NzbDrone.Core/Providers/Feed/NzbsOrgFeedProvider.cs @@ -9,7 +9,7 @@ namespace NzbDrone.Core.Providers.Feed { class NzbsOrgFeedProvider : FeedProviderBase { - public NzbsOrgFeedProvider(ISeriesProvider seriesProvider, ISeasonProvider seasonProvider, IEpisodeProvider episodeProvider, IConfigProvider configProvider, HttpProvider httpProvider) + public NzbsOrgFeedProvider(SeriesProvider seriesProvider, ISeasonProvider seasonProvider, IEpisodeProvider episodeProvider, IConfigProvider configProvider, HttpProvider httpProvider) : base(seriesProvider, seasonProvider, episodeProvider, configProvider, httpProvider) { } diff --git a/NzbDrone.Core/Providers/ISeriesProvider.cs b/NzbDrone.Core/Providers/ISeriesProvider.cs deleted file mode 100644 index 1d09f77f2..000000000 --- a/NzbDrone.Core/Providers/ISeriesProvider.cs +++ /dev/null @@ -1,30 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using NzbDrone.Core.Repository; -using NzbDrone.Core.Repository.Quality; -using TvdbLib.Data; - -namespace NzbDrone.Core.Providers -{ - public interface ISeriesProvider - { - IQueryable GetAllSeries(); - Series GetSeries(int seriesId); - - /// - /// Determines if a series is being actively watched. - /// - /// The TVDB ID of the series - /// Whether or not the show is monitored - bool IsMonitored(long id); - TvdbSeries MapPathToSeries(string path); - void AddSeries(string path, int tvDbSeriesId, int qualityProfileId); - Series FindSeries(string cleanTitle); - bool QualityWanted(int seriesId, QualityTypes quality); - void UpdateSeries(Series series); - void DeleteSeries(int seriesId); - bool SeriesPathExists(string cleanPath); - Series UpdateSeriesInfo(int seriesId); - } -} \ No newline at end of file diff --git a/NzbDrone.Core/Providers/NotificationProvider.cs b/NzbDrone.Core/Providers/NotificationProvider.cs index f2759e3a6..72a23fb36 100644 --- a/NzbDrone.Core/Providers/NotificationProvider.cs +++ b/NzbDrone.Core/Providers/NotificationProvider.cs @@ -11,22 +11,22 @@ namespace NzbDrone.Core.Providers private Dictionary _progressNotification = new Dictionary(); private readonly Object _lock = new object(); - public void Register(ProgressNotification notification) + public virtual void Register(ProgressNotification notification) { _progressNotification.Add(notification.Id, notification); } - public void Register(BasicNotification notification) + public virtual void Register(BasicNotification notification) { _basicNotifications.Add(notification.Id, notification); } - public List BasicNotifications + public virtual List BasicNotifications { get { return new List(_basicNotifications.Values); } } - public List GetProgressNotifications + public virtual List GetProgressNotifications { get { @@ -34,7 +34,7 @@ namespace NzbDrone.Core.Providers } } - public void Dismiss(Guid notificationId) + public virtual void Dismiss(Guid notificationId) { lock (_lock) { diff --git a/NzbDrone.Core/Providers/PostProcessingProvider.cs b/NzbDrone.Core/Providers/PostProcessingProvider.cs index 63ff28361..9177b2280 100644 --- a/NzbDrone.Core/Providers/PostProcessingProvider.cs +++ b/NzbDrone.Core/Providers/PostProcessingProvider.cs @@ -11,11 +11,11 @@ namespace NzbDrone.Core.Providers { public class PostProcessingProvider { - private readonly ISeriesProvider _seriesProvider; + private readonly SeriesProvider _seriesProvider; private readonly IMediaFileProvider _mediaFileProvider; private readonly IRenameProvider _renameProvider; - public PostProcessingProvider(ISeriesProvider seriesProvider, + public PostProcessingProvider(SeriesProvider seriesProvider, IMediaFileProvider mediaFileProvider, IRenameProvider renameProvider) { _seriesProvider = seriesProvider; diff --git a/NzbDrone.Core/Providers/RenameProvider.cs b/NzbDrone.Core/Providers/RenameProvider.cs index 90dcd2775..686d612be 100644 --- a/NzbDrone.Core/Providers/RenameProvider.cs +++ b/NzbDrone.Core/Providers/RenameProvider.cs @@ -14,7 +14,7 @@ namespace NzbDrone.Core.Providers { public class RenameProvider : IRenameProvider { - private readonly ISeriesProvider _seriesProvider; + private readonly SeriesProvider _seriesProvider; private readonly ISeasonProvider _seasonProvider; private readonly IEpisodeProvider _episodeProvider; private readonly IMediaFileProvider _mediaFileProvider; @@ -27,7 +27,7 @@ namespace NzbDrone.Core.Providers private static readonly Logger Logger = LogManager.GetCurrentClassLogger(); - public RenameProvider(ISeriesProvider seriesProvider, ISeasonProvider seasonProvider, + public RenameProvider(SeriesProvider seriesProvider, ISeasonProvider seasonProvider, IEpisodeProvider episodeProvider, IMediaFileProvider mediaFileProvider, IDiskProvider diskProvider, IConfigProvider configProvider, ExternalNotificationProvider extenalNotificationProvider) diff --git a/NzbDrone.Core/Providers/SeasonProvider.cs b/NzbDrone.Core/Providers/SeasonProvider.cs index fae1d4777..dbd72ddbb 100644 --- a/NzbDrone.Core/Providers/SeasonProvider.cs +++ b/NzbDrone.Core/Providers/SeasonProvider.cs @@ -11,11 +11,11 @@ namespace NzbDrone.Core.Providers public class SeasonProvider : ISeasonProvider { private readonly IRepository _sonicRepo; - private readonly ISeriesProvider _seriesProvider; + private readonly SeriesProvider _seriesProvider; private static readonly Logger Logger = LogManager.GetCurrentClassLogger(); - public SeasonProvider(IRepository dataRepository, ISeriesProvider seriesProvider) + public SeasonProvider(IRepository dataRepository, SeriesProvider seriesProvider) { _sonicRepo = dataRepository; _seriesProvider = seriesProvider; diff --git a/NzbDrone.Core/Providers/SeriesProvider.cs b/NzbDrone.Core/Providers/SeriesProvider.cs index 4e5c67cb1..e50a10b03 100644 --- a/NzbDrone.Core/Providers/SeriesProvider.cs +++ b/NzbDrone.Core/Providers/SeriesProvider.cs @@ -13,7 +13,7 @@ using TvdbLib.Data; namespace NzbDrone.Core.Providers { - public class SeriesProvider : ISeriesProvider + public class SeriesProvider { //TODO: Remove parsing of rest of tv show info we just need the show name @@ -34,7 +34,7 @@ namespace NzbDrone.Core.Providers _quality = quality; } - #region ISeriesProvider Members + #region SeriesProvider Members public virtual IQueryable GetAllSeries() { diff --git a/NzbDrone.Core/Providers/SyncProvider.cs b/NzbDrone.Core/Providers/SyncProvider.cs index 9f0ffb1a5..9808b88cb 100644 --- a/NzbDrone.Core/Providers/SyncProvider.cs +++ b/NzbDrone.Core/Providers/SyncProvider.cs @@ -13,7 +13,7 @@ namespace NzbDrone.Core.Providers { public class SyncProvider : ISyncProvider { - private readonly ISeriesProvider _seriesProvider; + private readonly SeriesProvider _seriesProvider; private readonly IEpisodeProvider _episodeProvider; private readonly IMediaFileProvider _mediaFileProvider; private readonly NotificationProvider _notificationProvider; @@ -24,7 +24,7 @@ namespace NzbDrone.Core.Providers private static readonly Logger Logger = LogManager.GetCurrentClassLogger(); - public SyncProvider(ISeriesProvider seriesProvider, IEpisodeProvider episodeProvider, + public SyncProvider(SeriesProvider seriesProvider, IEpisodeProvider episodeProvider, IMediaFileProvider mediaFileProvider, NotificationProvider notificationProvider, IDiskProvider diskProvider) { diff --git a/NzbDrone.Core/Providers/TimerProvider.cs b/NzbDrone.Core/Providers/TimerProvider.cs index e9b8d6f58..10f5840a5 100644 --- a/NzbDrone.Core/Providers/TimerProvider.cs +++ b/NzbDrone.Core/Providers/TimerProvider.cs @@ -11,7 +11,7 @@ namespace NzbDrone.Core.Providers public class TimerProvider { private readonly IRssSyncProvider _rssSyncProvider; - private readonly ISeriesProvider _seriesProvider; + private readonly SeriesProvider _seriesProvider; private readonly ISeasonProvider _seasonProvider; private readonly IEpisodeProvider _episodeProvider; private readonly IMediaFileProvider _mediaFileProvider; @@ -21,7 +21,7 @@ namespace NzbDrone.Core.Providers private DateTime _rssSyncNextInterval; private static readonly Logger Logger = LogManager.GetCurrentClassLogger(); - public TimerProvider(IRssSyncProvider rssSyncProvider, ISeriesProvider seriesProvider, ISeasonProvider seasonProvider, IEpisodeProvider episodeProvider, IMediaFileProvider mediaFileProvider) + public TimerProvider(IRssSyncProvider rssSyncProvider, SeriesProvider seriesProvider, ISeasonProvider seasonProvider, IEpisodeProvider episodeProvider, IMediaFileProvider mediaFileProvider) { _rssSyncProvider = rssSyncProvider; _seriesProvider = seriesProvider; diff --git a/NzbDrone.Web/Controllers/AddSeriesController.cs b/NzbDrone.Web/Controllers/AddSeriesController.cs index bedf5b62e..985b257f8 100644 --- a/NzbDrone.Web/Controllers/AddSeriesController.cs +++ b/NzbDrone.Web/Controllers/AddSeriesController.cs @@ -18,10 +18,10 @@ namespace NzbDrone.Web.Controllers private readonly IConfigProvider _configProvider; private readonly QualityProvider _qualityProvider; private readonly TvDbProvider _tvDbProvider; - private readonly ISeriesProvider _seriesProvider; + private readonly SeriesProvider _seriesProvider; public AddSeriesController(ISyncProvider syncProvider, RootDirProvider rootFolderProvider, IConfigProvider configProvider, - QualityProvider qualityProvider, TvDbProvider tvDbProvider, ISeriesProvider seriesProvider) + QualityProvider qualityProvider, TvDbProvider tvDbProvider, SeriesProvider seriesProvider) { ConfigProvider = configProvider; _syncProvider = syncProvider; diff --git a/NzbDrone.Web/Controllers/SeriesController.cs b/NzbDrone.Web/Controllers/SeriesController.cs index db837e854..8f1dea8fe 100644 --- a/NzbDrone.Web/Controllers/SeriesController.cs +++ b/NzbDrone.Web/Controllers/SeriesController.cs @@ -21,7 +21,7 @@ namespace NzbDrone.Web.Controllers [HandleError] public class SeriesController : Controller { - private readonly ISeriesProvider _seriesProvider; + private readonly SeriesProvider _seriesProvider; private readonly IEpisodeProvider _episodeProvider; private readonly ISyncProvider _syncProvider; private readonly IRssSyncProvider _rssSyncProvider; @@ -33,7 +33,7 @@ namespace NzbDrone.Web.Controllers // // GET: /Series/ - public SeriesController(ISyncProvider syncProvider, ISeriesProvider seriesProvider, + public SeriesController(ISyncProvider syncProvider, SeriesProvider seriesProvider, IEpisodeProvider episodeProvider, IRssSyncProvider rssSyncProvider, QualityProvider qualityProvider, IMediaFileProvider mediaFileProvider, IRenameProvider renameProvider, RootDirProvider rootDirProvider,