open-source-mirrors
/
Readarr
mirror of https://github.com/Readarr/Readarr
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update MB to GR for custom script and discord notifier

Browse Source 
Added GRIds to custom script and discord notifier
pull/587/head
nitsua 4 years ago committed by Qstick
parent c4167bdc78
commit 8633f0301e
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File

15
src/NzbDrone.Core/Notifications/CustomScript/CustomScript.cs
Unescape View File

@ -42,11 +42,12 @@ namespace NzbDrone.Core.Notifications.CustomScript
environmentVariables.Add("Readarr_EventType", "Grab"); environmentVariables.Add("Readarr_EventType", "Grab");
environmentVariables.Add("Readarr_Author_Id", author.Id.ToString()); environmentVariables.Add("Readarr_Author_Id", author.Id.ToString());
environmentVariables.Add("Readarr_Author_Name", author.Metadata.Value.Name); 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_BookCount", remoteBook.Books.Count.ToString());
environmentVariables.Add("Readarr_Release_BookReleaseDates", string.Join(",", remoteBook.Books.Select(e => e.ReleaseDate))); 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_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_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_Title", remoteBook.Release.Title);
environmentVariables.Add("Readarr_Release_Indexer", remoteBook.Release.Indexer ?? string.Empty); environmentVariables.Add("Readarr_Release_Indexer", remoteBook.Release.Indexer ?? string.Empty);
environmentVariables.Add("Readarr_Release_Size", remoteBook.Release.Size.ToString()); environmentVariables.Add("Readarr_Release_Size", remoteBook.Release.Size.ToString());
@ -69,17 +70,17 @@ namespace NzbDrone.Core.Notifications.CustomScript
environmentVariables.Add("Readarr_Author_Id", author.Id.ToString()); environmentVariables.Add("Readarr_Author_Id", author.Id.ToString());
environmentVariables.Add("Readarr_Author_Name", author.Metadata.Value.Name); environmentVariables.Add("Readarr_Author_Name", author.Metadata.Value.Name);
environmentVariables.Add("Readarr_Author_Path", author.Path); 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_Id", book.Id.ToString());
environmentVariables.Add("Readarr_Book_Title", book.Title); 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_Book_ReleaseDate", book.ReleaseDate.ToString());
environmentVariables.Add("Readarr_Download_Client", message.DownloadClient ?? string.Empty); environmentVariables.Add("Readarr_Download_Client", message.DownloadClient ?? string.Empty);
environmentVariables.Add("Readarr_Download_Id", message.DownloadId ?? string.Empty); environmentVariables.Add("Readarr_Download_Id", message.DownloadId ?? string.Empty);
if (message.BookFiles.Any()) 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()) if (message.OldFiles.Any())
@ -98,7 +99,7 @@ namespace NzbDrone.Core.Notifications.CustomScript
environmentVariables.Add("Readarr_Author_Id", author.Id.ToString()); environmentVariables.Add("Readarr_Author_Id", author.Id.ToString());
environmentVariables.Add("Readarr_Author_Name", author.Metadata.Value.Name); environmentVariables.Add("Readarr_Author_Name", author.Metadata.Value.Name);
environmentVariables.Add("Readarr_Author_Path", author.Path); 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); ExecuteScript(environmentVariables);
} }
@ -114,10 +115,10 @@ namespace NzbDrone.Core.Notifications.CustomScript
environmentVariables.Add("Readarr_Author_Id", author.Id.ToString()); environmentVariables.Add("Readarr_Author_Id", author.Id.ToString());
environmentVariables.Add("Readarr_Author_Name", author.Metadata.Value.Name); environmentVariables.Add("Readarr_Author_Name", author.Metadata.Value.Name);
environmentVariables.Add("Readarr_Author_Path", author.Path); 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_Id", book.Id.ToString());
environmentVariables.Add("Readarr_Book_Title", book.Title); 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_Book_ReleaseDate", book.ReleaseDate.ToString());
environmentVariables.Add("Readarr_BookFile_Id", bookFile.Id.ToString()); environmentVariables.Add("Readarr_BookFile_Id", bookFile.Id.ToString());
environmentVariables.Add("Readarr_BookFile_Path", bookFile.Path); environmentVariables.Add("Readarr_BookFile_Path", bookFile.Path);

9
src/NzbDrone.Core/Notifications/DiscordNotifier/DiscordNotifier.cs
Unescape View File

@ -30,11 +30,12 @@ namespace NzbDrone.Core.Notifications.DiscordNotifier
variables.Add("Readarr_EventType", "Grab"); variables.Add("Readarr_EventType", "Grab");
variables.Add("Readarr_Author_Id", author.Id.ToString()); variables.Add("Readarr_Author_Id", author.Id.ToString());
variables.Add("Readarr_Author_Name", author.Metadata.Value.Name); 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_BookCount", remoteBook.Books.Count.ToString());
variables.Add("Readarr_Release_BookReleaseDates", string.Join(",", remoteBook.Books.Select(e => e.ReleaseDate))); 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_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_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_Title", remoteBook.Release.Title);
variables.Add("Readarr_Release_Indexer", remoteBook.Release.Indexer ?? string.Empty); variables.Add("Readarr_Release_Indexer", remoteBook.Release.Indexer ?? string.Empty);
variables.Add("Readarr_Release_Size", remoteBook.Release.Size.ToString()); variables.Add("Readarr_Release_Size", remoteBook.Release.Size.ToString());
@ -57,17 +58,17 @@ namespace NzbDrone.Core.Notifications.DiscordNotifier
variables.Add("Readarr_Author_Id", author.Id.ToString()); variables.Add("Readarr_Author_Id", author.Id.ToString());
variables.Add("Readarr_Author_Name", author.Metadata.Value.Name); variables.Add("Readarr_Author_Name", author.Metadata.Value.Name);
variables.Add("Readarr_Author_Path", author.Path); 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_Id", book.Id.ToString());
variables.Add("Readarr_Book_Title", book.Title); 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_Book_ReleaseDate", book.ReleaseDate.ToString());
variables.Add("Readarr_Download_Client", message.DownloadClient ?? string.Empty); variables.Add("Readarr_Download_Client", message.DownloadClient ?? string.Empty);
variables.Add("Readarr_Download_Id", message.DownloadId ?? string.Empty); variables.Add("Readarr_Download_Id", message.DownloadId ?? string.Empty);
if (message.BookFiles.Any()) 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()) if (message.OldFiles.Any())

Write Preview
Loading…
Cancel
Save