From a8eec60c9d8687c118fc825e92d3ec39c9312403 Mon Sep 17 00:00:00 2001 From: Tim Turner Date: Thu, 26 Jan 2017 19:57:31 -0500 Subject: [PATCH] Remove old folder and all contents --- src/NzbDrone.Core/MediaFiles/MovieFileMovingService.cs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/NzbDrone.Core/MediaFiles/MovieFileMovingService.cs b/src/NzbDrone.Core/MediaFiles/MovieFileMovingService.cs index ad18e9c60..c5a751420 100644 --- a/src/NzbDrone.Core/MediaFiles/MovieFileMovingService.cs +++ b/src/NzbDrone.Core/MediaFiles/MovieFileMovingService.cs @@ -102,8 +102,6 @@ namespace NzbDrone.Core.MediaFiles Ensure.That(movie,() => movie).IsNotNull(); Ensure.That(destinationFilePath, () => destinationFilePath).IsValidPath(); - - var movieFilePath = movieFile.Path ?? Path.Combine(movie.Path, movieFile.RelativePath); if (!_diskProvider.FileExists(movieFilePath)) @@ -118,6 +116,9 @@ namespace NzbDrone.Core.MediaFiles _diskTransferService.TransferFile(movieFilePath, destinationFilePath, mode); + var oldMoviePath = new OsPath(movieFilePath).Directory.FullPath.TrimEnd(Path.DirectorySeparatorChar); + + var newMoviePath = new OsPath(destinationFilePath).Directory.FullPath.TrimEnd(Path.DirectorySeparatorChar); movie.Path = newMoviePath; @@ -137,6 +138,8 @@ namespace NzbDrone.Core.MediaFiles _mediaFileAttributeService.SetFilePermissions(destinationFilePath); + _diskProvider.DeleteFolder(oldMoviePath, true); + return movieFile; }