Fixed: Download Client not sending on Import or Upgrade notifications (#6908)

* Fixed: Download client and ID for custom scripts

Based on Sonarr Commit eea3419849

* fixup! test

Co-authored-by: Qstick <qstick@gmail.com>

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(), true, new DownloadClientItem(), _downloadItem.DownloadId);
+            var importEvent = new MovieImportedEvent(new LocalMovie(), new MovieFile(), new List<MovieFile>(), true, new DownloadClientItem());
 
             Subject.Check(importEvent).ShouldBeOk();
         }

src/NzbDrone.Core.Test/HistoryTests/HistoryServiceFixture.cs

@@ -91,7 +91,7 @@ namespace NzbDrone.Core.Test.HistoryTests
                 DownloadId = "abcd"
             };
 
-            Subject.Handle(new MovieImportedEvent(localMovie, movieFile, true, downloadClientItem, "abcd"));
+            Subject.Handle(new MovieImportedEvent(localMovie, movieFile, new List<MovieFile>(), true, downloadClientItem));
 
             Mocker.GetMock<IHistoryRepository>()
                 .Verify(v => v.Insert(It.Is<MovieHistory>(h => h.SourceTitle == Path.GetFileNameWithoutExtension(localMovie.Path))));

src/NzbDrone.Core/MediaFiles/Events/MovieDownloadedEvent.cs

@@ -1,26 +0,0 @@
-using System.Collections.Generic;
-using NzbDrone.Common.Messaging;
-using NzbDrone.Core.Download;
-using NzbDrone.Core.Parser.Model;
-
-namespace NzbDrone.Core.MediaFiles.Events
-{
-    public class MovieDownloadedEvent : IEvent
-    {
-        public LocalMovie Movie { get; private set; }
-        public MovieFile MovieFile { get; private set; }
-        public List<MovieFile> OldFiles { get; private set; }
-        public string DownloadId { get; private set; }
-
-        public MovieDownloadedEvent(LocalMovie movie, MovieFile movieFile, List<MovieFile> oldFiles, DownloadClientItem downloadClientItem)
-        {
-            Movie = movie;
-            MovieFile = movieFile;
-            OldFiles = oldFiles;
-            if (downloadClientItem != null)
-            {
-                DownloadId = downloadClientItem.DownloadId;
-            }
-        }
-    }
-}

src/NzbDrone.Core/MediaFiles/Events/MovieImportedEvent.cs

@@ -1,3 +1,4 @@
+using System.Collections.Generic;
 using NzbDrone.Common.Messaging;
 using NzbDrone.Core.Download;
 using NzbDrone.Core.Parser.Model;
@@ -8,24 +9,22 @@ namespace NzbDrone.Core.MediaFiles.Events
     {
         public LocalMovie MovieInfo { get; private set; }
         public MovieFile ImportedMovie { get; private set; }
+        public List<MovieFile> OldFiles { get; private set; }
         public bool NewDownload { get; private set; }
         public DownloadClientItemClientInfo DownloadClientInfo { get; set; }
         public string DownloadId { get; private set; }
 
-        public MovieImportedEvent(LocalMovie movieInfo, MovieFile importedMovie, bool newDownload)
+        public MovieImportedEvent(LocalMovie movieInfo, MovieFile importedMovie, List<MovieFile> oldFiles, bool newDownload, DownloadClientItem downloadClientItem)
         {
             MovieInfo = movieInfo;
             ImportedMovie = importedMovie;
+            OldFiles = oldFiles;
             NewDownload = newDownload;
-        }
-
-        public MovieImportedEvent(LocalMovie movieInfo, MovieFile importedMovie, bool newDownload, DownloadClientItem downloadClientItem, string downloadId)
-        {
-            MovieInfo = movieInfo;
-            ImportedMovie = importedMovie;
-            NewDownload = newDownload;
-            DownloadClientInfo = downloadClientItem.DownloadClientInfo;
-            DownloadId = downloadId;
+            if (downloadClientItem != null)
+            {
+                DownloadClientInfo = downloadClientItem.DownloadClientInfo;
+                DownloadId = downloadClientItem.DownloadId;
+            }
         }
     }
 }

src/NzbDrone.Core/MediaFiles/MovieImport/ImportApprovedMovie.cs

@@ -144,19 +144,7 @@ namespace NzbDrone.Core.MediaFiles.MovieImport
                         _extraService.ImportMovie(localMovie, movieFile, copyOnly);
                     }
 
-                    if (downloadClientItem != null)
-                    {
-                        _eventAggregator.PublishEvent(new MovieImportedEvent(localMovie, movieFile, newDownload, downloadClientItem, downloadClientItem.DownloadId));
-                    }
-                    else
-                    {
-                        _eventAggregator.PublishEvent(new MovieImportedEvent(localMovie, movieFile, newDownload));
-                    }
-
-                    if (newDownload)
-                    {
-                        _eventAggregator.PublishEvent(new MovieDownloadedEvent(localMovie, movieFile, oldFiles, downloadClientItem));
-                    }
+                    _eventAggregator.PublishEvent(new MovieImportedEvent(localMovie, movieFile, oldFiles, newDownload, downloadClientItem));
                 }
                 catch (RootFolderNotFoundException e)
                 {

src/NzbDrone.Core/Notifications/NotificationService.cs

@@ -17,7 +17,7 @@ namespace NzbDrone.Core.Notifications
     public class NotificationService
         : IHandle<MovieRenamedEvent>,
           IHandle<MovieGrabbedEvent>,
-          IHandle<MovieDownloadedEvent>,
+          IHandle<MovieImportedEvent>,
           IHandle<MoviesDeletedEvent>,
           IHandle<MovieFileDeletedEvent>,
           IHandle<HealthCheckFailedEvent>,
@@ -117,21 +117,29 @@ namespace NzbDrone.Core.Notifications
             }
         }
 
-        public void Handle(MovieDownloadedEvent message)
+        public void Handle(MovieImportedEvent message)
         {
-            var downloadMessage = new DownloadMessage();
-            downloadMessage.Message = GetMessage(message.Movie.Movie, message.Movie.Quality);
-            downloadMessage.MovieFile = message.MovieFile;
-            downloadMessage.Movie = message.Movie.Movie;
-            downloadMessage.OldMovieFiles = message.OldFiles;
-            downloadMessage.SourcePath = message.Movie.Path;
-            downloadMessage.DownloadId = message.DownloadId;
+            if (!message.NewDownload)
+            {
+                return;
+            }
+
+            var downloadMessage = new DownloadMessage
+            {
+                Message = GetMessage(message.MovieInfo.Movie, message.MovieInfo.Quality),
+                MovieFile = message.ImportedMovie,
+                Movie = message.MovieInfo.Movie,
+                OldMovieFiles = message.OldFiles,
+                SourcePath = message.MovieInfo.Path,
+                DownloadClient = message.DownloadClientInfo?.Name,
+                DownloadId = message.DownloadId
+            };
 
             foreach (var notification in _notificationFactory.OnDownloadEnabled())
             {
                 try
                 {
-                    if (ShouldHandleMovie(notification.Definition, message.Movie.Movie))
+                    if (ShouldHandleMovie(notification.Definition, message.MovieInfo.Movie))
                     {
                         if (downloadMessage.OldMovieFiles.Empty() || ((NotificationDefinition)notification.Definition).OnUpgrade)
                         {