diff --git a/NzbDrone.Core/CentralDispatch.cs b/NzbDrone.Core/CentralDispatch.cs index f0128c587..272ce1ab5 100644 --- a/NzbDrone.Core/CentralDispatch.cs +++ b/NzbDrone.Core/CentralDispatch.cs @@ -61,7 +61,7 @@ public static void BindKernel() _kernel.Bind().ToSelf(); _kernel.Bind().ToSelf(); _kernel.Bind().ToSelf().InSingletonScope(); - _kernel.Bind().To().InSingletonScope(); + _kernel.Bind().ToSelf().InSingletonScope(); _kernel.Bind().To(); _kernel.Bind().To(); _kernel.Bind().To(); @@ -75,7 +75,7 @@ public static void BindKernel() _kernel.Bind().To().InSingletonScope(); _kernel.Bind().To().InSingletonScope(); _kernel.Bind().To().InSingletonScope(); - _kernel.Bind().To().InSingletonScope(); + _kernel.Bind().ToSelf().InSingletonScope(); _kernel.Bind().ToSelf().InSingletonScope(); _kernel.Bind().To().InSingletonScope(); _kernel.Bind().To().InSingletonScope(); diff --git a/NzbDrone.Core/NzbDrone.Core.csproj b/NzbDrone.Core/NzbDrone.Core.csproj index fe7c61bed..b96de97d7 100644 --- a/NzbDrone.Core/NzbDrone.Core.csproj +++ b/NzbDrone.Core/NzbDrone.Core.csproj @@ -182,11 +182,10 @@ - + - - + diff --git a/NzbDrone.Core/Providers/IRenameProvider.cs b/NzbDrone.Core/Providers/IRenameProvider.cs deleted file mode 100644 index 764608d0e..000000000 --- a/NzbDrone.Core/Providers/IRenameProvider.cs +++ /dev/null @@ -1,16 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace NzbDrone.Core.Providers -{ - public interface IRenameProvider - { - void RenameAll(); - void RenameSeries(int seriesId); - void RenameSeason(int seasonId); - void RenameEpisode(int episodeId); - void RenameEpisodeFile(int episodeFileId, bool newDownload); - } -} diff --git a/NzbDrone.Core/Providers/PostProcessingProvider.cs b/NzbDrone.Core/Providers/PostProcessingProvider.cs index 9177b2280..b24d66fbf 100644 --- a/NzbDrone.Core/Providers/PostProcessingProvider.cs +++ b/NzbDrone.Core/Providers/PostProcessingProvider.cs @@ -13,10 +13,10 @@ public class PostProcessingProvider { private readonly SeriesProvider _seriesProvider; private readonly IMediaFileProvider _mediaFileProvider; - private readonly IRenameProvider _renameProvider; + private readonly RenameProvider _renameProvider; public PostProcessingProvider(SeriesProvider seriesProvider, - IMediaFileProvider mediaFileProvider, IRenameProvider renameProvider) + IMediaFileProvider mediaFileProvider, RenameProvider renameProvider) { _seriesProvider = seriesProvider; _mediaFileProvider = mediaFileProvider; diff --git a/NzbDrone.Core/Providers/RenameProvider.cs b/NzbDrone.Core/Providers/RenameProvider.cs index 686d612be..5ac36124c 100644 --- a/NzbDrone.Core/Providers/RenameProvider.cs +++ b/NzbDrone.Core/Providers/RenameProvider.cs @@ -12,7 +12,7 @@ namespace NzbDrone.Core.Providers { - public class RenameProvider : IRenameProvider + public class RenameProvider { private readonly SeriesProvider _seriesProvider; private readonly ISeasonProvider _seasonProvider; @@ -41,8 +41,8 @@ public RenameProvider(SeriesProvider seriesProvider, ISeasonProvider seasonProvi _externalNotificationProvider = extenalNotificationProvider; } - #region IRenameProvider Members - public void RenameAll() + #region RenameProvider Members + public virtual void RenameAll() { //Get a list of all episode files/episodes and rename them @@ -61,8 +61,8 @@ public void RenameAll() StartRename(); } } - - public void RenameSeries(int seriesId) + + public virtual void RenameSeries(int seriesId) { //Get a list of all applicable episode files/episodes and rename them @@ -83,8 +83,8 @@ public void RenameSeries(int seriesId) StartRename(); } } - - public void RenameSeason(int seasonId) + + public virtual void RenameSeason(int seasonId) { //Get a list of all applicable episode files/episodes and rename them var season = _seasonProvider.GetSeason(seasonId); @@ -105,8 +105,8 @@ public void RenameSeason(int seasonId) StartRename(); } } - - public void RenameEpisode(int episodeId) + + public virtual void RenameEpisode(int episodeId) { //This will properly rename multi-episode files if asked to rename either of the episode var episode = _episodeProvider.GetEpisode(episodeId); @@ -126,8 +126,8 @@ public void RenameEpisode(int episodeId) _epsToRename.Add(erm); StartRename(); } - - public void RenameEpisodeFile(int episodeFileId, bool newDownload) + + public virtual void RenameEpisodeFile(int episodeFileId, bool newDownload) { //This will properly rename multi-episode files if asked to rename either of the episode var episodeFile = _mediaFileProvider.GetEpisodeFile(episodeFileId); diff --git a/NzbDrone.Core/Providers/TimerProvider.cs b/NzbDrone.Core/Providers/TimerProvider.cs index 10f5840a5..814f8a214 100644 --- a/NzbDrone.Core/Providers/TimerProvider.cs +++ b/NzbDrone.Core/Providers/TimerProvider.cs @@ -10,7 +10,7 @@ namespace NzbDrone.Core.Providers { public class TimerProvider { - private readonly IRssSyncProvider _rssSyncProvider; + private readonly RssSyncProvider _rssSyncProvider; private readonly SeriesProvider _seriesProvider; private readonly ISeasonProvider _seasonProvider; private readonly IEpisodeProvider _episodeProvider; @@ -21,7 +21,7 @@ public class TimerProvider private DateTime _rssSyncNextInterval; private static readonly Logger Logger = LogManager.GetCurrentClassLogger(); - public TimerProvider(IRssSyncProvider rssSyncProvider, SeriesProvider seriesProvider, ISeasonProvider seasonProvider, IEpisodeProvider episodeProvider, IMediaFileProvider mediaFileProvider) + public TimerProvider(RssSyncProvider rssSyncProvider, SeriesProvider seriesProvider, ISeasonProvider seasonProvider, IEpisodeProvider episodeProvider, IMediaFileProvider mediaFileProvider) { _rssSyncProvider = rssSyncProvider; _seriesProvider = seriesProvider; diff --git a/NzbDrone.Web/Controllers/SeriesController.cs b/NzbDrone.Web/Controllers/SeriesController.cs index 8f1dea8fe..44d8fa497 100644 --- a/NzbDrone.Web/Controllers/SeriesController.cs +++ b/NzbDrone.Web/Controllers/SeriesController.cs @@ -24,19 +24,19 @@ public class SeriesController : Controller private readonly SeriesProvider _seriesProvider; private readonly IEpisodeProvider _episodeProvider; private readonly ISyncProvider _syncProvider; - private readonly IRssSyncProvider _rssSyncProvider; + private readonly RssSyncProvider _rssSyncProvider; private readonly QualityProvider _qualityProvider; private readonly IMediaFileProvider _mediaFileProvider; - private readonly IRenameProvider _renameProvider; + private readonly RenameProvider _renameProvider; private readonly RootDirProvider _rootDirProvider; private readonly TvDbProvider _tvDbProvider; // // GET: /Series/ public SeriesController(ISyncProvider syncProvider, SeriesProvider seriesProvider, - IEpisodeProvider episodeProvider, IRssSyncProvider rssSyncProvider, + IEpisodeProvider episodeProvider, RssSyncProvider rssSyncProvider, QualityProvider qualityProvider, IMediaFileProvider mediaFileProvider, - IRenameProvider renameProvider, RootDirProvider rootDirProvider, + RenameProvider renameProvider, RootDirProvider rootDirProvider, TvDbProvider tvDbProvider) { _seriesProvider = seriesProvider;