mirror of https://github.com/Radarr/Radarr
Fixed: Align DownloadClientInfo in ManualInteractionRequiredMessage with DownloadMessage
Also handle null ref exceptions when DownloadClientInfo is null in notification service
This commit is contained in:
parent
5f624a147b
commit
173b1d6a4c
|
@ -323,8 +323,8 @@ namespace NzbDrone.Core.Notifications.CustomScript
|
||||||
environmentVariables.Add("Radarr_Movie_ImdbId", movie.MovieMetadata.Value.ImdbId ?? string.Empty);
|
environmentVariables.Add("Radarr_Movie_ImdbId", movie.MovieMetadata.Value.ImdbId ?? string.Empty);
|
||||||
environmentVariables.Add("Radarr_Movie_TmdbId", movie.MovieMetadata.Value.TmdbId.ToString());
|
environmentVariables.Add("Radarr_Movie_TmdbId", movie.MovieMetadata.Value.TmdbId.ToString());
|
||||||
environmentVariables.Add("Radarr_Movie_Overview", movie.MovieMetadata.Value.Overview);
|
environmentVariables.Add("Radarr_Movie_Overview", movie.MovieMetadata.Value.Overview);
|
||||||
environmentVariables.Add("Radarr_Download_Client", message.DownloadClientName ?? string.Empty);
|
environmentVariables.Add("Radarr_Download_Client", message.DownloadClientInfo?.Name ?? string.Empty);
|
||||||
environmentVariables.Add("Radarr_Download_Client_Type", message.DownloadClientType ?? string.Empty);
|
environmentVariables.Add("Radarr_Download_Client_Type", message.DownloadClientInfo?.Type ?? string.Empty);
|
||||||
environmentVariables.Add("Radarr_Download_Id", message.DownloadId ?? string.Empty);
|
environmentVariables.Add("Radarr_Download_Id", message.DownloadId ?? string.Empty);
|
||||||
environmentVariables.Add("Radarr_Download_Size", message.TrackedDownload.DownloadItem.TotalSize.ToString());
|
environmentVariables.Add("Radarr_Download_Size", message.TrackedDownload.DownloadItem.TotalSize.ToString());
|
||||||
environmentVariables.Add("Radarr_Download_Title", message.TrackedDownload.DownloadItem.Title);
|
environmentVariables.Add("Radarr_Download_Title", message.TrackedDownload.DownloadItem.Title);
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
using NzbDrone.Core.Download;
|
||||||
using NzbDrone.Core.Download.TrackedDownloads;
|
using NzbDrone.Core.Download.TrackedDownloads;
|
||||||
using NzbDrone.Core.Movies;
|
using NzbDrone.Core.Movies;
|
||||||
using NzbDrone.Core.Parser.Model;
|
using NzbDrone.Core.Parser.Model;
|
||||||
|
@ -12,8 +13,7 @@ namespace NzbDrone.Core.Notifications
|
||||||
public RemoteMovie RemoteMovie { get; set; }
|
public RemoteMovie RemoteMovie { get; set; }
|
||||||
public TrackedDownload TrackedDownload { get; set; }
|
public TrackedDownload TrackedDownload { get; set; }
|
||||||
public QualityModel Quality { get; set; }
|
public QualityModel Quality { get; set; }
|
||||||
public string DownloadClientType { get; set; }
|
public DownloadClientItemClientInfo DownloadClientInfo { get; set; }
|
||||||
public string DownloadClientName { get; set; }
|
|
||||||
public string DownloadId { get; set; }
|
public string DownloadId { get; set; }
|
||||||
public GrabbedReleaseInfo Release { get; set; }
|
public GrabbedReleaseInfo Release { get; set; }
|
||||||
|
|
||||||
|
|
|
@ -261,8 +261,7 @@ namespace NzbDrone.Core.Notifications
|
||||||
Quality = message.RemoteMovie.ParsedMovieInfo.Quality,
|
Quality = message.RemoteMovie.ParsedMovieInfo.Quality,
|
||||||
RemoteMovie = message.RemoteMovie,
|
RemoteMovie = message.RemoteMovie,
|
||||||
TrackedDownload = message.TrackedDownload,
|
TrackedDownload = message.TrackedDownload,
|
||||||
DownloadClientType = message.TrackedDownload.DownloadItem.DownloadClientInfo.Type,
|
DownloadClientInfo = message.TrackedDownload.DownloadItem.DownloadClientInfo,
|
||||||
DownloadClientName = message.TrackedDownload.DownloadItem.DownloadClientInfo.Name,
|
|
||||||
DownloadId = message.TrackedDownload.DownloadItem.DownloadId,
|
DownloadId = message.TrackedDownload.DownloadItem.DownloadId,
|
||||||
Release = message.Release
|
Release = message.Release
|
||||||
};
|
};
|
||||||
|
|
|
@ -209,8 +209,8 @@ namespace NzbDrone.Core.Notifications.Webhook
|
||||||
Tags = GetTagLabels(message.Movie)
|
Tags = GetTagLabels(message.Movie)
|
||||||
},
|
},
|
||||||
DownloadInfo = new WebhookDownloadClientItem(quality, message.TrackedDownload.DownloadItem),
|
DownloadInfo = new WebhookDownloadClientItem(quality, message.TrackedDownload.DownloadItem),
|
||||||
DownloadClient = message.DownloadClientName,
|
DownloadClient = message.DownloadClientInfo?.Name,
|
||||||
DownloadClientType = message.DownloadClientType,
|
DownloadClientType = message.DownloadClientInfo?.Type,
|
||||||
DownloadId = message.DownloadId,
|
DownloadId = message.DownloadId,
|
||||||
CustomFormatInfo = new WebhookCustomFormatInfo(remoteMovie.CustomFormats, remoteMovie.CustomFormatScore),
|
CustomFormatInfo = new WebhookCustomFormatInfo(remoteMovie.CustomFormats, remoteMovie.CustomFormatScore),
|
||||||
Release = new WebhookGrabbedRelease(message.Release)
|
Release = new WebhookGrabbedRelease(message.Release)
|
||||||
|
|
Loading…
Reference in New Issue