From 8f765b5880f2556df0724380177a65d85f415d1d Mon Sep 17 00:00:00 2001 From: Jendrik Weise Date: Sat, 19 Aug 2023 18:47:43 +0200 Subject: [PATCH] Simplify logic using pattern matching --- .../MediaFiles/EpisodeFileMovingService.cs | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/src/NzbDrone.Core/MediaFiles/EpisodeFileMovingService.cs b/src/NzbDrone.Core/MediaFiles/EpisodeFileMovingService.cs index 0445b7260..3ea8a9fc1 100644 --- a/src/NzbDrone.Core/MediaFiles/EpisodeFileMovingService.cs +++ b/src/NzbDrone.Core/MediaFiles/EpisodeFileMovingService.cs @@ -121,16 +121,10 @@ namespace NzbDrone.Core.MediaFiles throw new SameFilenameException("File not moved, source and destination are the same", episodeFilePath); } - var transfer = true; - episodeFile.RelativePath = series.Path.GetRelativePath(destinationFilePath); - if (localEpisode is not null) + if (localEpisode is not null && _scriptImportDecider.TryImport(episodeFilePath, destinationFilePath, localEpisode, episodeFile, mode) is var scriptImportDecision && scriptImportDecision != ScriptImportDecision.DeferMove) { - var scriptImportDecision = _scriptImportDecider.TryImport(episodeFilePath, destinationFilePath, localEpisode, episodeFile, mode); - - transfer = scriptImportDecision == ScriptImportDecision.DeferMove; - if (scriptImportDecision == ScriptImportDecision.RenameRequested) { try @@ -143,8 +137,7 @@ namespace NzbDrone.Core.MediaFiles } } } - - if (transfer) + else { _diskTransferService.TransferFile(episodeFilePath, destinationFilePath, mode); }