From 99441dfa67aa00fd02a9ff198e574b10a0b48074 Mon Sep 17 00:00:00 2001 From: Jendrik Weise Date: Wed, 16 Aug 2023 21:56:44 +0200 Subject: [PATCH] Prevent exception when renaming after script import (cherry picked from commit 2166e4dce419ae477f2e4ce297bee2d8324a190e) Closes #9050 --- .../MediaFiles/MovieFileMovingService.cs | 26 +++++++------------ 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/src/NzbDrone.Core/MediaFiles/MovieFileMovingService.cs b/src/NzbDrone.Core/MediaFiles/MovieFileMovingService.cs index 3cc0af701..1fdcd0e7a 100644 --- a/src/NzbDrone.Core/MediaFiles/MovieFileMovingService.cs +++ b/src/NzbDrone.Core/MediaFiles/MovieFileMovingService.cs @@ -117,29 +117,23 @@ namespace NzbDrone.Core.MediaFiles throw new SameFilenameException("File not moved, source and destination are the same", movieFilePath); } - var transfer = true; - movieFile.RelativePath = movie.Path.GetRelativePath(destinationFilePath); - if (localMovie is not null) + if (localMovie is not null && _scriptImportDecider.TryImport(movieFilePath, destinationFilePath, localMovie, movieFile, mode) is var scriptImportDecision && scriptImportDecision != ScriptImportDecision.DeferMove) { - var scriptImportDecision = _scriptImportDecider.TryImport(movieFilePath, destinationFilePath, localMovie, movieFile, mode); - - switch (scriptImportDecision) + if (scriptImportDecision == ScriptImportDecision.RenameRequested) { - case ScriptImportDecision.DeferMove: - break; - case ScriptImportDecision.RenameRequested: + try + { MoveMovieFile(movieFile, movie); - transfer = false; - break; - case ScriptImportDecision.MoveComplete: - transfer = false; - break; + } + catch (SameFilenameException) + { + _logger.Debug("No rename was required. File already exists at destination."); + } } } - - if (transfer) + else { _diskTransferService.TransferFile(movieFilePath, destinationFilePath, mode); }