From 1a9948de2f99f615deb30ce35f0cb881a91f4f6c Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Fri, 8 Apr 2011 17:21:57 -0700 Subject: [PATCH] Removed IDiskProvider. Removed IIndexerProvider. --- NzbDrone.Core.Test/MediaFileProviderTests.cs | 12 ++++++------ NzbDrone.Core.Test/MockLib.cs | 4 ++-- NzbDrone.Core/CentralDispatch.cs | 6 +++--- NzbDrone.Core/NzbDrone.Core.csproj | 2 -- NzbDrone.Core/Providers/Core/DiskProvider.cs | 18 +++++++++--------- NzbDrone.Core/Providers/Core/IDiskProvider.cs | 17 ----------------- NzbDrone.Core/Providers/IIndexerProvider.cs | 17 ----------------- NzbDrone.Core/Providers/IndexerProvider.cs | 12 ++++++------ NzbDrone.Core/Providers/MediaFileProvider.cs | 4 ++-- NzbDrone.Core/Providers/RenameProvider.cs | 4 ++-- NzbDrone.Core/Providers/SyncProvider.cs | 4 ++-- NzbDrone.Web/Controllers/SettingsController.cs | 4 ++-- 12 files changed, 34 insertions(+), 70 deletions(-) delete mode 100644 NzbDrone.Core/Providers/Core/IDiskProvider.cs delete mode 100644 NzbDrone.Core/Providers/IIndexerProvider.cs diff --git a/NzbDrone.Core.Test/MediaFileProviderTests.cs b/NzbDrone.Core.Test/MediaFileProviderTests.cs index 2efe88388..c63cedf78 100644 --- a/NzbDrone.Core.Test/MediaFileProviderTests.cs +++ b/NzbDrone.Core.Test/MediaFileProviderTests.cs @@ -48,14 +48,14 @@ namespace NzbDrone.Core.Test var episodeProvider = new Mock(); episodeProvider.Setup(e => e.GetEpisode(fakeSeries.SeriesId, seasonNumber, episodeNumner)).Returns(fakeEpisode).Verifiable(); - var diskProvider = new Mock(); + var diskProvider = new Mock(); diskProvider.Setup(e => e.GetSize(fileName)).Returns(12345).Verifiable(); var kernel = new MockingKernel(); kernel.Bind().ToConstant(repository.Object); kernel.Bind().ToConstant(episodeProvider.Object); - kernel.Bind().ToConstant(diskProvider.Object); + kernel.Bind().ToConstant(diskProvider.Object); kernel.Bind().To(); //Act @@ -100,13 +100,13 @@ namespace NzbDrone.Core.Test repository.Setup(r => r.Exists(It.IsAny>>())).Returns(true).Verifiable(); var episodeProvider = new Mock(MockBehavior.Strict); - var diskProvider = new Mock(MockBehavior.Strict); + var diskProvider = new Mock(MockBehavior.Strict); var kernel = new MockingKernel(); kernel.Bind().ToConstant(repository.Object); kernel.Bind().ToConstant(episodeProvider.Object); - kernel.Bind().ToConstant(diskProvider.Object); + kernel.Bind().ToConstant(diskProvider.Object); kernel.Bind().To(); //Act @@ -142,13 +142,13 @@ namespace NzbDrone.Core.Test var episodeProvider = new Mock(MockBehavior.Strict); episodeProvider.Setup(e => e.GetEpisode(fakeSeries.SeriesId, seasonNumber, episodeNumner)).Returns(null).Verifiable(); - var diskProvider = new Mock(MockBehavior.Strict); + var diskProvider = new Mock(MockBehavior.Strict); var kernel = new MockingKernel(); kernel.Bind().ToConstant(repository.Object); kernel.Bind().ToConstant(episodeProvider.Object); - kernel.Bind().ToConstant(diskProvider.Object); + kernel.Bind().ToConstant(diskProvider.Object); kernel.Bind().To(); //Act diff --git a/NzbDrone.Core.Test/MockLib.cs b/NzbDrone.Core.Test/MockLib.cs index 4713adb3a..cbd711fcb 100644 --- a/NzbDrone.Core.Test/MockLib.cs +++ b/NzbDrone.Core.Test/MockLib.cs @@ -52,9 +52,9 @@ namespace NzbDrone.Core.Test } } - public static IDiskProvider GetStandardDisk(int seasons, int episodes) + public static DiskProvider GetStandardDisk(int seasons, int episodes) { - var mock = new Mock(); + var mock = new Mock(); mock.Setup(c => c.GetDirectories(It.IsAny())).Returns(StandardSeries); mock.Setup(c => c.FolderExists(It.Is(d => StandardSeries.Contains(d)))).Returns(true); diff --git a/NzbDrone.Core/CentralDispatch.cs b/NzbDrone.Core/CentralDispatch.cs index 272ce1ab5..ab2adae1f 100644 --- a/NzbDrone.Core/CentralDispatch.cs +++ b/NzbDrone.Core/CentralDispatch.cs @@ -64,8 +64,8 @@ namespace NzbDrone.Core _kernel.Bind().ToSelf().InSingletonScope(); _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().ToSelf(); @@ -74,7 +74,7 @@ namespace NzbDrone.Core _kernel.Bind().ToSelf(); _kernel.Bind().To().InSingletonScope(); _kernel.Bind().To().InSingletonScope(); - _kernel.Bind().To().InSingletonScope(); + _kernel.Bind().ToSelf().InSingletonScope(); _kernel.Bind().ToSelf().InSingletonScope(); _kernel.Bind().ToSelf().InSingletonScope(); _kernel.Bind().To().InSingletonScope(); diff --git a/NzbDrone.Core/NzbDrone.Core.csproj b/NzbDrone.Core/NzbDrone.Core.csproj index b96de97d7..be0c778c6 100644 --- a/NzbDrone.Core/NzbDrone.Core.csproj +++ b/NzbDrone.Core/NzbDrone.Core.csproj @@ -183,7 +183,6 @@ - @@ -227,7 +226,6 @@ - diff --git a/NzbDrone.Core/Providers/Core/DiskProvider.cs b/NzbDrone.Core/Providers/Core/DiskProvider.cs index 4921ec98e..feb1daa71 100644 --- a/NzbDrone.Core/Providers/Core/DiskProvider.cs +++ b/NzbDrone.Core/Providers/Core/DiskProvider.cs @@ -3,48 +3,48 @@ using System.IO; namespace NzbDrone.Core.Providers.Core { - public class DiskProvider : IDiskProvider + public class DiskProvider { #region IDiskProvider Members - public bool FolderExists(string path) + public virtual bool FolderExists(string path) { return Directory.Exists(path); } - public bool FileExists(string path) + public virtual bool FileExists(string path) { return File.Exists(path); } - public string[] GetDirectories(string path) + public virtual string[] GetDirectories(string path) { return Directory.GetDirectories(path); } - public string[] GetFiles(string path, string pattern, SearchOption searchOption) + public virtual string[] GetFiles(string path, string pattern, SearchOption searchOption) { return Directory.GetFiles(path, pattern, searchOption); } - public long GetSize(string path) + public virtual long GetSize(string path) { var fi = new FileInfo(path); return fi.Length; //return new FileInfo(path).Length; } - public String CreateDirectory(string path) + public virtual String CreateDirectory(string path) { return Directory.CreateDirectory(path).FullName; } - public void DeleteFile(string path) + public virtual void DeleteFile(string path) { File.Delete(path); } - public void RenameFile(string sourcePath, string destinationPath) + public virtual void RenameFile(string sourcePath, string destinationPath) { File.Move(sourcePath, destinationPath); } diff --git a/NzbDrone.Core/Providers/Core/IDiskProvider.cs b/NzbDrone.Core/Providers/Core/IDiskProvider.cs deleted file mode 100644 index e0d115bc8..000000000 --- a/NzbDrone.Core/Providers/Core/IDiskProvider.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System; -using System.IO; - -namespace NzbDrone.Core.Providers.Core -{ - public interface IDiskProvider - { - bool FolderExists(string path); - string[] GetDirectories(string path); - String CreateDirectory(string path); - string[] GetFiles(string path, string pattern, SearchOption searchOption); - bool FileExists(string path); - long GetSize(string path); - void DeleteFile(string path); - void RenameFile(string sourcePath, string destinationPath); - } -} \ No newline at end of file diff --git a/NzbDrone.Core/Providers/IIndexerProvider.cs b/NzbDrone.Core/Providers/IIndexerProvider.cs deleted file mode 100644 index a13f8e4a5..000000000 --- a/NzbDrone.Core/Providers/IIndexerProvider.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 IIndexerProvider - { - List AllIndexers(); - List EnabledIndexers(); - void Update(Indexer indexer); - Indexer Single(int indexerId); - } -} diff --git a/NzbDrone.Core/Providers/IndexerProvider.cs b/NzbDrone.Core/Providers/IndexerProvider.cs index 4c1c036d8..d890e2ca3 100644 --- a/NzbDrone.Core/Providers/IndexerProvider.cs +++ b/NzbDrone.Core/Providers/IndexerProvider.cs @@ -11,7 +11,7 @@ using NzbDrone.Core.Repository; namespace NzbDrone.Core.Providers { - public class IndexerProvider : IIndexerProvider + public class IndexerProvider { private static readonly Logger Logger = LogManager.GetCurrentClassLogger(); private readonly IRepository _sonicRepo; @@ -23,24 +23,24 @@ namespace NzbDrone.Core.Providers _configProvider = configProvider; } - #region IIndexerProvider Members + #region IndexerProvider Members - public List AllIndexers() + public virtual List AllIndexers() { return _sonicRepo.All().OrderBy(i => i.Order).ToList(); } - public List EnabledIndexers() + public virtual List EnabledIndexers() { return _sonicRepo.All().Where(i => i.Enabled).OrderBy(i => i.Order).ToList(); } - public void Update(Indexer indexer) + public virtual void Update(Indexer indexer) { _sonicRepo.Update(indexer); } - public Indexer Single(int indexerId) + public virtual Indexer Single(int indexerId) { return _sonicRepo.Single(indexerId); } diff --git a/NzbDrone.Core/Providers/MediaFileProvider.cs b/NzbDrone.Core/Providers/MediaFileProvider.cs index 61659ea46..d6ee61e56 100644 --- a/NzbDrone.Core/Providers/MediaFileProvider.cs +++ b/NzbDrone.Core/Providers/MediaFileProvider.cs @@ -16,13 +16,13 @@ namespace NzbDrone.Core.Providers { private readonly IRepository _repository; private readonly IConfigProvider _configProvider; - private readonly IDiskProvider _diskProvider; + private readonly DiskProvider _diskProvider; private readonly IEpisodeProvider _episodeProvider; private static readonly Logger Logger = LogManager.GetCurrentClassLogger(); private static readonly string[] MediaExtentions = new[] { "*.mkv", "*.avi", "*.wmv" }; - public MediaFileProvider(IRepository repository, IConfigProvider configProvider, IDiskProvider diskProvider, IEpisodeProvider episodeProvider) + public MediaFileProvider(IRepository repository, IConfigProvider configProvider, DiskProvider diskProvider, IEpisodeProvider episodeProvider) { _repository = repository; _configProvider = configProvider; diff --git a/NzbDrone.Core/Providers/RenameProvider.cs b/NzbDrone.Core/Providers/RenameProvider.cs index 5ac36124c..95d7a8740 100644 --- a/NzbDrone.Core/Providers/RenameProvider.cs +++ b/NzbDrone.Core/Providers/RenameProvider.cs @@ -18,7 +18,7 @@ namespace NzbDrone.Core.Providers private readonly ISeasonProvider _seasonProvider; private readonly IEpisodeProvider _episodeProvider; private readonly IMediaFileProvider _mediaFileProvider; - private readonly IDiskProvider _diskProvider; + private readonly DiskProvider _diskProvider; private readonly IConfigProvider _configProvider; private readonly ExternalNotificationProvider _externalNotificationProvider; @@ -29,7 +29,7 @@ namespace NzbDrone.Core.Providers public RenameProvider(SeriesProvider seriesProvider, ISeasonProvider seasonProvider, IEpisodeProvider episodeProvider, IMediaFileProvider mediaFileProvider, - IDiskProvider diskProvider, IConfigProvider configProvider, + DiskProvider diskProvider, IConfigProvider configProvider, ExternalNotificationProvider extenalNotificationProvider) { _seriesProvider = seriesProvider; diff --git a/NzbDrone.Core/Providers/SyncProvider.cs b/NzbDrone.Core/Providers/SyncProvider.cs index 9808b88cb..0649e537e 100644 --- a/NzbDrone.Core/Providers/SyncProvider.cs +++ b/NzbDrone.Core/Providers/SyncProvider.cs @@ -17,7 +17,7 @@ namespace NzbDrone.Core.Providers private readonly IEpisodeProvider _episodeProvider; private readonly IMediaFileProvider _mediaFileProvider; private readonly NotificationProvider _notificationProvider; - private readonly IDiskProvider _diskProvider; + private readonly DiskProvider _diskProvider; private ProgressNotification _seriesSyncNotification; private Thread _seriesSyncThread; @@ -26,7 +26,7 @@ namespace NzbDrone.Core.Providers public SyncProvider(SeriesProvider seriesProvider, IEpisodeProvider episodeProvider, IMediaFileProvider mediaFileProvider, NotificationProvider notificationProvider, - IDiskProvider diskProvider) + DiskProvider diskProvider) { _seriesProvider = seriesProvider; _episodeProvider = episodeProvider; diff --git a/NzbDrone.Web/Controllers/SettingsController.cs b/NzbDrone.Web/Controllers/SettingsController.cs index edbdecc8a..1c74ee26b 100644 --- a/NzbDrone.Web/Controllers/SettingsController.cs +++ b/NzbDrone.Web/Controllers/SettingsController.cs @@ -20,7 +20,7 @@ namespace NzbDrone.Web.Controllers public class SettingsController : Controller { private IConfigProvider _configProvider; - private IIndexerProvider _indexerProvider; + private IndexerProvider _indexerProvider; private QualityProvider _qualityProvider; private RootDirProvider _rootDirProvider; @@ -28,7 +28,7 @@ namespace NzbDrone.Web.Controllers 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, + public SettingsController(IConfigProvider configProvider, IndexerProvider indexerProvider, QualityProvider qualityProvider, RootDirProvider rootDirProvider) { _configProvider = configProvider;