mirror
/
Lidarr
mirror of https://github.com/lidarr/Lidarr
1
0
Fork 0
Code Issues Releases Wiki Activity

Sonarr DiskTransferService Updates (#78) 

* Added a few more files to ignore during file copy.

* Tweaked error message when TransferFile destination already exists.
This commit is contained in:
Qstick 2017-08-31 21:46:30 -04:00 committed by GitHub
parent b0cde61dd0
commit a292f77aa8
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
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));
} }
} }
} }
@ -590,7 +590,7 @@ namespace NzbDrone.Common.Disk
private bool ShouldIgnore(FileInfo file) private bool ShouldIgnore(FileInfo file)
{ {
if (file.Name.StartsWith(".nfs")) if (file.Name.StartsWith(".nfs") || file.Name == "debug.log" || file.Name.EndsWith(".socket"))
{ {
_logger.Trace("Ignoring file {0}", file.FullName); _logger.Trace("Ignoring file {0}", file.FullName);
return true; return true;