Archive-Team
/
sonarr-repo-only
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed: Error when download client information is unavailable for Manual Interaction Required event 

Closes #6558
(cherry picked from commit 173b1d6a4c0f2125c4413c0c09b269d87a1f1ee8)

Co-authored-by: Qstick <qstick@gmail.com>
This commit is contained in:
Bogdan 2024-02-28 06:42:08 +02:00 committed by GitHub
parent fb6fc568c5
commit fa600e62e0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/NzbDrone.Core/Notifications/CustomScript/CustomScript.cs
View File

@ -351,8 +351,8 @@ namespace NzbDrone.Core.Notifications.CustomScript
environmentVariables.Add("Sonarr_Series_OriginalLanguage", IsoLanguages.Get(series.OriginalLanguage).ThreeLetterCode); environmentVariables.Add("Sonarr_Series_OriginalLanguage", IsoLanguages.Get(series.OriginalLanguage).ThreeLetterCode);
environmentVariables.Add("Sonarr_Series_Genres", string.Join("|", series.Genres)); environmentVariables.Add("Sonarr_Series_Genres", string.Join("|", series.Genres));
environmentVariables.Add("Sonarr_Series_Tags", string.Join("|", series.Tags.Select(t => _tagRepository.Get(t).Label))); environmentVariables.Add("Sonarr_Series_Tags", string.Join("|", series.Tags.Select(t => _tagRepository.Get(t).Label)));
environmentVariables.Add("Sonarr_Download_Client", message.DownloadClientName ?? string.Empty); environmentVariables.Add("Sonarr_Download_Client", message.DownloadClientInfo?.Name ?? string.Empty);
environmentVariables.Add("Sonarr_Download_Client_Type", message.DownloadClientType ?? string.Empty); environmentVariables.Add("Sonarr_Download_Client_Type", message.DownloadClientInfo?.Type ?? string.Empty);
environmentVariables.Add("Sonarr_Download_Id", message.DownloadId ?? string.Empty); environmentVariables.Add("Sonarr_Download_Id", message.DownloadId ?? string.Empty);
environmentVariables.Add("Sonarr_Download_Size", message.TrackedDownload.DownloadItem.TotalSize.ToString()); environmentVariables.Add("Sonarr_Download_Size", message.TrackedDownload.DownloadItem.TotalSize.ToString());
environmentVariables.Add("Sonarr_Download_Title", message.TrackedDownload.DownloadItem.Title); environmentVariables.Add("Sonarr_Download_Title", message.TrackedDownload.DownloadItem.Title);

4
src/NzbDrone.Core/Notifications/ManualInteractionRequiredMessage.cs
View File

@ -1,3 +1,4 @@
using NzbDrone.Core.Download;
using NzbDrone.Core.Download.TrackedDownloads; using NzbDrone.Core.Download.TrackedDownloads;
using NzbDrone.Core.Parser.Model; using NzbDrone.Core.Parser.Model;
using NzbDrone.Core.Qualities; using NzbDrone.Core.Qualities;
@ -12,8 +13,7 @@ namespace NzbDrone.Core.Notifications
public RemoteEpisode Episode { get; set; } public RemoteEpisode Episode { 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; }

3
src/NzbDrone.Core/Notifications/NotificationService.cs
View File

@ -240,8 +240,7 @@ namespace NzbDrone.Core.Notifications
Quality = message.Episode.ParsedEpisodeInfo.Quality, Quality = message.Episode.ParsedEpisodeInfo.Quality,
Episode = message.Episode, Episode = message.Episode,
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
}; };

4
src/NzbDrone.Core/Notifications/Webhook/WebhookBase.cs
View File

@ -175,8 +175,8 @@ namespace NzbDrone.Core.Notifications.Webhook
Series = new WebhookSeries(message.Series), Series = new WebhookSeries(message.Series),
Episodes = remoteEpisode.Episodes.ConvertAll(x => new WebhookEpisode(x)), Episodes = remoteEpisode.Episodes.ConvertAll(x => new WebhookEpisode(x)),
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(remoteEpisode.CustomFormats, remoteEpisode.CustomFormatScore), CustomFormatInfo = new WebhookCustomFormatInfo(remoteEpisode.CustomFormats, remoteEpisode.CustomFormatScore),
Release = new WebhookGrabbedRelease(message.Release) Release = new WebhookGrabbedRelease(message.Release)