Date added in Movie List & Possible Fix for Importing Movies. (#969)

* Is there a need to lazyload?

* Update dates in movie list

* additional check for moviefile lazy load

* lazyload not needed...
This commit is contained in:
Devin Buhl
2017-03-01 18:45:12 -05:00
committed by GitHub
parent 6432928b7d
commit 7122962dc8
3 changed files with 25 additions and 30 deletions
@@ -36,42 +36,29 @@ namespace NzbDrone.Core.MediaFiles
_logger = logger;
}
public MovieFileMoveResult UpgradeMovieFile(MovieFile episodeFile, LocalMovie localEpisode, bool copyOnly = false)
public MovieFileMoveResult UpgradeMovieFile(MovieFile movieFile, LocalMovie localMovie, bool copyOnly = false)
{
_logger.Trace("Upgrading existing episode file.");
_logger.Trace("Upgrading existing movie file.");
var moveFileResult = new MovieFileMoveResult();
localEpisode.Movie.MovieFile.LazyLoad();
var existingFile = localEpisode.Movie.MovieFile;
existingFile.LazyLoad();
if (existingFile.IsLoaded && existingFile.Value != null)
var existingFile = localMovie.Movie.MovieFile.Value;
var movieFilePath = Path.Combine(localMovie.Movie.Path, existingFile.RelativePath);
if (_diskProvider.FileExists(movieFilePath))
{
var file = existingFile.Value;
var episodeFilePath = Path.Combine(localEpisode.Movie.Path, file.RelativePath);
if (_diskProvider.FileExists(episodeFilePath))
{
_logger.Debug("Removing existing episode file: {0}", file);
_recycleBinProvider.DeleteFile(episodeFilePath);
}
moveFileResult.OldFiles.Add(file);
_mediaFileService.Delete(file, DeleteMediaFileReason.Upgrade);
}
else
{
//_logger.Warn("The existing movie file was not lazy loaded.");
_logger.Debug("Removing existing movie file: {0}", existingFile);
_recycleBinProvider.DeleteFile(movieFilePath);
}
moveFileResult.OldFiles.Add(existingFile);
_mediaFileService.Delete(existingFile, DeleteMediaFileReason.Upgrade);
if (copyOnly)
{
moveFileResult.MovieFile = _movieFileMover.CopyMovieFile(episodeFile, localEpisode);
moveFileResult.MovieFile = _movieFileMover.CopyMovieFile(movieFile, localMovie);
}
else
{
moveFileResult.MovieFile= _movieFileMover.MoveMovieFile(episodeFile, localEpisode);
moveFileResult.MovieFile = _movieFileMover.MoveMovieFile(movieFile, localMovie);
}
return moveFileResult;