From 8633f0301ef9c97672a1d408e2670b1d40d4bcf4 Mon Sep 17 00:00:00 2001 From: nitsua Date: Thu, 29 Oct 2020 18:16:30 -0400 Subject: [PATCH] Update MB to GR for custom script and discord notifier Added GRIds to custom script and discord notifier --- .../Notifications/CustomScript/CustomScript.cs | 15 ++++++++------- .../DiscordNotifier/DiscordNotifier.cs | 9 +++++---- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/src/NzbDrone.Core/Notifications/CustomScript/CustomScript.cs b/src/NzbDrone.Core/Notifications/CustomScript/CustomScript.cs index 6749491f6..800cc5322 100644 --- a/src/NzbDrone.Core/Notifications/CustomScript/CustomScript.cs +++ b/src/NzbDrone.Core/Notifications/CustomScript/CustomScript.cs @@ -42,11 +42,12 @@ public override void OnGrab(GrabMessage message) environmentVariables.Add("Readarr_EventType", "Grab"); environmentVariables.Add("Readarr_Author_Id", author.Id.ToString()); environmentVariables.Add("Readarr_Author_Name", author.Metadata.Value.Name); - environmentVariables.Add("Readarr_Author_MBId", author.Metadata.Value.ForeignAuthorId); + environmentVariables.Add("Readarr_Author_GRId", author.Metadata.Value.ForeignAuthorId); environmentVariables.Add("Readarr_Release_BookCount", remoteBook.Books.Count.ToString()); environmentVariables.Add("Readarr_Release_BookReleaseDates", string.Join(",", remoteBook.Books.Select(e => e.ReleaseDate))); environmentVariables.Add("Readarr_Release_BookTitles", string.Join("|", remoteBook.Books.Select(e => e.Title))); environmentVariables.Add("Readarr_Release_BookIds", string.Join("|", remoteBook.Books.Select(e => e.Id.ToString()))); + environmentVariables.Add("Readarr_Release_GRIds", string.Join("|", remoteBook.Books.Select(e => e.ForeignBookId.ToString()))); environmentVariables.Add("Readarr_Release_Title", remoteBook.Release.Title); environmentVariables.Add("Readarr_Release_Indexer", remoteBook.Release.Indexer ?? string.Empty); environmentVariables.Add("Readarr_Release_Size", remoteBook.Release.Size.ToString()); @@ -69,17 +70,17 @@ public override void OnReleaseImport(BookDownloadMessage message) environmentVariables.Add("Readarr_Author_Id", author.Id.ToString()); environmentVariables.Add("Readarr_Author_Name", author.Metadata.Value.Name); environmentVariables.Add("Readarr_Author_Path", author.Path); - environmentVariables.Add("Readarr_Author_MBId", author.Metadata.Value.ForeignAuthorId); + environmentVariables.Add("Readarr_Author_GRId", author.Metadata.Value.ForeignAuthorId); environmentVariables.Add("Readarr_Book_Id", book.Id.ToString()); environmentVariables.Add("Readarr_Book_Title", book.Title); - environmentVariables.Add("Readarr_Book_MBId", book.ForeignBookId); + environmentVariables.Add("Readarr_Book_GRId", book.ForeignBookId); environmentVariables.Add("Readarr_Book_ReleaseDate", book.ReleaseDate.ToString()); environmentVariables.Add("Readarr_Download_Client", message.DownloadClient ?? string.Empty); environmentVariables.Add("Readarr_Download_Id", message.DownloadId ?? string.Empty); if (message.BookFiles.Any()) { - environmentVariables.Add("Readarr_AddedFilePaths", string.Join("|", message.BookFiles.Select(e => e.Path))); + environmentVariables.Add("Readarr_AddedBookPaths", string.Join("|", message.BookFiles.Select(e => e.Path))); } if (message.OldFiles.Any()) @@ -98,7 +99,7 @@ public override void OnRename(Author author) environmentVariables.Add("Readarr_Author_Id", author.Id.ToString()); environmentVariables.Add("Readarr_Author_Name", author.Metadata.Value.Name); environmentVariables.Add("Readarr_Author_Path", author.Path); - environmentVariables.Add("Readarr_Author_MBId", author.Metadata.Value.ForeignAuthorId); + environmentVariables.Add("Readarr_Author_GRId", author.Metadata.Value.ForeignAuthorId); ExecuteScript(environmentVariables); } @@ -114,10 +115,10 @@ public override void OnBookRetag(BookRetagMessage message) environmentVariables.Add("Readarr_Author_Id", author.Id.ToString()); environmentVariables.Add("Readarr_Author_Name", author.Metadata.Value.Name); environmentVariables.Add("Readarr_Author_Path", author.Path); - environmentVariables.Add("Readarr_Author_MBId", author.Metadata.Value.ForeignAuthorId); + environmentVariables.Add("Readarr_Author_GRId", author.Metadata.Value.ForeignAuthorId); environmentVariables.Add("Readarr_Book_Id", book.Id.ToString()); environmentVariables.Add("Readarr_Book_Title", book.Title); - environmentVariables.Add("Readarr_Book_MBId", book.ForeignBookId); + environmentVariables.Add("Readarr_Book_GRId", book.ForeignBookId); environmentVariables.Add("Readarr_Book_ReleaseDate", book.ReleaseDate.ToString()); environmentVariables.Add("Readarr_BookFile_Id", bookFile.Id.ToString()); environmentVariables.Add("Readarr_BookFile_Path", bookFile.Path); diff --git a/src/NzbDrone.Core/Notifications/DiscordNotifier/DiscordNotifier.cs b/src/NzbDrone.Core/Notifications/DiscordNotifier/DiscordNotifier.cs index e95fcb34f..e0ce8bee4 100644 --- a/src/NzbDrone.Core/Notifications/DiscordNotifier/DiscordNotifier.cs +++ b/src/NzbDrone.Core/Notifications/DiscordNotifier/DiscordNotifier.cs @@ -30,11 +30,12 @@ public override void OnGrab(GrabMessage message) variables.Add("Readarr_EventType", "Grab"); variables.Add("Readarr_Author_Id", author.Id.ToString()); variables.Add("Readarr_Author_Name", author.Metadata.Value.Name); - variables.Add("Readarr_Author_MBId", author.Metadata.Value.ForeignAuthorId); + variables.Add("Readarr_Author_GRId", author.Metadata.Value.ForeignAuthorId); variables.Add("Readarr_Release_BookCount", remoteBook.Books.Count.ToString()); variables.Add("Readarr_Release_BookReleaseDates", string.Join(",", remoteBook.Books.Select(e => e.ReleaseDate))); variables.Add("Readarr_Release_BookTitles", string.Join("|", remoteBook.Books.Select(e => e.Title))); variables.Add("Readarr_Release_BookIds", string.Join("|", remoteBook.Books.Select(e => e.Id.ToString()))); + variables.Add("Readarr_Release_GRIds", string.Join("|", remoteBook.Books.Select(e => e.ForeignBookId.ToString()))); variables.Add("Readarr_Release_Title", remoteBook.Release.Title); variables.Add("Readarr_Release_Indexer", remoteBook.Release.Indexer ?? string.Empty); variables.Add("Readarr_Release_Size", remoteBook.Release.Size.ToString()); @@ -57,17 +58,17 @@ public override void OnReleaseImport(BookDownloadMessage message) variables.Add("Readarr_Author_Id", author.Id.ToString()); variables.Add("Readarr_Author_Name", author.Metadata.Value.Name); variables.Add("Readarr_Author_Path", author.Path); - variables.Add("Readarr_Author_MBId", author.Metadata.Value.ForeignAuthorId); + variables.Add("Readarr_Author_GRId", author.Metadata.Value.ForeignAuthorId); variables.Add("Readarr_Book_Id", book.Id.ToString()); variables.Add("Readarr_Book_Title", book.Title); - variables.Add("Readarr_Book_MBId", book.ForeignBookId); + variables.Add("Readarr_Book_GRId", book.ForeignBookId); variables.Add("Readarr_Book_ReleaseDate", book.ReleaseDate.ToString()); variables.Add("Readarr_Download_Client", message.DownloadClient ?? string.Empty); variables.Add("Readarr_Download_Id", message.DownloadId ?? string.Empty); if (message.BookFiles.Any()) { - variables.Add("Readarr_AddedTrackPaths", string.Join("|", message.BookFiles.Select(e => e.Path))); + variables.Add("Readarr_AddedBookPaths", string.Join("|", message.BookFiles.Select(e => e.Path))); } if (message.OldFiles.Any())