Convert onGrab from passing a string to passing an object with series and episode information

Use object initalizer instead of creation of OnGrab/grabmessage

src/NzbDrone.Core/Notifications/Boxcar/Boxcar.cs

@@ -19,11 +19,11 @@ namespace NzbDrone.Core.Notifications.Boxcar
             get { return "https://boxcar.io/client"; }
         }
 
-        public override void OnGrab(string message)
+        public override void OnGrab(GrabMessage grabMessage)
         {
             const string title = "Episode Grabbed";
 
-            _proxy.SendNotification(title, message, Settings);
+            _proxy.SendNotification(title, grabMessage.Message, Settings);
         }
 
         public override void OnDownload(DownloadMessage message)

src/NzbDrone.Core/Notifications/CustomScript/CustomScript.cs

@@ -18,7 +18,7 @@ namespace NzbDrone.Core.Notifications.CustomScript
             get { return "https://github.com/Sonarr/Sonarr/wiki/Custom-Post-Processing-Scripts"; }
         }
 
-        public override void OnGrab(string message)
+        public override void OnGrab(GrabMessage grabMessage)
         {
         }
 

src/NzbDrone.Core/Notifications/Email/Email.cs

@@ -20,10 +20,10 @@ namespace NzbDrone.Core.Notifications.Email
             get { return null; }
         }
 
-        public override void OnGrab(string message)
+        public override void OnGrab(GrabMessage grabMessage)
         {
             const string subject = "Sonarr [TV] - Grabbed";
-            var body = String.Format("{0} sent to queue.", message);
+            var body = String.Format("{0} sent to queue.", grabMessage.Message);
 
             _emailService.SendEmail(Settings, subject, body);
         }

src/NzbDrone.Core/Notifications/GrabMessage.cs

@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+using NzbDrone.Core.MediaFiles;
+using NzbDrone.Core.Parser.Model;
+using NzbDrone.Core.Qualities;
+using NzbDrone.Core.Tv;
+
+namespace NzbDrone.Core.Notifications
+{
+    public class GrabMessage
+    {
+        public String Message { get; set; }
+        public Series Series { get; set; }
+        public RemoteEpisode Episode { get; set; }
+        public QualityModel Quality { get; set; }
+
+        public override string ToString()
+        {
+            return Message;
+        }
+    }
+}

src/NzbDrone.Core/Notifications/Growl/Growl.cs

@@ -19,11 +19,11 @@ namespace NzbDrone.Core.Notifications.Growl
             get { return "http://growl.info/"; }
         }
 
-        public override void OnGrab(string message)
+        public override void OnGrab(GrabMessage grabMessage)
         {
             const string title = "Episode Grabbed";
 
-            _growlService.SendNotification(title, message, "GRAB", Settings.Host, Settings.Port, Settings.Password);
+            _growlService.SendNotification(title, grabMessage.Message, "GRAB", Settings.Host, Settings.Port, Settings.Password);
         }
 
         public override void OnDownload(DownloadMessage message)

src/NzbDrone.Core/Notifications/INotification.cs

@@ -7,7 +7,7 @@ namespace NzbDrone.Core.Notifications
     {
         string Link { get; }
 
-        void OnGrab(string message);
+        void OnGrab(GrabMessage grabMessage);
         void OnDownload(DownloadMessage message);
         void OnRename(Series series);
         bool SupportsOnGrab { get; }

src/NzbDrone.Core/Notifications/MediaBrowser/MediaBrowser.cs

@@ -20,13 +20,13 @@ namespace NzbDrone.Core.Notifications.MediaBrowser
             get { return "http://mediabrowser.tv/"; }
         }
 
-        public override void OnGrab(String message)
+        public override void OnGrab(GrabMessage grabMessage)
         {
             const string title = "Sonarr - Grabbed";
 
             if (Settings.Notify)
             {
-                _mediaBrowserService.Notify(Settings, title, message);
+                _mediaBrowserService.Notify(Settings, title, grabMessage.Message);
             }
         }
 

src/NzbDrone.Core/Notifications/NotificationBase.cs

@@ -39,7 +39,7 @@ namespace NzbDrone.Core.Notifications
 
         public abstract string Link { get; }
 
