From 2c42fc19e594682f4a1a2b8053c76fe309b2ef64 Mon Sep 17 00:00:00 2001 From: Qstick Date: Sun, 27 Aug 2017 20:32:26 -0400 Subject: [PATCH] Rename Drone Factory Config Keys (#70) * Rename Drone Factory Config Keys --- .../Config/DownloadClientConfigModule.cs | 4 ++-- .../Config/DownloadClientConfigResource.cs | 10 +++++----- .../DiskSpace/DiskSpaceServiceFixture.cs | 4 ++-- .../CompletedDownloadServiceFixture.cs | 2 +- .../PneumaticProviderFixture.cs | 2 +- .../Checks/DroneFactoryCheckFixture.cs | 2 +- .../Checks/ImportMechanismCheckFixture.cs | 2 +- ...DownloadedEpisodesCommandServiceFixture.cs | 2 +- .../RootFolderServiceFixture.cs | 2 +- .../Configuration/ConfigService.cs | 16 +++++++-------- .../Configuration/IConfigService.cs | 4 ++-- .../115_change_drone_factory_variable_name.cs | 20 +++++++++++++++++++ .../DiskSpace/DiskSpaceService.cs | 4 ++-- .../Download/Clients/Pneumatic/Pneumatic.cs | 2 +- .../Download/CompletedDownloadService.cs | 2 +- .../HealthCheck/Checks/DroneFactoryCheck.cs | 2 +- .../Checks/ImportMechanismCheck.cs | 2 +- src/NzbDrone.Core/Jobs/TaskManager.cs | 10 ++++------ .../DownloadedEpisodesCommandService.cs | 10 +++++----- src/NzbDrone.Core/NzbDrone.Core.csproj | 1 + .../RootFolders/RootFolderService.cs | 2 +- .../Validation/Paths/DroneFactoryValidator.cs | 2 +- .../DroneFactory/DroneFactoryViewTemplate.hbs | 8 ++++---- 23 files changed, 67 insertions(+), 48 deletions(-) create mode 100644 src/NzbDrone.Core/Datastore/Migration/115_change_drone_factory_variable_name.cs diff --git a/src/NzbDrone.Api/Config/DownloadClientConfigModule.cs b/src/NzbDrone.Api/Config/DownloadClientConfigModule.cs index de478235eb..c504ffe08e 100644 --- a/src/NzbDrone.Api/Config/DownloadClientConfigModule.cs +++ b/src/NzbDrone.Api/Config/DownloadClientConfigModule.cs @@ -12,13 +12,13 @@ public DownloadClientConfigModule(IConfigService configService, MappedNetworkDriveValidator mappedNetworkDriveValidator) : base(configService) { - SharedValidator.RuleFor(c => c.DownloadedEpisodesFolder) + SharedValidator.RuleFor(c => c.DownloadedAlbumsFolder) .Cascade(CascadeMode.StopOnFirstFailure) .IsValidPath() .SetValidator(rootFolderValidator) .SetValidator(mappedNetworkDriveValidator) .SetValidator(pathExistsValidator) - .When(c => !string.IsNullOrWhiteSpace(c.DownloadedEpisodesFolder)); + .When(c => !string.IsNullOrWhiteSpace(c.DownloadedAlbumsFolder)); } protected override DownloadClientConfigResource ToResource(IConfigService model) diff --git a/src/NzbDrone.Api/Config/DownloadClientConfigResource.cs b/src/NzbDrone.Api/Config/DownloadClientConfigResource.cs index 8309c9f4df..b9930ad0d4 100644 --- a/src/NzbDrone.Api/Config/DownloadClientConfigResource.cs +++ b/src/NzbDrone.Api/Config/DownloadClientConfigResource.cs @@ -1,13 +1,13 @@ -using NzbDrone.Api.REST; +using NzbDrone.Api.REST; using NzbDrone.Core.Configuration; namespace NzbDrone.Api.Config { public class DownloadClientConfigResource : RestResource { - public string DownloadedEpisodesFolder { get; set; } + public string DownloadedAlbumsFolder { get; set; } public string DownloadClientWorkingFolders { get; set; } - public int DownloadedEpisodesScanInterval { get; set; } + public int DownloadedAlbumsScanInterval { get; set; } public bool EnableCompletedDownloadHandling { get; set; } public bool RemoveCompletedDownloads { get; set; } @@ -22,9 +22,9 @@ public static DownloadClientConfigResource ToResource(IConfigService model) { return new DownloadClientConfigResource { - DownloadedEpisodesFolder = model.DownloadedEpisodesFolder, + DownloadedAlbumsFolder = model.DownloadedAlbumsFolder, DownloadClientWorkingFolders = model.DownloadClientWorkingFolders, - DownloadedEpisodesScanInterval = model.DownloadedEpisodesScanInterval, + DownloadedAlbumsScanInterval = model.DownloadedAlbumsScanInterval, EnableCompletedDownloadHandling = model.EnableCompletedDownloadHandling, RemoveCompletedDownloads = model.RemoveCompletedDownloads, diff --git a/src/NzbDrone.Core.Test/DiskSpace/DiskSpaceServiceFixture.cs b/src/NzbDrone.Core.Test/DiskSpace/DiskSpaceServiceFixture.cs index d7650c2048..e92dba2ad0 100644 --- a/src/NzbDrone.Core.Test/DiskSpace/DiskSpaceServiceFixture.cs +++ b/src/NzbDrone.Core.Test/DiskSpace/DiskSpaceServiceFixture.cs @@ -106,7 +106,7 @@ public void should_not_check_diskspace_for_missing_series_folders() public void should_check_diskspace_for_dronefactory_folder() { Mocker.GetMock() - .SetupGet(v => v.DownloadedEpisodesFolder) + .SetupGet(v => v.DownloadedAlbumsFolder) .Returns(_droneFactoryFolder); GivenExistingFolder(_droneFactoryFolder); @@ -120,7 +120,7 @@ public void should_check_diskspace_for_dronefactory_folder() public void should_not_check_diskspace_for_missing_dronefactory_folder() { Mocker.GetMock() - .SetupGet(v => v.DownloadedEpisodesFolder) + .SetupGet(v => v.DownloadedAlbumsFolder) .Returns(_droneFactoryFolder); var freeSpace = Subject.GetFreeSpace(); diff --git a/src/NzbDrone.Core.Test/Download/CompletedDownloadServiceFixture.cs b/src/NzbDrone.Core.Test/Download/CompletedDownloadServiceFixture.cs index 79f71fe67e..37ff6416c6 100644 --- a/src/NzbDrone.Core.Test/Download/CompletedDownloadServiceFixture.cs +++ b/src/NzbDrone.Core.Test/Download/CompletedDownloadServiceFixture.cs @@ -157,7 +157,7 @@ public void should_process_if_matching_history_is_not_found_but_category_specifi public void should_not_process_if_storage_directory_in_drone_factory() { Mocker.GetMock() - .SetupGet(v => v.DownloadedEpisodesFolder) + .SetupGet(v => v.DownloadedAlbumsFolder) .Returns(@"C:\DropFolder".AsOsAgnostic()); _trackedDownload.DownloadItem.OutputPath = new OsPath(@"C:\DropFolder\SomeOtherFolder".AsOsAgnostic()); diff --git a/src/NzbDrone.Core.Test/Download/DownloadClientTests/PneumaticProviderFixture.cs b/src/NzbDrone.Core.Test/Download/DownloadClientTests/PneumaticProviderFixture.cs index d9b9c2b526..a27cfc6b4a 100644 --- a/src/NzbDrone.Core.Test/Download/DownloadClientTests/PneumaticProviderFixture.cs +++ b/src/NzbDrone.Core.Test/Download/DownloadClientTests/PneumaticProviderFixture.cs @@ -31,7 +31,7 @@ public void Setup() _nzbPath = Path.Combine(_pneumaticFolder, _title + ".nzb").AsOsAgnostic(); _sabDrop = @"d:\unsorted tv\".AsOsAgnostic(); - Mocker.GetMock().SetupGet(c => c.DownloadedEpisodesFolder).Returns(_sabDrop); + Mocker.GetMock().SetupGet(c => c.DownloadedAlbumsFolder).Returns(_sabDrop); _remoteEpisode = new RemoteAlbum(); _remoteEpisode.Release = new ReleaseInfo(); diff --git a/src/NzbDrone.Core.Test/HealthCheck/Checks/DroneFactoryCheckFixture.cs b/src/NzbDrone.Core.Test/HealthCheck/Checks/DroneFactoryCheckFixture.cs index fbde84eb4c..8f1224ad51 100644 --- a/src/NzbDrone.Core.Test/HealthCheck/Checks/DroneFactoryCheckFixture.cs +++ b/src/NzbDrone.Core.Test/HealthCheck/Checks/DroneFactoryCheckFixture.cs @@ -15,7 +15,7 @@ public class DroneFactoryCheckFixture : CoreTest private void GivenDroneFactoryFolder(bool exists = false, bool writable = true) { Mocker.GetMock() - .SetupGet(s => s.DownloadedEpisodesFolder) + .SetupGet(s => s.DownloadedAlbumsFolder) .Returns(DRONE_FACTORY_FOLDER); Mocker.GetMock() diff --git a/src/NzbDrone.Core.Test/HealthCheck/Checks/ImportMechanismCheckFixture.cs b/src/NzbDrone.Core.Test/HealthCheck/Checks/ImportMechanismCheckFixture.cs index 5f0f3d9a07..49be9e4355 100644 --- a/src/NzbDrone.Core.Test/HealthCheck/Checks/ImportMechanismCheckFixture.cs +++ b/src/NzbDrone.Core.Test/HealthCheck/Checks/ImportMechanismCheckFixture.cs @@ -30,7 +30,7 @@ private void GivenCompletedDownloadHandling(bool? enabled = null) private void GivenDroneFactoryFolder(bool exists = false) { Mocker.GetMock() - .SetupGet(s => s.DownloadedEpisodesFolder) + .SetupGet(s => s.DownloadedAlbumsFolder) .Returns(DRONE_FACTORY_FOLDER.AsOsAgnostic()); Mocker.GetMock() diff --git a/src/NzbDrone.Core.Test/MediaFiles/DownloadedEpisodesCommandServiceFixture.cs b/src/NzbDrone.Core.Test/MediaFiles/DownloadedEpisodesCommandServiceFixture.cs index c0ebcf15b9..f5c2b1e7be 100644 --- a/src/NzbDrone.Core.Test/MediaFiles/DownloadedEpisodesCommandServiceFixture.cs +++ b/src/NzbDrone.Core.Test/MediaFiles/DownloadedEpisodesCommandServiceFixture.cs @@ -30,7 +30,7 @@ public class DownloadedEpisodesCommandServiceFixture : CoreTest().SetupGet(c => c.DownloadedEpisodesFolder) + Mocker.GetMock().SetupGet(c => c.DownloadedAlbumsFolder) .Returns(_droneFactory); Mocker.GetMock() diff --git a/src/NzbDrone.Core.Test/RootFolderTests/RootFolderServiceFixture.cs b/src/NzbDrone.Core.Test/RootFolderTests/RootFolderServiceFixture.cs index 1f09c26d01..9f932bca53 100644 --- a/src/NzbDrone.Core.Test/RootFolderTests/RootFolderServiceFixture.cs +++ b/src/NzbDrone.Core.Test/RootFolderTests/RootFolderServiceFixture.cs @@ -102,7 +102,7 @@ public void should_throw_when_same_path_as_drone_factory() var path = @"C:\TV".AsOsAgnostic(); Mocker.GetMock() - .SetupGet(s => s.DownloadedEpisodesFolder) + .SetupGet(s => s.DownloadedAlbumsFolder) .Returns(path); Assert.Throws(() => Subject.Add(new RootFolder { Path = path })); diff --git a/src/NzbDrone.Core/Configuration/ConfigService.cs b/src/NzbDrone.Core/Configuration/ConfigService.cs index 2ff500fa9e..85d4c42155 100644 --- a/src/NzbDrone.Core/Configuration/ConfigService.cs +++ b/src/NzbDrone.Core/Configuration/ConfigService.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Globalization; using System.Linq; @@ -14,7 +14,7 @@ namespace NzbDrone.Core.Configuration { public enum ConfigKey { - DownloadedEpisodesFolder + DownloadedAlbumsFolder } public class ConfigService : IConfigService @@ -74,11 +74,11 @@ public bool IsDefined(string key) return _repository.Get(key.ToLower()) != null; } - public string DownloadedEpisodesFolder + public string DownloadedAlbumsFolder { - get { return GetValue(ConfigKey.DownloadedEpisodesFolder.ToString()); } + get { return GetValue(ConfigKey.DownloadedAlbumsFolder.ToString()); } - set { SetValue(ConfigKey.DownloadedEpisodesFolder.ToString(), value); } + set { SetValue(ConfigKey.DownloadedAlbumsFolder.ToString(), value); } } public bool AutoUnmonitorPreviouslyDownloadedTracks @@ -168,11 +168,11 @@ public string DownloadClientWorkingFolders set { SetValue("DownloadClientWorkingFolders", value); } } - public int DownloadedEpisodesScanInterval + public int DownloadedAlbumsScanInterval { - get { return GetValueInt("DownloadedEpisodesScanInterval", 1); } + get { return GetValueInt("DownloadedAlbumsScanInterval", 1); } - set { SetValue("DownloadedEpisodesScanInterval", value); } + set { SetValue("DownloadedAlbumsScanInterval", value); } } public int DownloadClientHistoryLimit diff --git a/src/NzbDrone.Core/Configuration/IConfigService.cs b/src/NzbDrone.Core/Configuration/IConfigService.cs index 27f763d1e8..6ceab7c723 100644 --- a/src/NzbDrone.Core/Configuration/IConfigService.cs +++ b/src/NzbDrone.Core/Configuration/IConfigService.cs @@ -11,9 +11,9 @@ public interface IConfigService bool IsDefined(string key); //Download Client - string DownloadedEpisodesFolder { get; set; } + string DownloadedAlbumsFolder { get; set; } string DownloadClientWorkingFolders { get; set; } - int DownloadedEpisodesScanInterval { get; set; } + int DownloadedAlbumsScanInterval { get; set; } int DownloadClientHistoryLimit { get; set; } //Completed/Failed Download Handling (Download client) diff --git a/src/NzbDrone.Core/Datastore/Migration/115_change_drone_factory_variable_name.cs b/src/NzbDrone.Core/Datastore/Migration/115_change_drone_factory_variable_name.cs new file mode 100644 index 0000000000..cb625ccdc9 --- /dev/null +++ b/src/NzbDrone.Core/Datastore/Migration/115_change_drone_factory_variable_name.cs @@ -0,0 +1,20 @@ +using FluentMigrator; +using NzbDrone.Core.Datastore.Migration.Framework; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace NzbDrone.Core.Datastore.Migration +{ + [Migration(115)] + public class change_drone_factory_variable_name : NzbDroneMigrationBase + { + protected override void MainDbUpgrade() + { + Execute.Sql("DELETE FROM Config WHERE [Key] = 'downloadedepisodesfolder'"); + Execute.Sql("DELETE FROM Config WHERE [Key] = 'downloadedepisodesscaninterval'"); + } + + } +} diff --git a/src/NzbDrone.Core/DiskSpace/DiskSpaceService.cs b/src/NzbDrone.Core/DiskSpace/DiskSpaceService.cs index edc6415336..408839f880 100644 --- a/src/NzbDrone.Core/DiskSpace/DiskSpaceService.cs +++ b/src/NzbDrone.Core/DiskSpace/DiskSpaceService.cs @@ -52,9 +52,9 @@ private IEnumerable GetSeriesFreeSpace() private IEnumerable GetDroneFactoryFreeSpace() { - if (_configService.DownloadedEpisodesFolder.IsNotNullOrWhiteSpace() && _diskProvider.FolderExists(_configService.DownloadedEpisodesFolder)) + if (_configService.DownloadedAlbumsFolder.IsNotNullOrWhiteSpace() && _diskProvider.FolderExists(_configService.DownloadedAlbumsFolder)) { - return GetDiskSpace(new[] { _diskProvider.GetPathRoot(_configService.DownloadedEpisodesFolder) }); + return GetDiskSpace(new[] { _diskProvider.GetPathRoot(_configService.DownloadedAlbumsFolder) }); } return new List(); diff --git a/src/NzbDrone.Core/Download/Clients/Pneumatic/Pneumatic.cs b/src/NzbDrone.Core/Download/Clients/Pneumatic/Pneumatic.cs index 8337fac9be..32fad0d99a 100644 --- a/src/NzbDrone.Core/Download/Clients/Pneumatic/Pneumatic.cs +++ b/src/NzbDrone.Core/Download/Clients/Pneumatic/Pneumatic.cs @@ -117,7 +117,7 @@ private string WriteStrmFile(string title, string nzbFile) if (Settings.StrmFolder.IsNullOrWhiteSpace()) { - folder = _configService.DownloadedEpisodesFolder; + folder = _configService.DownloadedAlbumsFolder; if (folder.IsNullOrWhiteSpace()) { diff --git a/src/NzbDrone.Core/Download/CompletedDownloadService.cs b/src/NzbDrone.Core/Download/CompletedDownloadService.cs index 2e4589ecb4..841da6ae17 100644 --- a/src/NzbDrone.Core/Download/CompletedDownloadService.cs +++ b/src/NzbDrone.Core/Download/CompletedDownloadService.cs @@ -81,7 +81,7 @@ public void Process(TrackedDownload trackedDownload, bool ignoreWarnings = false return; } - var downloadedEpisodesFolder = new OsPath(_configService.DownloadedEpisodesFolder); + var downloadedEpisodesFolder = new OsPath(_configService.DownloadedAlbumsFolder); if (downloadedEpisodesFolder.Contains(downloadItemOutputPath)) { diff --git a/src/NzbDrone.Core/HealthCheck/Checks/DroneFactoryCheck.cs b/src/NzbDrone.Core/HealthCheck/Checks/DroneFactoryCheck.cs index ffae0b4f6e..af78455fd4 100644 --- a/src/NzbDrone.Core/HealthCheck/Checks/DroneFactoryCheck.cs +++ b/src/NzbDrone.Core/HealthCheck/Checks/DroneFactoryCheck.cs @@ -17,7 +17,7 @@ public DroneFactoryCheck(IConfigService configService, IDiskProvider diskProvide public override HealthCheck Check() { - var droneFactoryFolder = _configService.DownloadedEpisodesFolder; + var droneFactoryFolder = _configService.DownloadedAlbumsFolder; if (droneFactoryFolder.IsNullOrWhiteSpace()) { diff --git a/src/NzbDrone.Core/HealthCheck/Checks/ImportMechanismCheck.cs b/src/NzbDrone.Core/HealthCheck/Checks/ImportMechanismCheck.cs index ec35653c78..233144a8b1 100644 --- a/src/NzbDrone.Core/HealthCheck/Checks/ImportMechanismCheck.cs +++ b/src/NzbDrone.Core/HealthCheck/Checks/ImportMechanismCheck.cs @@ -24,7 +24,7 @@ public ImportMechanismCheck(IConfigService configService, IProvideDownloadClient public override HealthCheck Check() { - var droneFactoryFolder = new OsPath(_configService.DownloadedEpisodesFolder); + var droneFactoryFolder = new OsPath(_configService.DownloadedAlbumsFolder); List downloadClients; try diff --git a/src/NzbDrone.Core/Jobs/TaskManager.cs b/src/NzbDrone.Core/Jobs/TaskManager.cs index d791fa1368..4ae9965c4c 100644 --- a/src/NzbDrone.Core/Jobs/TaskManager.cs +++ b/src/NzbDrone.Core/Jobs/TaskManager.cs @@ -65,10 +65,8 @@ public void Handle(ApplicationStartedEvent message) new ScheduledTask{ Interval = 1, TypeName = typeof(CheckForFinishedDownloadCommand).FullName}, new ScheduledTask{ Interval = 5, TypeName = typeof(MessagingCleanupCommand).FullName}, new ScheduledTask{ Interval = 6*60, TypeName = typeof(ApplicationUpdateCommand).FullName}, - //new ScheduledTask{ Interval = 3*60, TypeName = typeof(UpdateSceneMappingCommand).FullName}, new ScheduledTask{ Interval = 6*60, TypeName = typeof(CheckHealthCommand).FullName}, new ScheduledTask{ Interval = 12*60, TypeName = typeof(RefreshArtistCommand).FullName}, - //new ScheduledTask{ Interval = 12*60, TypeName = typeof(RefreshSeriesCommand).FullName}, // TODO: Remove new ScheduledTask{ Interval = 24*60, TypeName = typeof(HousekeepingCommand).FullName}, new ScheduledTask{ Interval = 7*24*60, TypeName = typeof(BackupCommand).FullName}, @@ -80,7 +78,7 @@ public void Handle(ApplicationStartedEvent message) new ScheduledTask { - Interval = _configService.DownloadedEpisodesScanInterval, + Interval = _configService.DownloadedAlbumsScanInterval, TypeName = typeof(DownloadedEpisodesScanCommand).FullName }, }; @@ -146,10 +144,10 @@ public void HandleAsync(ConfigSavedEvent message) var rss = _scheduledTaskRepository.GetDefinition(typeof(RssSyncCommand)); rss.Interval = _configService.RssSyncInterval; - var downloadedEpisodes = _scheduledTaskRepository.GetDefinition(typeof(DownloadedEpisodesScanCommand)); - downloadedEpisodes.Interval = _configService.DownloadedEpisodesScanInterval; + var downloadedAlbums = _scheduledTaskRepository.GetDefinition(typeof(DownloadedEpisodesScanCommand)); + downloadedAlbums.Interval = _configService.DownloadedAlbumsScanInterval; - _scheduledTaskRepository.UpdateMany(new List { rss, downloadedEpisodes }); + _scheduledTaskRepository.UpdateMany(new List { rss, downloadedAlbums }); } } } diff --git a/src/NzbDrone.Core/MediaFiles/DownloadedEpisodesCommandService.cs b/src/NzbDrone.Core/MediaFiles/DownloadedEpisodesCommandService.cs index f3ded84b23..f1d7bf712a 100644 --- a/src/NzbDrone.Core/MediaFiles/DownloadedEpisodesCommandService.cs +++ b/src/NzbDrone.Core/MediaFiles/DownloadedEpisodesCommandService.cs @@ -36,21 +36,21 @@ public DownloadedEpisodesCommandService(IDownloadedEpisodesImportService downloa private List ProcessDroneFactoryFolder() { - var downloadedEpisodesFolder = _configService.DownloadedEpisodesFolder; + var downloadedAlbumsFolder = _configService.DownloadedAlbumsFolder; - if (string.IsNullOrEmpty(downloadedEpisodesFolder)) + if (string.IsNullOrEmpty(downloadedAlbumsFolder)) { _logger.Trace("Drone Factory folder is not configured"); return new List(); } - if (!_diskProvider.FolderExists(downloadedEpisodesFolder)) + if (!_diskProvider.FolderExists(downloadedAlbumsFolder)) { - _logger.Warn("Drone Factory folder [{0}] doesn't exist.", downloadedEpisodesFolder); + _logger.Warn("Drone Factory folder [{0}] doesn't exist.", downloadedAlbumsFolder); return new List(); } - return _downloadedEpisodesImportService.ProcessRootFolder(new DirectoryInfo(downloadedEpisodesFolder)); + return _downloadedEpisodesImportService.ProcessRootFolder(new DirectoryInfo(downloadedAlbumsFolder)); } private List ProcessPath(DownloadedEpisodesScanCommand message) diff --git a/src/NzbDrone.Core/NzbDrone.Core.csproj b/src/NzbDrone.Core/NzbDrone.Core.csproj index 2c57e6d525..eeb8d20855 100644 --- a/src/NzbDrone.Core/NzbDrone.Core.csproj +++ b/src/NzbDrone.Core/NzbDrone.Core.csproj @@ -295,6 +295,7 @@ Code + diff --git a/src/NzbDrone.Core/RootFolders/RootFolderService.cs b/src/NzbDrone.Core/RootFolders/RootFolderService.cs index fcccb005c1..84bb9f472f 100644 --- a/src/NzbDrone.Core/RootFolders/RootFolderService.cs +++ b/src/NzbDrone.Core/RootFolders/RootFolderService.cs @@ -107,7 +107,7 @@ public RootFolder Add(RootFolder rootFolder) throw new InvalidOperationException("Recent directory already exists."); } - if (_configService.DownloadedEpisodesFolder.IsNotNullOrWhiteSpace() && _configService.DownloadedEpisodesFolder.PathEquals(rootFolder.Path)) + if (_configService.DownloadedAlbumsFolder.IsNotNullOrWhiteSpace() && _configService.DownloadedAlbumsFolder.PathEquals(rootFolder.Path)) { throw new InvalidOperationException("Drone Factory folder cannot be used."); } diff --git a/src/NzbDrone.Core/Validation/Paths/DroneFactoryValidator.cs b/src/NzbDrone.Core/Validation/Paths/DroneFactoryValidator.cs index cc2aec19c0..7637b74d2d 100644 --- a/src/NzbDrone.Core/Validation/Paths/DroneFactoryValidator.cs +++ b/src/NzbDrone.Core/Validation/Paths/DroneFactoryValidator.cs @@ -18,7 +18,7 @@ protected override bool IsValid(PropertyValidatorContext context) { if (context.PropertyValue == null) return false; - var droneFactory = _configService.DownloadedEpisodesFolder; + var droneFactory = _configService.DownloadedAlbumsFolder; if (string.IsNullOrWhiteSpace(droneFactory)) return true; diff --git a/src/UI/Settings/DownloadClient/DroneFactory/DroneFactoryViewTemplate.hbs b/src/UI/Settings/DownloadClient/DroneFactory/DroneFactoryViewTemplate.hbs index f500886e7c..c0385cd43f 100644 --- a/src/UI/Settings/DownloadClient/DroneFactory/DroneFactoryViewTemplate.hbs +++ b/src/UI/Settings/DownloadClient/DroneFactory/DroneFactoryViewTemplate.hbs @@ -5,12 +5,12 @@
- +
- +
@@ -19,11 +19,11 @@
- +
- +
\ No newline at end of file