Backup_Repos/Radarr
1
0
Fork 0
mirror of https://github.com/Radarr/Radarr synced 2025-12-21 07:43:36 +01:00
Code Issues Projects Releases Wiki Activity

Move folder on rename; event doesn't fire yet

Browse source
This commit is contained in:
Tim Turner 2017-01-21 17:20:30 -05:00
parent a691ffa7b7
commit f9923f4592
2 changed files with 32 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/NzbDrone.Core/MediaFiles/MovieFileMovingService.cs
View file

@ -60,7 +60,7 @@ public MovieFile MoveMovieFile(MovieFile movieFile, Movie movie)
var newFileName = _buildFileNames.BuildFileName(movie, movieFile);
var filePath = _buildFileNames.BuildFilePath(movie, newFileName, Path.GetExtension(movieFile.RelativePath));
EnsureMovieFolder(movieFile, movie, filePath);
filePath = EnsureMovieFolder(movieFile, movie, filePath);
_logger.Debug("Renaming movie file: {0} to {1}", movieFile, filePath);
@ -72,7 +72,7 @@ public MovieFile MoveMovieFile(MovieFile movieFile, LocalMovie localMovie)
var newFileName = _buildFileNames.BuildFileName(localMovie.Movie, movieFile);
var filePath = _buildFileNames.BuildFilePath(localMovie.Movie, newFileName, Path.GetExtension(localMovie.Path));
EnsureMovieFolder(movieFile, localMovie, filePath);
filePath = EnsureMovieFolder(movieFile, localMovie, filePath);
_logger.Debug("Moving movie file: {0} to {1}", movieFile.Path, filePath);
@ -84,7 +84,7 @@ public MovieFile CopyMovieFile(MovieFile movieFile, LocalMovie localMovie)
var newFileName = _buildFileNames.BuildFileName(localMovie.Movie, movieFile);
var filePath = _buildFileNames.BuildFilePath(localMovie.Movie, newFileName, Path.GetExtension(localMovie.Path));
EnsureMovieFolder(movieFile, localMovie, filePath);
filePath = EnsureMovieFolder(movieFile, localMovie, filePath);
if (_configService.CopyUsingHardlinks)
{
@ -135,15 +135,17 @@ private MovieFile TransferFile(MovieFile movieFile, Movie movie, string destinat
return movieFile;
}
private void EnsureMovieFolder(MovieFile movieFile, LocalMovie localMovie, string filePath)
private string EnsureMovieFolder(MovieFile movieFile, LocalMovie localMovie, string filePath)
{
EnsureMovieFolder(movieFile, localMovie.Movie, filePath);
return EnsureMovieFolder(movieFile, localMovie.Movie, filePath);
}
private void EnsureMovieFolder(MovieFile movieFile, Movie movie, string filePath)
private string EnsureMovieFolder(MovieFile movieFile, Movie movie, string filePath)
{
var movieFolder = Path.GetDirectoryName(filePath);
var rootFolder = new OsPath(movieFolder).Directory.FullPath;
var fileName = Path.GetFileName(filePath);
var newPath = "";
if (!_diskProvider.FolderExists(rootFolder))
{
@ -157,6 +159,18 @@ private void EnsureMovieFolder(MovieFile movieFile, Movie movie, string filePath
{
CreateFolder(movieFolder);
newEvent.SeriesFolder = movieFolder;
newPath = Path.Combine(rootFolder, movieFolder, fileName);
changed = true;
}
var newFolder = _buildFileNames.GetMovieFolder(movie);
if(_diskProvider.FolderExists(movieFolder) && movieFolder != newFolder)
{
newFolder = Path.Combine(rootFolder, newFolder);
CreateFolder(newFolder);
newEvent.SeriesFolder = newFolder;
newPath = Path.Combine(newFolder, fileName);
changed = true;
}
@ -164,6 +178,8 @@ private void EnsureMovieFolder(MovieFile movieFile, Movie movie, string filePath
{
_eventAggregator.PublishEvent(newEvent);
}
return newPath;
}
private void CreateFolder(string directoryName)

10
src/NzbDrone.Core/MediaFiles/RenameMovieFileService.cs
View file

@ -80,6 +80,16 @@ private IEnumerable<RenameMovieFilePreview> GetPreviews(Movie movie, List<MovieF
}
private void RenameMovieFiles(List<MovieFile> movieFiles, Movie movie)
{
}
private void RenameFolder(Movie movie)
{
}
private void RenameFiles(List<MovieFile> movieFiles, Movie movie)
{
var renamed = new List<MovieFile>();