mirror/Sonarr
1
0
Fork 0
mirror of https://github.com/Sonarr/Sonarr synced 2025-01-18 13:23:51 +00:00
Code Issues Releases Wiki Activity

Tweaked error message when TransferFile destination already exists.

Browse source
This commit is contained in:
Taloth Saldono 2017-07-29 15:34:23 +02:00
parent e16e4091f1
commit f91e1a3576
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/NzbDrone.Common/Disk/DiskTransferService.cs
View file

@ -223,7 +223,7 @@ namespace NzbDrone.Common.Disk
_diskProvider.MoveFile(sourcePath, tempPath, true); _diskProvider.MoveFile(sourcePath, tempPath, true);
try try
{ {
ClearTargetPath(targetPath, overwrite); ClearTargetPath(sourcePath, targetPath, overwrite);
_diskProvider.MoveFile(tempPath, targetPath); _diskProvider.MoveFile(tempPath, targetPath);
@ -253,7 +253,7 @@ namespace NzbDrone.Common.Disk
throw new IOException(string.Format("Destination cannot be a child of the source [{0}] => [{1}]", sourcePath, targetPath)); throw new IOException(string.Format("Destination cannot be a child of the source [{0}] => [{1}]", sourcePath, targetPath));
} }
ClearTargetPath(targetPath, overwrite); ClearTargetPath(sourcePath, targetPath, overwrite);
if (mode.HasFlag(TransferMode.HardLink)) if (mode.HasFlag(TransferMode.HardLink))
{ {
@ -330,7 +330,7 @@ namespace NzbDrone.Common.Disk
return TransferMode.None; return TransferMode.None;
} }
private void ClearTargetPath(string targetPath, bool overwrite) private void ClearTargetPath(string sourcePath, string targetPath, bool overwrite)
{ {
if (_diskProvider.FileExists(targetPath)) if (_diskProvider.FileExists(targetPath))
{ {
@ -340,7 +340,7 @@ namespace NzbDrone.Common.Disk
} }
else else
{ {
throw new IOException(string.Format("Destination already exists [{0}]", targetPath)); throw new IOException(string.Format("Destination already exists. [{0}] to [{1}]", sourcePath, targetPath));
} }
} }
} }