-        public abstract void OnGrab(string message);
+        public abstract void OnGrab(GrabMessage grabMessage);
         public abstract void OnDownload(DownloadMessage message); 
         public abstract void OnRename(Series series);
 

src/NzbDrone.Core/Notifications/NotificationService.cs

@@ -90,14 +90,19 @@ namespace NzbDrone.Core.Notifications
 
         public void Handle(EpisodeGrabbedEvent message)
         {
-            var messageBody = GetMessage(message.Episode.Series, message.Episode.Episodes, message.Episode.ParsedEpisodeInfo.Quality);
+            var grabMessage = new GrabMessage {
+                Message = GetMessage(message.Episode.Series, message.Episode.Episodes, message.Episode.ParsedEpisodeInfo.Quality),
+                Series = message.Episode.Series,
+                Quality = message.Episode.ParsedEpisodeInfo.Quality,
+                Episode = message.Episode
+            };
 
             foreach (var notification in _notificationFactory.OnGrabEnabled())
             {
                 try
                 {
                     if (!ShouldHandleSeries(notification.Definition, message.Episode.Series)) continue;
-                    notification.OnGrab(messageBody);
+                    notification.OnGrab(grabMessage);
                 }
 
                 catch (Exception ex)

src/NzbDrone.Core/Notifications/NotifyMyAndroid/NotifyMyAndroid.cs

@@ -20,11 +20,11 @@ namespace NzbDrone.Core.Notifications.NotifyMyAndroid
             get { return "http://www.notifymyandroid.com/"; }
         }
 
-        public override void OnGrab(string message)
+        public override void OnGrab(GrabMessage grabMessage)
         {
             const string title = "Episode Grabbed";
 
-            _proxy.SendNotification(title, message, Settings.ApiKey, (NotifyMyAndroidPriority)Settings.Priority);
+            _proxy.SendNotification(title, grabMessage.Message, Settings.ApiKey, (NotifyMyAndroidPriority)Settings.Priority);
         }
 
         public override void OnDownload(DownloadMessage message)

src/NzbDrone.Core/Notifications/Plex/PlexClient.cs

@@ -19,10 +19,10 @@ namespace NzbDrone.Core.Notifications.Plex
             get { return "http://www.plexapp.com/"; }
         }
 
-        public override void OnGrab(string message)
+        public override void OnGrab(GrabMessage grabMessage)
         {
             const string header = "Sonarr [TV] - Grabbed";
-            _plexClientService.Notify(Settings, header, message);
+            _plexClientService.Notify(Settings, header, grabMessage.Message);
         }
 
         public override void OnDownload(DownloadMessage message)

src/NzbDrone.Core/Notifications/Plex/PlexHomeTheater.cs

@@ -25,11 +25,11 @@ namespace NzbDrone.Core.Notifications.Plex
             get { return "https://plex.tv/"; }
         }
 
-        public override void OnGrab(string message)
+        public override void OnGrab(GrabMessage grabMessage)
         {
             const string header = "Sonarr - Grabbed";
 
-            Notify(Settings, header, message);
+            Notify(Settings, header, grabMessage.Message);
         }
 
         public override void OnDownload(DownloadMessage message)

src/NzbDrone.Core/Notifications/Plex/PlexServer.cs

@@ -19,7 +19,7 @@ namespace NzbDrone.Core.Notifications.Plex
             get { return "http://www.plexapp.com/"; }
         }
 
-        public override void OnGrab(string message)
+        public override void OnGrab(GrabMessage grabMessage)
         {
         }
 

src/NzbDrone.Core/Notifications/Prowl/Prowl.cs

@@ -20,11 +20,11 @@ namespace NzbDrone.Core.Notifications.Prowl
             get { return "http://www.prowlapp.com/"; }
         }
 
-        public override void OnGrab(string message)
+        public override void OnGrab(GrabMessage grabMessage)
         {
             const string title = "Episode Grabbed";
 
-            _prowlService.SendNotification(title, message, Settings.ApiKey, (NotificationPriority)Settings.Priority);
+            _prowlService.SendNotification(title, grabMessage.Message, Settings.ApiKey, (NotificationPriority)Settings.Priority);
         }
 
         public override void OnDownload(DownloadMessage message)

