Archive-Team
/
sonarr-repo-only
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not try to rename files if the source and destination path are the same.

This commit is contained in:
markus101 2011-02-23 17:41:18 -08:00
parent 9ffe8ea4cd
commit b5c7135d24
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
NzbDrone.Core/Providers/RenameProvider.cs
View File

@ -139,27 +139,30 @@ namespace NzbDrone.Core.Providers
} }
} }
private void RenameFile(EpisodeRenameModel episodeRenameModel) private void RenameFile(EpisodeRenameModel erm)
{ {
try try
{ {
//Update EpisodeFile if successful //Update EpisodeFile if successful
Logger.Debug("Renaming Episode: {0}", Path.GetFileName(episodeRenameModel.EpisodeFile.Path)); Logger.Debug("Renaming Episode: {0}", Path.GetFileName(erm.EpisodeFile.Path));
var newName = GetNewName(episodeRenameModel); var newName = GetNewName(erm);
var newFilename = episodeRenameModel.Folder + Path.DirectorySeparatorChar + newName; var newFilename = erm.Folder + Path.DirectorySeparatorChar + newName;
if (!_diskProvider.FolderExists(episodeRenameModel.Folder)) if (!_diskProvider.FolderExists(erm.Folder))
_diskProvider.CreateDirectory(episodeRenameModel.Folder); _diskProvider.CreateDirectory(erm.Folder);
_diskProvider.RenameFile(episodeRenameModel.EpisodeFile.Path, newFilename); if (erm.EpisodeFile.Path == newFilename)
episodeRenameModel.EpisodeFile.Path = newFilename; return;
_mediaFileProvider.Update(episodeRenameModel.EpisodeFile);
_diskProvider.RenameFile(erm.EpisodeFile.Path, newFilename);
erm.EpisodeFile.Path = newFilename;
_mediaFileProvider.Update(erm.EpisodeFile);
} }
catch (Exception ex) catch (Exception ex)
{ {
Logger.DebugException(ex.Message, ex); Logger.DebugException(ex.Message, ex);
Logger.Warn("Unable to Rename Episode: {0}", Path.GetFileName(episodeRenameModel.EpisodeFile.Path)); Logger.Warn("Unable to Rename Episode: {0}", Path.GetFileName(erm.EpisodeFile.Path));
} }
} }
@ -186,7 +189,5 @@ namespace NzbDrone.Core.Providers
return String.Format("{0} - S{1:00}E{2} - {3}", erm.SeriesName, erm.EpisodeFile.Episodes[0].SeasonNumber, return String.Format("{0} - S{1:00}E{2} - {3}", erm.SeriesName, erm.EpisodeFile.Episodes[0].SeasonNumber,
epNumberString, epNameString); epNumberString, epNameString);
} }
} }
} }