From d63fe6ad566ddbfa096fec728ae7c9fc8ccd767f Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Fri, 8 Apr 2011 08:10:46 -0700 Subject: [PATCH] Removed IRootDirProvider. --- NzbDrone.Core/CentralDispatch.cs | 2 +- NzbDrone.Core/NzbDrone.Core.csproj | 1 - NzbDrone.Core/Providers/IRootDirProvider.cs | 17 ----------------- NzbDrone.Core/Providers/RootDirProvider.cs | 18 +++++++++--------- .../Controllers/AddSeriesController.cs | 4 ++-- NzbDrone.Web/Controllers/SeriesController.cs | 4 ++-- NzbDrone.Web/Controllers/SettingsController.cs | 4 ++-- 7 files changed, 16 insertions(+), 34 deletions(-) delete mode 100644 NzbDrone.Core/Providers/IRootDirProvider.cs diff --git a/NzbDrone.Core/CentralDispatch.cs b/NzbDrone.Core/CentralDispatch.cs index 663c42889..13f22ed8d 100644 --- a/NzbDrone.Core/CentralDispatch.cs +++ b/NzbDrone.Core/CentralDispatch.cs @@ -68,7 +68,7 @@ namespace NzbDrone.Core _kernel.Bind().To(); _kernel.Bind().To(); _kernel.Bind().To(); - _kernel.Bind().To(); + _kernel.Bind().To(); _kernel.Bind().To(); _kernel.Bind().To(); _kernel.Bind().To().InSingletonScope(); diff --git a/NzbDrone.Core/NzbDrone.Core.csproj b/NzbDrone.Core/NzbDrone.Core.csproj index 024448b3b..9fc950dee 100644 --- a/NzbDrone.Core/NzbDrone.Core.csproj +++ b/NzbDrone.Core/NzbDrone.Core.csproj @@ -189,7 +189,6 @@ - diff --git a/NzbDrone.Core/Providers/IRootDirProvider.cs b/NzbDrone.Core/Providers/IRootDirProvider.cs deleted file mode 100644 index d295ba146..000000000 --- a/NzbDrone.Core/Providers/IRootDirProvider.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using NzbDrone.Core.Repository; - -namespace NzbDrone.Core.Providers -{ - public interface IRootDirProvider - { - List GetAll(); - void Add(RootDir rootDir); - void Remove(int rootDirId); - void Update(RootDir rootDir); - RootDir GetRootDir(int rootDirId); - } -} diff --git a/NzbDrone.Core/Providers/RootDirProvider.cs b/NzbDrone.Core/Providers/RootDirProvider.cs index c1d86dbb6..a1557cb19 100644 --- a/NzbDrone.Core/Providers/RootDirProvider.cs +++ b/NzbDrone.Core/Providers/RootDirProvider.cs @@ -7,7 +7,7 @@ using SubSonic.Repository; namespace NzbDrone.Core.Providers { - public class RootDirProvider : IRootDirProvider + public class RootDirProvider { private readonly IRepository _sonioRepo; @@ -18,27 +18,27 @@ namespace NzbDrone.Core.Providers #region IRootDirProvider - public List GetAll() + public virtual List GetAll() { return _sonioRepo.All().ToList(); } - public void Add(RootDir rootDir) + public virtual void Add(RootDir rootDir) { _sonioRepo.Add(rootDir); } - - public void Remove(int rootDirId) + + public virtual void Remove(int rootDirId) { _sonioRepo.Delete(rootDirId); } - - public void Update(RootDir rootDir) + + public virtual void Update(RootDir rootDir) { _sonioRepo.Update(rootDir); } - - public RootDir GetRootDir(int rootDirId) + + public virtual RootDir GetRootDir(int rootDirId) { return _sonioRepo.Single(rootDirId); } diff --git a/NzbDrone.Web/Controllers/AddSeriesController.cs b/NzbDrone.Web/Controllers/AddSeriesController.cs index abc1ce58a..bedf5b62e 100644 --- a/NzbDrone.Web/Controllers/AddSeriesController.cs +++ b/NzbDrone.Web/Controllers/AddSeriesController.cs @@ -14,13 +14,13 @@ namespace NzbDrone.Web.Controllers { public IConfigProvider ConfigProvider { get; set; } private readonly ISyncProvider _syncProvider; - private readonly IRootDirProvider _rootFolderProvider; + private readonly RootDirProvider _rootFolderProvider; private readonly IConfigProvider _configProvider; private readonly QualityProvider _qualityProvider; private readonly TvDbProvider _tvDbProvider; private readonly ISeriesProvider _seriesProvider; - public AddSeriesController(ISyncProvider syncProvider, IRootDirProvider rootFolderProvider, IConfigProvider configProvider, + public AddSeriesController(ISyncProvider syncProvider, RootDirProvider rootFolderProvider, IConfigProvider configProvider, QualityProvider qualityProvider, TvDbProvider tvDbProvider, ISeriesProvider seriesProvider) { ConfigProvider = configProvider; diff --git a/NzbDrone.Web/Controllers/SeriesController.cs b/NzbDrone.Web/Controllers/SeriesController.cs index 3ee7b1d0f..db837e854 100644 --- a/NzbDrone.Web/Controllers/SeriesController.cs +++ b/NzbDrone.Web/Controllers/SeriesController.cs @@ -28,7 +28,7 @@ namespace NzbDrone.Web.Controllers private readonly QualityProvider _qualityProvider; private readonly IMediaFileProvider _mediaFileProvider; private readonly IRenameProvider _renameProvider; - private readonly IRootDirProvider _rootDirProvider; + private readonly RootDirProvider _rootDirProvider; private readonly TvDbProvider _tvDbProvider; // // GET: /Series/ @@ -36,7 +36,7 @@ namespace NzbDrone.Web.Controllers public SeriesController(ISyncProvider syncProvider, ISeriesProvider seriesProvider, IEpisodeProvider episodeProvider, IRssSyncProvider rssSyncProvider, QualityProvider qualityProvider, IMediaFileProvider mediaFileProvider, - IRenameProvider renameProvider, IRootDirProvider rootDirProvider, + IRenameProvider renameProvider, RootDirProvider rootDirProvider, TvDbProvider tvDbProvider) { _seriesProvider = seriesProvider; diff --git a/NzbDrone.Web/Controllers/SettingsController.cs b/NzbDrone.Web/Controllers/SettingsController.cs index e9cbc9348..edbdecc8a 100644 --- a/NzbDrone.Web/Controllers/SettingsController.cs +++ b/NzbDrone.Web/Controllers/SettingsController.cs @@ -22,14 +22,14 @@ namespace NzbDrone.Web.Controllers private IConfigProvider _configProvider; private IIndexerProvider _indexerProvider; private QualityProvider _qualityProvider; - private IRootDirProvider _rootDirProvider; + private RootDirProvider _rootDirProvider; private static readonly Logger Logger = LogManager.GetCurrentClassLogger(); private const string SETTINGS_SAVED = "Settings Saved."; private const string SETTINGS_FAILED = "Error Saving Settings, please fix any errors"; public SettingsController(IConfigProvider configProvider, IIndexerProvider indexerProvider, - QualityProvider qualityProvider, IRootDirProvider rootDirProvider) + QualityProvider qualityProvider, RootDirProvider rootDirProvider) { _configProvider = configProvider; _indexerProvider = indexerProvider;