From 2700a6cf8a5b7a9ce61582d471a45ebda35eab69 Mon Sep 17 00:00:00 2001 From: Bogdan Date: Tue, 27 Aug 2024 02:11:31 +0300 Subject: [PATCH] Fixed: Paths for renamed movie files in Custom Script and Webhook Closes #10359 --- src/NzbDrone.Core/Notifications/CustomScript/CustomScript.cs | 2 +- src/NzbDrone.Core/Notifications/Webhook/WebhookMovieFile.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/NzbDrone.Core/Notifications/CustomScript/CustomScript.cs b/src/NzbDrone.Core/Notifications/CustomScript/CustomScript.cs index 13a0e8765..49cc0c734 100755 --- a/src/NzbDrone.Core/Notifications/CustomScript/CustomScript.cs +++ b/src/NzbDrone.Core/Notifications/CustomScript/CustomScript.cs @@ -172,7 +172,7 @@ namespace NzbDrone.Core.Notifications.CustomScript environmentVariables.Add("Radarr_Movie_Physical_Release_Date", movie.MovieMetadata.Value.PhysicalRelease.ToString() ?? string.Empty); environmentVariables.Add("Radarr_MovieFile_Ids", string.Join(",", renamedFiles.Select(e => e.MovieFile.Id))); environmentVariables.Add("Radarr_MovieFile_RelativePaths", string.Join("|", renamedFiles.Select(e => e.MovieFile.RelativePath))); - environmentVariables.Add("Radarr_MovieFile_Paths", string.Join("|", renamedFiles.Select(e => e.MovieFile.Path))); + environmentVariables.Add("Radarr_MovieFile_Paths", string.Join("|", renamedFiles.Select(e => Path.Combine(movie.Path, e.MovieFile.RelativePath)))); environmentVariables.Add("Radarr_MovieFile_PreviousRelativePaths", string.Join("|", renamedFiles.Select(e => e.PreviousRelativePath))); environmentVariables.Add("Radarr_MovieFile_PreviousPaths", string.Join("|", renamedFiles.Select(e => e.PreviousPath))); diff --git a/src/NzbDrone.Core/Notifications/Webhook/WebhookMovieFile.cs b/src/NzbDrone.Core/Notifications/Webhook/WebhookMovieFile.cs index baf00a365..769777cf5 100755 --- a/src/NzbDrone.Core/Notifications/Webhook/WebhookMovieFile.cs +++ b/src/NzbDrone.Core/Notifications/Webhook/WebhookMovieFile.cs @@ -13,7 +13,7 @@ namespace NzbDrone.Core.Notifications.Webhook { Id = movieFile.Id; RelativePath = movieFile.RelativePath; - Path = movieFile.Path; + Path = System.IO.Path.Combine(movieFile.Movie.Path, movieFile.RelativePath); Quality = movieFile.Quality.Quality.Name; QualityVersion = movieFile.Quality.Revision.Version; ReleaseGroup = movieFile.ReleaseGroup;