Fix/implement Webhook notifications (#901)

src/NzbDrone.Core/Notifications/Webhook/Webhook.cs

@@ -19,21 +19,21 @@ namespace NzbDrone.Core.Notifications.Webhook
 
         public override void OnGrab(GrabMessage message)
         {
-            _service.OnGrab(message.Series, message.Episode, message.Quality, Settings);
+            _service.OnGrab(message.Movie, message.RemoteMovie, message.Quality, Settings);
         }
 
         public override void OnDownload(DownloadMessage message)
         {
-            _service.OnDownload(message.Series, message.EpisodeFile, Settings);
+            _service.OnDownload(message.Movie, message.MovieFile, Settings);
         }
 
         public override void OnMovieRename(Movie movie)
         {
+            _service.OnRename(movie, Settings);
         }
 
         public override void OnRename(Series series)
         {
-            _service.OnRename(series, Settings);
         }
 
         public override string Name => "Webhook";

src/NzbDrone.Core/Notifications/Webhook/WebhookMovie.cs

@@ -0,0 +1,28 @@
+using System.IO;
+using NzbDrone.Core.Tv;
+using NzbDrone.Core.MediaFiles;
+
+namespace NzbDrone.Core.Notifications.Webhook
+{
+    public class WebhookMovie
+    {
+        public int Id { get; set; }
+        public string Title { get; set; }
+        public string FilePath { get; set; }
+
+        public WebhookMovie() { }
+
+        public WebhookMovie(Movie movie)
+        {
+            Id = movie.Id;
+            Title = movie.Title;
+        }
+
+        public WebhookMovie(Movie movie, MovieFile movieFile)
+        {
+            Id = movie.Id;
+            Title = movie.Title;
+            FilePath = Path.Combine(movie.Path, movieFile.RelativePath);
+        }
+    }
+}

src/NzbDrone.Core/Notifications/Webhook/WebhookPayload.cs

@@ -5,7 +5,7 @@ namespace NzbDrone.Core.Notifications.Webhook
     public class WebhookPayload
     {
         public string EventType { get; set; }
-        public WebhookSeries Series { get; set; }
+        public WebhookMovie Movie { get; set; }
-        public List<WebhookEpisode> Episodes { get; set; }
+        public WebhookRemoteMovie RemoteMovie { get; set; }
     }
 }

src/NzbDrone.Core/Notifications/Webhook/WebhookRemoteMovie.cs

@@ -0,0 +1,25 @@
+using NzbDrone.Core.Tv;
+using NzbDrone.Core.Parser.Model;
+
+namespace NzbDrone.Core.Notifications.Webhook
+{
+    public class WebhookRemoteMovie
+    {
+        public string ImdbId { get; set; }
+        public string Title { get; set; }
+
+        public WebhookRemoteMovie() { }
+
+        public WebhookRemoteMovie(RemoteMovie remoteMovie)
+        {
+            ImdbId = remoteMovie.Movie.ImdbId;
+            Title = remoteMovie.Release.Title;
+        }
+
+        public WebhookRemoteMovie(Movie movie)
+        {
+            ImdbId = movie.ImdbId;
+            Title = movie.Title;
+        }
+    }
+}

src/NzbDrone.Core/Notifications/Webhook/WebhookService.cs

