From d61f119f8b6b6b37a87f848ed034ad66e5e74c09 Mon Sep 17 00:00:00 2001 From: Jendrik Weise Date: Sat, 26 Aug 2023 02:50:29 +0200 Subject: [PATCH] some updates, not yet switched to stdout --- .../MediaFiles/EpisodeImport/ImportApprovedEpisodes.cs | 3 ++- src/NzbDrone.Core/MediaFiles/ScriptImportDecider.cs | 7 ++++++- src/NzbDrone.Core/Parser/Model/LocalEpisode.cs | 1 + 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/NzbDrone.Core/MediaFiles/EpisodeImport/ImportApprovedEpisodes.cs b/src/NzbDrone.Core/MediaFiles/EpisodeImport/ImportApprovedEpisodes.cs index e956d7718..4e29da3da 100644 --- a/src/NzbDrone.Core/MediaFiles/EpisodeImport/ImportApprovedEpisodes.cs +++ b/src/NzbDrone.Core/MediaFiles/EpisodeImport/ImportApprovedEpisodes.cs @@ -142,7 +142,8 @@ namespace NzbDrone.Core.MediaFiles.EpisodeImport _extraService.MoveFilesAfterRename(localEpisode.Series, episodeFile); } } - else + + if (!localEpisode.ScriptImported || localEpisode.ShouldImportExtras) { _extraService.ImportEpisode(localEpisode, episodeFile, copyOnly); } diff --git a/src/NzbDrone.Core/MediaFiles/ScriptImportDecider.cs b/src/NzbDrone.Core/MediaFiles/ScriptImportDecider.cs index a80667a2b..1989f4f2c 100644 --- a/src/NzbDrone.Core/MediaFiles/ScriptImportDecider.cs +++ b/src/NzbDrone.Core/MediaFiles/ScriptImportDecider.cs @@ -187,7 +187,12 @@ namespace NzbDrone.Core.MediaFiles episodeFile.RelativePath = series.Path.GetRelativePath(destinationFilePath); episodeFile.Path = destinationFilePath; - switch (processOutput.ExitCode) + if ((processOutput.ExitCode & 0x4) == 0x4) + { + localEpisode.ShouldImportExtras = true; + } + + switch (processOutput.ExitCode & 0x3) { case 0: // Copy complete localEpisode.ScriptImported = true; diff --git a/src/NzbDrone.Core/Parser/Model/LocalEpisode.cs b/src/NzbDrone.Core/Parser/Model/LocalEpisode.cs index 8c595f8b4..283ca1189 100644 --- a/src/NzbDrone.Core/Parser/Model/LocalEpisode.cs +++ b/src/NzbDrone.Core/Parser/Model/LocalEpisode.cs @@ -42,6 +42,7 @@ namespace NzbDrone.Core.Parser.Model public GrabbedReleaseInfo Release { get; set; } public bool ScriptImported { get; set; } public bool ImportRenamed { get; set; } + public bool ShouldImportExtras { get; set; } public List PossibleExtraFiles { get; set; } public int SeasonNumber