From 50a5a2de9ba191b49eaed55652ccbf8c20cd02f6 Mon Sep 17 00:00:00 2001 From: Tim Turner Date: Thu, 26 Jan 2017 17:58:19 -0500 Subject: [PATCH] Movie reference properly updates UI now Still need to fix the 'Files' tab to be updated --- src/NzbDrone.Core/Extras/ExtraService.cs | 11 +++++++++++ .../MediaFiles/MovieFileMovingService.cs | 9 +++++++-- .../MediaFiles/RenameMovieFileService.cs | 3 ++- 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/src/NzbDrone.Core/Extras/ExtraService.cs b/src/NzbDrone.Core/Extras/ExtraService.cs index 012e8f921..85889ce44 100644 --- a/src/NzbDrone.Core/Extras/ExtraService.cs +++ b/src/NzbDrone.Core/Extras/ExtraService.cs @@ -123,6 +123,17 @@ namespace NzbDrone.Core.Extras // } //} + // TODO + public void Handle(MovieFolderCreatedEvent message) + { + var movie = message.Movie; + + foreach(var extraFileManager in _extraFileManagers) + { + //extraFileManager.CreateAfterMovieImport(movie, message.MovieFolder); + } + } + public void Handle(EpisodeFolderCreatedEvent message) { var series = message.Series; diff --git a/src/NzbDrone.Core/MediaFiles/MovieFileMovingService.cs b/src/NzbDrone.Core/MediaFiles/MovieFileMovingService.cs index 3f057a4d0..ad18e9c60 100644 --- a/src/NzbDrone.Core/MediaFiles/MovieFileMovingService.cs +++ b/src/NzbDrone.Core/MediaFiles/MovieFileMovingService.cs @@ -102,6 +102,8 @@ 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)) @@ -116,7 +118,10 @@ namespace NzbDrone.Core.MediaFiles _diskTransferService.TransferFile(movieFilePath, destinationFilePath, mode); - movieFile.RelativePath = movie.Path.GetRelativePathWithoutChildCheck(destinationFilePath); + var newMoviePath = new OsPath(destinationFilePath).Directory.FullPath.TrimEnd(Path.DirectorySeparatorChar); + movie.Path = newMoviePath; + + movieFile.RelativePath = movie.Path.GetRelativePath(destinationFilePath); _updateMovieFileService.ChangeFileDateForFile(movieFile, movie); @@ -157,7 +162,7 @@ namespace NzbDrone.Core.MediaFiles if (!_diskProvider.FolderExists(movieFolder)) { CreateFolder(movieFolder); - newEvent.SeriesFolder = movieFolder; + newEvent.MovieFolder = movieFolder; changed = true; } diff --git a/src/NzbDrone.Core/MediaFiles/RenameMovieFileService.cs b/src/NzbDrone.Core/MediaFiles/RenameMovieFileService.cs index 38036cf5a..4742922c4 100644 --- a/src/NzbDrone.Core/MediaFiles/RenameMovieFileService.cs +++ b/src/NzbDrone.Core/MediaFiles/RenameMovieFileService.cs @@ -95,6 +95,7 @@ namespace NzbDrone.Core.MediaFiles _movieFileMover.MoveMovieFile(movieFile, movie); _mediaFileService.Update(movieFile); + _movieService.UpdateMovie(movie); renamed.Add(movieFile); _logger.Debug("Renamed movie file: {0}", movieFile); @@ -123,7 +124,7 @@ namespace NzbDrone.Core.MediaFiles public void Execute(RenameMovieCommand message) { - _logger.Debug("Renaming all files for selected movie"); + _logger.Debug("Renaming all files for selected movies"); var moviesToRename = _movieService.GetMovies(message.MovieIds); foreach(var movie in moviesToRename)