@@ -12,54 +12,44 @@ namespace NzbDrone.Core.Notifications.Webhook
 {
     public interface IWebhookService
     {
-        void OnDownload(Series series, EpisodeFile episodeFile, WebhookSettings settings);
+        void OnDownload(Movie movie, MovieFile movieFile, WebhookSettings settings);
-        void OnRename(Series series, WebhookSettings settings);
+        void OnRename(Movie movie, WebhookSettings settings);
-        void OnGrab(Series series, RemoteEpisode episode, QualityModel quality, WebhookSettings settings);
+        void OnGrab(Movie movie, RemoteMovie remoteMovie, QualityModel quality, WebhookSettings settings);
         ValidationFailure Test(WebhookSettings settings);
     }
 
     public class WebhookService : IWebhookService
     {
-        public void OnDownload(Series series, EpisodeFile episodeFile, WebhookSettings settings)
+        public void OnDownload(Movie movie, MovieFile movieFile, WebhookSettings settings)
         {
             var payload = new WebhookPayload
             {
                 EventType = "Download",
-                Series = new WebhookSeries(series),
+                Movie = new WebhookMovie(movie, movieFile),
-                Episodes = episodeFile.Episodes.Value.ConvertAll(x => new WebhookEpisode(x) {
+                RemoteMovie = new WebhookRemoteMovie(movie)
-                    Quality = episodeFile.Quality.Quality.Name,
-                    QualityVersion = episodeFile.Quality.Revision.Version,
-                    ReleaseGroup = episodeFile.ReleaseGroup,
-                    SceneName = episodeFile.SceneName
-                })
             };
 
             NotifyWebhook(payload, settings);
         }
 
-        public void OnRename(Series series, WebhookSettings settings)
+        public void OnRename(Movie movie, WebhookSettings settings)
         {
             var payload = new WebhookPayload
             {
                 EventType = "Rename",
-                Series = new WebhookSeries(series)
+                Movie = new WebhookMovie(movie)
             };
 
             NotifyWebhook(payload, settings);
         }
 
-        public void OnGrab(Series series, RemoteEpisode episode, QualityModel quality, WebhookSettings settings)
+        public void OnGrab(Movie movie, RemoteMovie remoteMovie, QualityModel quality, WebhookSettings settings)
         {
             var payload = new WebhookPayload
             {
                 EventType = "Grab",
-                Series = new WebhookSeries(series),
+                Movie = new WebhookMovie(movie),
-                Episodes = episode.Episodes.ConvertAll(x => new WebhookEpisode(x)
+                RemoteMovie = new WebhookRemoteMovie(remoteMovie)
-                {
-                    Quality = quality.Quality.Name,
-                    QualityVersion = quality.Revision.Version,
-                    ReleaseGroup = episode.ParsedEpisodeInfo.ReleaseGroup
-                })
             };
             NotifyWebhook(payload, settings);
         }
@@ -87,23 +77,18 @@ namespace NzbDrone.Core.Notifications.Webhook
                     new WebhookPayload
                     {
                         EventType = "Test",
-                        Series = new WebhookSeries()
+                        Movie = new WebhookMovie()
                         {
                             Id = 1,
                             Title = "Test Title",
-                            Path = "C:\\testpath",
+                            FilePath = "C:\\testpath",
-                            TvdbId = 1234
                         },
-                        Episodes = new List<WebhookEpisode>() {
+                        RemoteMovie = new WebhookRemoteMovie(){
-                            new WebhookEpisode()
+                            ImdbId = "tt012345",
-                            {
+                        	Title = "My Awesome Movie!"
-                                Id = 123,
-                                EpisodeNumber = 1,
-                                SeasonNumber = 1,
-                                Title = "Test title"
-                            }
                         }
                     },
+
                     settings
                 );
             }

src/NzbDrone.Core/NzbDrone.Core.csproj

@@ -973,6 +973,8 @@
     <Compile Include="Notifications\Webhook\WebhookMethod.cs" />
     <Compile Include="Notifications\Webhook\WebhookPayload.cs" />
     <Compile Include="Notifications\Webhook\WebhookSeries.cs" />
+    <Compile Include="Notifications\Webhook\WebhookMovie.cs" />
+    <Compile Include="Notifications\Webhook\WebhookRemoteMovie.cs" />
     <Compile Include="Notifications\Webhook\WebhookService.cs" />
     <Compile Include="Notifications\Webhook\WebhookSettings.cs" />
     <Compile Include="Notifications\Webhook\Webhook.cs" />