From d8af17ce3d010a62505a33785c7d51af7af167b2 Mon Sep 17 00:00:00 2001 From: Qstick Date: Sat, 2 Jul 2022 18:52:01 -0500 Subject: [PATCH] Rename MovieImportedEvent to MovieFileImportedEvent --- .../HealthCheck/Checks/RemotePathMappingCheckFixture.cs | 2 +- .../HistoryTests/HistoryServiceFixture.cs | 2 +- .../MediaFiles/MovieImport/ImportApprovedMoviesFixture.cs | 2 +- .../Download/History/DownloadHistoryService.cs | 4 ++-- .../TrackedDownloads/DownloadMonitoringService.cs | 4 ++-- .../HealthCheck/Checks/ImportListRootFolderCheck.cs | 2 +- .../HealthCheck/Checks/RemotePathMappingCheck.cs | 2 +- src/NzbDrone.Core/History/HistoryService.cs | 8 ++++---- .../{MovieImportedEvent.cs => MovieFileImportedEvent.cs} | 4 ++-- .../MediaFiles/MovieImport/ImportApprovedMovie.cs | 2 +- src/NzbDrone.Core/Notifications/NotificationService.cs | 4 ++-- src/Radarr.Api.V3/Movies/MovieController.cs | 4 ++-- 12 files changed, 20 insertions(+), 20 deletions(-) rename src/NzbDrone.Core/MediaFiles/Events/{MovieImportedEvent.cs => MovieFileImportedEvent.cs} (81%) diff --git a/src/NzbDrone.Core.Test/HealthCheck/Checks/RemotePathMappingCheckFixture.cs b/src/NzbDrone.Core.Test/HealthCheck/Checks/RemotePathMappingCheckFixture.cs index 71b2b0ef4..653447970 100644 --- a/src/NzbDrone.Core.Test/HealthCheck/Checks/RemotePathMappingCheckFixture.cs +++ b/src/NzbDrone.Core.Test/HealthCheck/Checks/RemotePathMappingCheckFixture.cs @@ -176,7 +176,7 @@ namespace NzbDrone.Core.Test.HealthCheck.Checks public void should_return_ok_on_movie_imported_event() { GivenFolderExists(_downloadRootPath); - var importEvent = new MovieImportedEvent(new LocalMovie(), new MovieFile(), new List(), true, new DownloadClientItem()); + var importEvent = new MovieFileImportedEvent(new LocalMovie(), new MovieFile(), new List(), true, new DownloadClientItem()); Subject.Check(importEvent).ShouldBeOk(); } diff --git a/src/NzbDrone.Core.Test/HistoryTests/HistoryServiceFixture.cs b/src/NzbDrone.Core.Test/HistoryTests/HistoryServiceFixture.cs index a74ff9890..89e2287a6 100644 --- a/src/NzbDrone.Core.Test/HistoryTests/HistoryServiceFixture.cs +++ b/src/NzbDrone.Core.Test/HistoryTests/HistoryServiceFixture.cs @@ -91,7 +91,7 @@ namespace NzbDrone.Core.Test.HistoryTests DownloadId = "abcd" }; - Subject.Handle(new MovieImportedEvent(localMovie, movieFile, new List(), true, downloadClientItem)); + Subject.Handle(new MovieFileImportedEvent(localMovie, movieFile, new List(), true, downloadClientItem)); Mocker.GetMock() .Verify(v => v.Insert(It.Is(h => h.SourceTitle == Path.GetFileNameWithoutExtension(localMovie.Path)))); diff --git a/src/NzbDrone.Core.Test/MediaFiles/MovieImport/ImportApprovedMoviesFixture.cs b/src/NzbDrone.Core.Test/MediaFiles/MovieImport/ImportApprovedMoviesFixture.cs index a5b6e7e5e..e6278f6cc 100644 --- a/src/NzbDrone.Core.Test/MediaFiles/MovieImport/ImportApprovedMoviesFixture.cs +++ b/src/NzbDrone.Core.Test/MediaFiles/MovieImport/ImportApprovedMoviesFixture.cs @@ -144,7 +144,7 @@ namespace NzbDrone.Core.Test.MediaFiles.MovieImport Subject.Import(new List { _approvedDecisions.First() }, true); Mocker.GetMock() - .Verify(v => v.PublishEvent(It.IsAny()), Times.Once()); + .Verify(v => v.PublishEvent(It.IsAny()), Times.Once()); } [Test] diff --git a/src/NzbDrone.Core/Download/History/DownloadHistoryService.cs b/src/NzbDrone.Core/Download/History/DownloadHistoryService.cs index 3a05b4c90..f56cda401 100644 --- a/src/NzbDrone.Core/Download/History/DownloadHistoryService.cs +++ b/src/NzbDrone.Core/Download/History/DownloadHistoryService.cs @@ -17,7 +17,7 @@ namespace NzbDrone.Core.Download.History public class DownloadHistoryService : IDownloadHistoryService, IHandle, - IHandle, + IHandle, IHandle, IHandle, IHandle, @@ -120,7 +120,7 @@ namespace NzbDrone.Core.Download.History _repository.Insert(history); } - public void Handle(MovieImportedEvent message) + public void Handle(MovieFileImportedEvent message) { if (!message.NewDownload) { diff --git a/src/NzbDrone.Core/Download/TrackedDownloads/DownloadMonitoringService.cs b/src/NzbDrone.Core/Download/TrackedDownloads/DownloadMonitoringService.cs index b389028a5..ebaa0efa7 100644 --- a/src/NzbDrone.Core/Download/TrackedDownloads/DownloadMonitoringService.cs +++ b/src/NzbDrone.Core/Download/TrackedDownloads/DownloadMonitoringService.cs @@ -14,7 +14,7 @@ namespace NzbDrone.Core.Download.TrackedDownloads public class DownloadMonitoringService : IExecute, IExecute, IHandle, - IHandle, + IHandle, IHandle, IHandle { @@ -167,7 +167,7 @@ namespace NzbDrone.Core.Download.TrackedDownloads _refreshDebounce.Execute(); } - public void Handle(MovieImportedEvent message) + public void Handle(MovieFileImportedEvent message) { _refreshDebounce.Execute(); } diff --git a/src/NzbDrone.Core/HealthCheck/Checks/ImportListRootFolderCheck.cs b/src/NzbDrone.Core/HealthCheck/Checks/ImportListRootFolderCheck.cs index 3e38c1c9e..2d31c567e 100644 --- a/src/NzbDrone.Core/HealthCheck/Checks/ImportListRootFolderCheck.cs +++ b/src/NzbDrone.Core/HealthCheck/Checks/ImportListRootFolderCheck.cs @@ -10,7 +10,7 @@ using NzbDrone.Core.ThingiProvider.Events; namespace NzbDrone.Core.HealthCheck.Checks { [CheckOn(typeof(ProviderUpdatedEvent))] - [CheckOn(typeof(MovieImportedEvent), CheckOnCondition.FailedOnly)] + [CheckOn(typeof(MovieFileImportedEvent), CheckOnCondition.FailedOnly)] [CheckOn(typeof(MovieImportFailedEvent), CheckOnCondition.SuccessfulOnly)] public class ImportListRootFolderCheck : HealthCheckBase { diff --git a/src/NzbDrone.Core/HealthCheck/Checks/RemotePathMappingCheck.cs b/src/NzbDrone.Core/HealthCheck/Checks/RemotePathMappingCheck.cs index 8732fe1fd..7a6ad5aa0 100644 --- a/src/NzbDrone.Core/HealthCheck/Checks/RemotePathMappingCheck.cs +++ b/src/NzbDrone.Core/HealthCheck/Checks/RemotePathMappingCheck.cs @@ -20,7 +20,7 @@ namespace NzbDrone.Core.HealthCheck.Checks [CheckOn(typeof(ProviderUpdatedEvent))] [CheckOn(typeof(ProviderDeletedEvent))] [CheckOn(typeof(ModelEvent))] - [CheckOn(typeof(MovieImportedEvent), CheckOnCondition.FailedOnly)] + [CheckOn(typeof(MovieFileImportedEvent), CheckOnCondition.FailedOnly)] [CheckOn(typeof(MovieImportFailedEvent), CheckOnCondition.SuccessfulOnly)] public class RemotePathMappingCheck : HealthCheckBase, IProvideHealthCheck { diff --git a/src/NzbDrone.Core/History/HistoryService.cs b/src/NzbDrone.Core/History/HistoryService.cs index 558125df3..46c02dbbf 100644 --- a/src/NzbDrone.Core/History/HistoryService.cs +++ b/src/NzbDrone.Core/History/HistoryService.cs @@ -27,13 +27,13 @@ namespace NzbDrone.Core.History List FindByDownloadId(string downloadId); List GetByMovieId(int movieId, MovieHistoryEventType? eventType); void UpdateMany(List toUpdate); - string FindDownloadId(MovieImportedEvent trackedDownload); + string FindDownloadId(MovieFileImportedEvent trackedDownload); List Since(DateTime date, MovieHistoryEventType? eventType); } public class HistoryService : IHistoryService, IHandle, - IHandle, + IHandle, IHandle, IHandle, IHandle, @@ -97,7 +97,7 @@ namespace NzbDrone.Core.History _historyRepository.UpdateMany(toUpdate); } - public string FindDownloadId(MovieImportedEvent trackedDownload) + public string FindDownloadId(MovieFileImportedEvent trackedDownload) { _logger.Debug("Trying to find downloadId for {0} from history", trackedDownload.ImportedMovie.Path); @@ -170,7 +170,7 @@ namespace NzbDrone.Core.History _historyRepository.Insert(history); } - public void Handle(MovieImportedEvent message) + public void Handle(MovieFileImportedEvent message) { if (!message.NewDownload) { diff --git a/src/NzbDrone.Core/MediaFiles/Events/MovieImportedEvent.cs b/src/NzbDrone.Core/MediaFiles/Events/MovieFileImportedEvent.cs similarity index 81% rename from src/NzbDrone.Core/MediaFiles/Events/MovieImportedEvent.cs rename to src/NzbDrone.Core/MediaFiles/Events/MovieFileImportedEvent.cs index 6efd0c7c4..cb10a9edb 100644 --- a/src/NzbDrone.Core/MediaFiles/Events/MovieImportedEvent.cs +++ b/src/NzbDrone.Core/MediaFiles/Events/MovieFileImportedEvent.cs @@ -5,7 +5,7 @@ using NzbDrone.Core.Parser.Model; namespace NzbDrone.Core.MediaFiles.Events { - public class MovieImportedEvent : IEvent + public class MovieFileImportedEvent : IEvent { public LocalMovie MovieInfo { get; private set; } public MovieFile ImportedMovie { get; private set; } @@ -14,7 +14,7 @@ namespace NzbDrone.Core.MediaFiles.Events public DownloadClientItemClientInfo DownloadClientInfo { get; set; } public string DownloadId { get; private set; } - public MovieImportedEvent(LocalMovie movieInfo, MovieFile importedMovie, List oldFiles, bool newDownload, DownloadClientItem downloadClientItem) + public MovieFileImportedEvent(LocalMovie movieInfo, MovieFile importedMovie, List oldFiles, bool newDownload, DownloadClientItem downloadClientItem) { MovieInfo = movieInfo; ImportedMovie = importedMovie; diff --git a/src/NzbDrone.Core/MediaFiles/MovieImport/ImportApprovedMovie.cs b/src/NzbDrone.Core/MediaFiles/MovieImport/ImportApprovedMovie.cs index a7b280c4a..8a7bd5e12 100644 --- a/src/NzbDrone.Core/MediaFiles/MovieImport/ImportApprovedMovie.cs +++ b/src/NzbDrone.Core/MediaFiles/MovieImport/ImportApprovedMovie.cs @@ -144,7 +144,7 @@ namespace NzbDrone.Core.MediaFiles.MovieImport _extraService.ImportMovie(localMovie, movieFile, copyOnly); } - _eventAggregator.PublishEvent(new MovieImportedEvent(localMovie, movieFile, oldFiles, newDownload, downloadClientItem)); + _eventAggregator.PublishEvent(new MovieFileImportedEvent(localMovie, movieFile, oldFiles, newDownload, downloadClientItem)); } catch (RootFolderNotFoundException e) { diff --git a/src/NzbDrone.Core/Notifications/NotificationService.cs b/src/NzbDrone.Core/Notifications/NotificationService.cs index 1b3bea066..b552d087d 100644 --- a/src/NzbDrone.Core/Notifications/NotificationService.cs +++ b/src/NzbDrone.Core/Notifications/NotificationService.cs @@ -17,7 +17,7 @@ namespace NzbDrone.Core.Notifications public class NotificationService : IHandle, IHandle, - IHandle, + IHandle, IHandle, IHandle, IHandle, @@ -120,7 +120,7 @@ namespace NzbDrone.Core.Notifications } } - public void Handle(MovieImportedEvent message) + public void Handle(MovieFileImportedEvent message) { if (!message.NewDownload) { diff --git a/src/Radarr.Api.V3/Movies/MovieController.cs b/src/Radarr.Api.V3/Movies/MovieController.cs index 43682f2eb..538311826 100644 --- a/src/Radarr.Api.V3/Movies/MovieController.cs +++ b/src/Radarr.Api.V3/Movies/MovieController.cs @@ -32,7 +32,7 @@ namespace Radarr.Api.V3.Movies { [V3ApiController] public class MovieController : RestControllerWithSignalR, - IHandle, + IHandle, IHandle, IHandle, IHandle, @@ -264,7 +264,7 @@ namespace Radarr.Api.V3.Movies } [NonAction] - public void Handle(MovieImportedEvent message) + public void Handle(MovieFileImportedEvent message) { var availDelay = _configService.AvailabilityDelay; var translations = _movieTranslationService.GetAllTranslationsForMovieMetadata(message.ImportedMovie.Movie.MovieMetadataId);