From cc44d022b34c8e5f88ef5cdc48883ed30a786cf6 Mon Sep 17 00:00:00 2001 From: Logan Date: Thu, 2 May 2019 06:52:33 -0400 Subject: [PATCH] Added: Radarr_Download_Id and Radarr_Download_Client to the environment (#3276) Fixes #3232 --- .../Notifications/CustomScript/CustomScript.cs | 2 ++ src/NzbDrone.Core/Notifications/GrabMessage.cs | 6 ++++-- src/NzbDrone.Core/Notifications/NotificationService.cs | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/NzbDrone.Core/Notifications/CustomScript/CustomScript.cs b/src/NzbDrone.Core/Notifications/CustomScript/CustomScript.cs index 9305c87ea..203559c14 100755 --- a/src/NzbDrone.Core/Notifications/CustomScript/CustomScript.cs +++ b/src/NzbDrone.Core/Notifications/CustomScript/CustomScript.cs @@ -46,6 +46,8 @@ namespace NzbDrone.Core.Notifications.CustomScript environmentVariables.Add("Radarr_Release_Quality", quality.Quality.Name); environmentVariables.Add("Radarr_Release_QualityVersion", quality.Revision.Version.ToString()); environmentVariables.Add("Radarr_IndexerFlags", remoteMovie.Release.IndexerFlags.ToString()); + environmentVariables.Add("Radarr_Download_Client", message.DownloadClient ?? string.Empty); + environmentVariables.Add("Radarr_Download_Id", message.DownloadId ?? string.Empty); ExecuteScript(environmentVariables); } diff --git a/src/NzbDrone.Core/Notifications/GrabMessage.cs b/src/NzbDrone.Core/Notifications/GrabMessage.cs index 25c34dac7..ecc25c4f1 100644 --- a/src/NzbDrone.Core/Notifications/GrabMessage.cs +++ b/src/NzbDrone.Core/Notifications/GrabMessage.cs @@ -1,4 +1,4 @@ -using NzbDrone.Core.Parser.Model; +using NzbDrone.Core.Parser.Model; using NzbDrone.Core.Qualities; using NzbDrone.Core.Movies; @@ -9,7 +9,9 @@ namespace NzbDrone.Core.Notifications public string Message { get; set; } public Movie Movie { get; set; } public RemoteMovie RemoteMovie { get; set; } - public QualityModel Quality { get; set; } + public QualityModel Quality { get; set; } + public string DownloadClient { get; set; } + public string DownloadId { get; set; } public override string ToString() { diff --git a/src/NzbDrone.Core/Notifications/NotificationService.cs b/src/NzbDrone.Core/Notifications/NotificationService.cs index 91b323715..2809bcac7 100644 --- a/src/NzbDrone.Core/Notifications/NotificationService.cs +++ b/src/NzbDrone.Core/Notifications/NotificationService.cs @@ -72,7 +72,9 @@ namespace NzbDrone.Core.Notifications Message = GetMessage(message.Movie.Movie, message.Movie.ParsedMovieInfo.Quality), Quality = message.Movie.ParsedMovieInfo.Quality, Movie = message.Movie.Movie, - RemoteMovie = message.Movie + RemoteMovie = message.Movie, + DownloadClient = message.DownloadClient, + DownloadId = message.DownloadId }; foreach (var notification in _notificationFactory.OnGrabEnabled())