From e405cc9cf0a50cee40479ec9ecaf6a7482b03db1 Mon Sep 17 00:00:00 2001 From: Qstick Date: Sun, 27 Aug 2017 21:21:51 -0400 Subject: [PATCH] Rename DownloadedEpisodesScan to DownloadedAlbumsScan (#71) * Rename DownloadedEpisodesScan to DownloadedAlbumsScan * Rename Command Service --- ... DownloadedAlbumsCommandServiceFixture.cs} | 23 +++++++++---------- .../CommandEqualityComparerFixture.cs | 4 ++-- .../NzbDrone.Core.Test.csproj | 2 +- src/NzbDrone.Core/Jobs/TaskManager.cs | 4 ++-- ...mand.cs => DownloadedAlbumsScanCommand.cs} | 3 +-- ...e.cs => DownloadedAlbumsCommandService.cs} | 11 ++++----- src/NzbDrone.Core/NzbDrone.Core.csproj | 4 ++-- src/UI/ManualImport/ManualImportLayout.js | 4 ++-- src/UI/Wanted/Missing/MissingLayout.js | 2 +- 9 files changed, 27 insertions(+), 30 deletions(-) rename src/NzbDrone.Core.Test/MediaFiles/{DownloadedEpisodesCommandServiceFixture.cs => DownloadedAlbumsCommandServiceFixture.cs} (84%) rename src/NzbDrone.Core/MediaFiles/Commands/{DownloadedEpisodesScanCommand.cs => DownloadedAlbumsScanCommand.cs} (81%) rename src/NzbDrone.Core/MediaFiles/{DownloadedEpisodesCommandService.cs => DownloadedAlbumsCommandService.cs} (90%) diff --git a/src/NzbDrone.Core.Test/MediaFiles/DownloadedEpisodesCommandServiceFixture.cs b/src/NzbDrone.Core.Test/MediaFiles/DownloadedAlbumsCommandServiceFixture.cs similarity index 84% rename from src/NzbDrone.Core.Test/MediaFiles/DownloadedEpisodesCommandServiceFixture.cs rename to src/NzbDrone.Core.Test/MediaFiles/DownloadedAlbumsCommandServiceFixture.cs index f5c2b1e7b..0bb230743 100644 --- a/src/NzbDrone.Core.Test/MediaFiles/DownloadedEpisodesCommandServiceFixture.cs +++ b/src/NzbDrone.Core.Test/MediaFiles/DownloadedAlbumsCommandServiceFixture.cs @@ -1,4 +1,4 @@ -using System.Collections.Generic; +using System.Collections.Generic; using System.IO; using FizzWare.NBuilder; using Moq; @@ -9,7 +9,6 @@ using NzbDrone.Core.Download; using NzbDrone.Core.Download.TrackedDownloads; using NzbDrone.Core.MediaFiles; using NzbDrone.Core.MediaFiles.Commands; -using NzbDrone.Core.MediaFiles.EpisodeImport; using NzbDrone.Core.MediaFiles.TrackImport; using NzbDrone.Core.Parser.Model; using NzbDrone.Core.Test.Framework; @@ -19,7 +18,7 @@ using NzbDrone.Test.Common; namespace NzbDrone.Core.Test.MediaFiles { [TestFixture] - public class DownloadedEpisodesCommandServiceFixture : CoreTest + public class DownloadedAlbumsCommandServiceFixture : CoreTest { private string _droneFactory = "c:\\drop\\".AsOsAgnostic(); private string _downloadFolder = "c:\\drop_other\\Show.S01E01\\".AsOsAgnostic(); @@ -82,7 +81,7 @@ namespace NzbDrone.Core.Test.MediaFiles { GivenExistingFolder(_droneFactory); - Subject.Execute(new DownloadedEpisodesScanCommand()); + Subject.Execute(new DownloadedAlbumsScanCommand()); Mocker.GetMock().Verify(c => c.ProcessRootFolder(It.IsAny()), Times.Once()); } @@ -90,7 +89,7 @@ namespace NzbDrone.Core.Test.MediaFiles [Test] public void should_skip_import_if_dronefactory_doesnt_exist() { - Subject.Execute(new DownloadedEpisodesScanCommand()); + Subject.Execute(new DownloadedAlbumsScanCommand()); Mocker.GetMock().Verify(c => c.ProcessRootFolder(It.IsAny()), Times.Never()); @@ -102,7 +101,7 @@ namespace NzbDrone.Core.Test.MediaFiles { GivenExistingFolder(_droneFactory); - Subject.Execute(new DownloadedEpisodesScanCommand() { DownloadClientId = "sab1" }); + Subject.Execute(new DownloadedAlbumsScanCommand() { DownloadClientId = "sab1" }); Mocker.GetMock().Verify(c => c.ProcessRootFolder(It.IsAny()), Times.Once()); } @@ -112,7 +111,7 @@ namespace NzbDrone.Core.Test.MediaFiles { GivenExistingFolder(_downloadFolder); - Subject.Execute(new DownloadedEpisodesScanCommand() { Path = _downloadFolder }); + Subject.Execute(new DownloadedAlbumsScanCommand() { Path = _downloadFolder }); Mocker.GetMock().Verify(c => c.ProcessPath(It.IsAny(), ImportMode.Auto, null, null), Times.Once()); } @@ -122,7 +121,7 @@ namespace NzbDrone.Core.Test.MediaFiles { GivenExistingFile(_downloadFile); - Subject.Execute(new DownloadedEpisodesScanCommand() { Path = _downloadFile }); + Subject.Execute(new DownloadedAlbumsScanCommand() { Path = _downloadFile }); Mocker.GetMock().Verify(c => c.ProcessPath(It.IsAny(), ImportMode.Auto, null, null), Times.Once()); } @@ -133,7 +132,7 @@ namespace NzbDrone.Core.Test.MediaFiles GivenExistingFolder(_downloadFolder); GivenValidQueueItem(); - Subject.Execute(new DownloadedEpisodesScanCommand() { Path = _downloadFolder, DownloadClientId = "sab1" }); + Subject.Execute(new DownloadedAlbumsScanCommand() { Path = _downloadFolder, DownloadClientId = "sab1" }); Mocker.GetMock().Verify(c => c.ProcessPath(_downloadFolder, ImportMode.Auto, _trackedDownload.RemoteEpisode.Series, _trackedDownload.DownloadItem), Times.Once()); } @@ -143,7 +142,7 @@ namespace NzbDrone.Core.Test.MediaFiles { GivenExistingFolder(_downloadFolder); - Subject.Execute(new DownloadedEpisodesScanCommand() { Path = _downloadFolder, DownloadClientId = "sab1" }); + Subject.Execute(new DownloadedAlbumsScanCommand() { Path = _downloadFolder, DownloadClientId = "sab1" }); Mocker.GetMock().Verify(c => c.ProcessPath(_downloadFolder, ImportMode.Auto, null, null), Times.Once()); @@ -153,7 +152,7 @@ namespace NzbDrone.Core.Test.MediaFiles [Test] public void should_warn_if_neither_folder_or_file_exists() { - Subject.Execute(new DownloadedEpisodesScanCommand() { Path = _downloadFolder }); + Subject.Execute(new DownloadedAlbumsScanCommand() { Path = _downloadFolder }); Mocker.GetMock().Verify(c => c.ProcessPath(It.IsAny(), ImportMode.Auto, null, null), Times.Never()); @@ -165,7 +164,7 @@ namespace NzbDrone.Core.Test.MediaFiles { GivenExistingFile(_downloadFile); - Subject.Execute(new DownloadedEpisodesScanCommand() { Path = _downloadFile, ImportMode = ImportMode.Copy }); + Subject.Execute(new DownloadedAlbumsScanCommand() { Path = _downloadFile, ImportMode = ImportMode.Copy }); Mocker.GetMock().Verify(c => c.ProcessPath(It.IsAny(), ImportMode.Copy, null, null), Times.Once()); } diff --git a/src/NzbDrone.Core.Test/Messaging/Commands/CommandEqualityComparerFixture.cs b/src/NzbDrone.Core.Test/Messaging/Commands/CommandEqualityComparerFixture.cs index 61069fc98..b059b5678 100644 --- a/src/NzbDrone.Core.Test/Messaging/Commands/CommandEqualityComparerFixture.cs +++ b/src/NzbDrone.Core.Test/Messaging/Commands/CommandEqualityComparerFixture.cs @@ -15,8 +15,8 @@ namespace NzbDrone.Core.Test.Messaging.Commands [Test] public void should_return_true_when_there_are_no_properties() { - var command1 = new DownloadedEpisodesScanCommand(); - var command2 = new DownloadedEpisodesScanCommand(); + var command1 = new DownloadedAlbumsScanCommand(); + var command2 = new DownloadedAlbumsScanCommand(); CommandEqualityComparer.Instance.Equals(command1, command2).Should().BeTrue(); } diff --git a/src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj b/src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj index f6aef2b27..dcc0e6b13 100644 --- a/src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj +++ b/src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj @@ -278,7 +278,7 @@ - + diff --git a/src/NzbDrone.Core/Jobs/TaskManager.cs b/src/NzbDrone.Core/Jobs/TaskManager.cs index 4ae9965c4..646f9a249 100644 --- a/src/NzbDrone.Core/Jobs/TaskManager.cs +++ b/src/NzbDrone.Core/Jobs/TaskManager.cs @@ -79,7 +79,7 @@ namespace NzbDrone.Core.Jobs new ScheduledTask { Interval = _configService.DownloadedAlbumsScanInterval, - TypeName = typeof(DownloadedEpisodesScanCommand).FullName + TypeName = typeof(DownloadedAlbumsScanCommand).FullName }, }; @@ -144,7 +144,7 @@ namespace NzbDrone.Core.Jobs var rss = _scheduledTaskRepository.GetDefinition(typeof(RssSyncCommand)); rss.Interval = _configService.RssSyncInterval; - var downloadedAlbums = _scheduledTaskRepository.GetDefinition(typeof(DownloadedEpisodesScanCommand)); + var downloadedAlbums = _scheduledTaskRepository.GetDefinition(typeof(DownloadedAlbumsScanCommand)); downloadedAlbums.Interval = _configService.DownloadedAlbumsScanInterval; _scheduledTaskRepository.UpdateMany(new List { rss, downloadedAlbums }); diff --git a/src/NzbDrone.Core/MediaFiles/Commands/DownloadedEpisodesScanCommand.cs b/src/NzbDrone.Core/MediaFiles/Commands/DownloadedAlbumsScanCommand.cs similarity index 81% rename from src/NzbDrone.Core/MediaFiles/Commands/DownloadedEpisodesScanCommand.cs rename to src/NzbDrone.Core/MediaFiles/Commands/DownloadedAlbumsScanCommand.cs index 70befbb18..a06e39379 100644 --- a/src/NzbDrone.Core/MediaFiles/Commands/DownloadedEpisodesScanCommand.cs +++ b/src/NzbDrone.Core/MediaFiles/Commands/DownloadedAlbumsScanCommand.cs @@ -1,10 +1,9 @@ -using NzbDrone.Core.MediaFiles.EpisodeImport; using NzbDrone.Core.MediaFiles.TrackImport; using NzbDrone.Core.Messaging.Commands; namespace NzbDrone.Core.MediaFiles.Commands { - public class DownloadedEpisodesScanCommand : Command + public class DownloadedAlbumsScanCommand : Command { public override bool SendUpdatesToClient => SendUpdates; diff --git a/src/NzbDrone.Core/MediaFiles/DownloadedEpisodesCommandService.cs b/src/NzbDrone.Core/MediaFiles/DownloadedAlbumsCommandService.cs similarity index 90% rename from src/NzbDrone.Core/MediaFiles/DownloadedEpisodesCommandService.cs rename to src/NzbDrone.Core/MediaFiles/DownloadedAlbumsCommandService.cs index f1d7bf712..41bfd2739 100644 --- a/src/NzbDrone.Core/MediaFiles/DownloadedEpisodesCommandService.cs +++ b/src/NzbDrone.Core/MediaFiles/DownloadedAlbumsCommandService.cs @@ -1,4 +1,4 @@ -using System.Collections.Generic; +using System.Collections.Generic; using System.IO; using System.Linq; using NLog; @@ -7,13 +7,12 @@ using NzbDrone.Common.Extensions; using NzbDrone.Core.Configuration; using NzbDrone.Core.Download.TrackedDownloads; using NzbDrone.Core.MediaFiles.Commands; -using NzbDrone.Core.MediaFiles.EpisodeImport; using NzbDrone.Core.Messaging.Commands; using NzbDrone.Core.MediaFiles.TrackImport; namespace NzbDrone.Core.MediaFiles { - public class DownloadedEpisodesCommandService : IExecute + public class DownloadedAlbumsCommandService : IExecute { private readonly IDownloadedEpisodesImportService _downloadedEpisodesImportService; private readonly ITrackedDownloadService _trackedDownloadService; @@ -21,7 +20,7 @@ namespace NzbDrone.Core.MediaFiles private readonly IConfigService _configService; private readonly Logger _logger; - public DownloadedEpisodesCommandService(IDownloadedEpisodesImportService downloadedEpisodesImportService, + public DownloadedAlbumsCommandService(IDownloadedEpisodesImportService downloadedEpisodesImportService, ITrackedDownloadService trackedDownloadService, IDiskProvider diskProvider, IConfigService configService, @@ -53,7 +52,7 @@ namespace NzbDrone.Core.MediaFiles return _downloadedEpisodesImportService.ProcessRootFolder(new DirectoryInfo(downloadedAlbumsFolder)); } - private List ProcessPath(DownloadedEpisodesScanCommand message) + private List ProcessPath(DownloadedAlbumsScanCommand message) { if (!_diskProvider.FolderExists(message.Path) && !_diskProvider.FileExists(message.Path)) { @@ -82,7 +81,7 @@ namespace NzbDrone.Core.MediaFiles return _downloadedEpisodesImportService.ProcessPath(message.Path, message.ImportMode); } - public void Execute(DownloadedEpisodesScanCommand message) + public void Execute(DownloadedAlbumsScanCommand message) { List importResults; diff --git a/src/NzbDrone.Core/NzbDrone.Core.csproj b/src/NzbDrone.Core/NzbDrone.Core.csproj index eeb8d2085..30d7b7cfe 100644 --- a/src/NzbDrone.Core/NzbDrone.Core.csproj +++ b/src/NzbDrone.Core/NzbDrone.Core.csproj @@ -720,7 +720,7 @@ - + @@ -741,7 +741,7 @@ Code - + diff --git a/src/UI/ManualImport/ManualImportLayout.js b/src/UI/ManualImport/ManualImportLayout.js index 132f05fb6..9d32c2769 100644 --- a/src/UI/ManualImport/ManualImportLayout.js +++ b/src/UI/ManualImport/ManualImportLayout.js @@ -161,8 +161,8 @@ module.exports = Marionette.Layout.extend({ }, _automaticImport : function (e) { - CommandController.Execute('downloadedEpisodesScan', { - name : 'downloadedEpisodesScan', + CommandController.Execute('downloadedAlbumsScan', { + name : 'downloadedAlbumsScan', path : e.folder }); diff --git a/src/UI/Wanted/Missing/MissingLayout.js b/src/UI/Wanted/Missing/MissingLayout.js index f4e0f4218..f7c750892 100644 --- a/src/UI/Wanted/Missing/MissingLayout.js +++ b/src/UI/Wanted/Missing/MissingLayout.js @@ -133,7 +133,7 @@ module.exports = Marionette.Layout.extend({ { title : 'Rescan Drone Factory Folder', icon : 'icon-lidarr-refresh', - command : 'downloadedepisodesscan', + command : 'downloadedalbumsscan', properties : { sendUpdates : true } }, {