src/NzbDrone.Core/Notifications/PushBullet/PushBullet.cs

@@ -19,11 +19,11 @@ namespace NzbDrone.Core.Notifications.PushBullet
             get { return "https://www.pushbullet.com/"; }
         }
 
-        public override void OnGrab(string message)
+        public override void OnGrab(GrabMessage grabMessage)
         {
             const string title = "Sonarr - Episode Grabbed";
 
-            _proxy.SendNotification(title, message, Settings);
+            _proxy.SendNotification(title, grabMessage.Message, Settings);
         }
 
         public override void OnDownload(DownloadMessage message)

src/NzbDrone.Core/Notifications/Pushalot/Pushalot.cs

@@ -20,11 +20,11 @@ namespace NzbDrone.Core.Notifications.Pushalot
             get { return "https://www.Pushalot.com/"; }
         }
 
-        public override void OnGrab(String message)
+        public override void OnGrab(GrabMessage grabMessage)
         {
             const string title = "Episode Grabbed";
 
-            _proxy.SendNotification(title, message, Settings);
+            _proxy.SendNotification(title, grabMessage.Message, Settings);
         }
 
         public override void OnDownload(DownloadMessage message)

src/NzbDrone.Core/Notifications/Pushover/Pushover.cs

@@ -19,11 +19,11 @@ namespace NzbDrone.Core.Notifications.Pushover
             get { return "https://pushover.net/"; }
         }
 
-        public override void OnGrab(string message)
+        public override void OnGrab(GrabMessage grabMessage)
         {
             const string title = "Episode Grabbed";
 
-            _proxy.SendNotification(title, message, Settings.ApiKey, Settings.UserKey, (PushoverPriority)Settings.Priority, Settings.Sound);
+            _proxy.SendNotification(title, grabMessage.Message, Settings.ApiKey, Settings.UserKey, (PushoverPriority)Settings.Priority, Settings.Sound);
         }
 
         public override void OnDownload(DownloadMessage message)

src/NzbDrone.Core/Notifications/Synology/SynologyIndexer.cs

@@ -21,7 +21,7 @@ namespace NzbDrone.Core.Notifications.Synology
             get { return "http://www.synology.com"; }
         }
 
-        public override void OnGrab(string message)
+        public override void OnGrab(GrabMessage grabMessage)
         {
 
         }

src/NzbDrone.Core/Notifications/Twitter/Twitter.cs

@@ -20,9 +20,9 @@ namespace NzbDrone.Core.Notifications.Twitter
             get { return "https://twitter.com/"; }
         }
 
-        public override void OnGrab(string message)
+        public override void OnGrab(GrabMessage grabMessage)
         {
-            _twitterService.SendNotification(message, Settings);
+            _twitterService.SendNotification(grabMessage.Message, Settings);
         }
 
         public override void OnDownload(DownloadMessage message)

src/NzbDrone.Core/Notifications/Xbmc/Xbmc.cs

@@ -25,11 +25,11 @@ namespace NzbDrone.Core.Notifications.Xbmc
             get { return "http://xbmc.org/"; }
         }
 
-        public override void OnGrab(string message)
+        public override void OnGrab(GrabMessage grabMessage)
         {
             const string header = "Sonarr - Grabbed";
 
-            Notify(Settings, header, message);
+            Notify(Settings, header, grabMessage.Message);
         }
 
         public override void OnDownload(DownloadMessage message)

src/NzbDrone.Core/NzbDrone.Core.csproj

@@ -728,6 +728,7 @@
     <Compile Include="Notifications\Boxcar\BoxcarException.cs" />
     <Compile Include="Notifications\Boxcar\BoxcarProxy.cs" />
     <Compile Include="Notifications\Boxcar\BoxcarSettings.cs" />
+    <Compile Include="Notifications\GrabMessage.cs" />
     <Compile Include="Notifications\Plex\Models\PlexIdentity.cs" />
     <Compile Include="Notifications\Plex\Models\PlexPreferences.cs" />
     <Compile Include="Notifications\Plex\Models\PlexSectionItem.cs" />