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

A bit more logging for delete file (in recycle bin)

This commit is contained in:
Mark McDowall 2013-07-30 02:09:48 +02:00
parent 17d5895957
commit 60177abf51
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
NzbDrone.Common/DiskProvider.cs
View File

@ -38,6 +38,7 @@ namespace NzbDrone.Common
string GetPathRoot(string path); string GetPathRoot(string path);
void SetPermissions(string filename, string account, FileSystemRights Rights, AccessControlType ControlType); void SetPermissions(string filename, string account, FileSystemRights Rights, AccessControlType ControlType);
bool IsParent(string parentfolder, string subfolder); bool IsParent(string parentfolder, string subfolder);
FileAttributes GetFileAttributes(string path);
} }
public class DiskProvider : IDiskProvider public class DiskProvider : IDiskProvider
@ -112,7 +113,6 @@ namespace NzbDrone.Common
return FolderExists(path); return FolderExists(path);
} }
public virtual bool FileExists(string path) public virtual bool FileExists(string path)
{ {
Ensure.That(() => path).IsValidPath(); Ensure.That(() => path).IsValidPath();
@ -438,5 +438,10 @@ namespace NzbDrone.Common
return false; return false;
} }
public FileAttributes GetFileAttributes(string path)
{
return File.GetAttributes(path);
}
} }
} }

7
NzbDrone.Core/MediaFiles/RecycleBinProvider.cs
View File

@ -2,6 +2,7 @@
using System.IO; using System.IO;
using NLog; using NLog;
using NzbDrone.Common; using NzbDrone.Common;
using NzbDrone.Common.EnvironmentInfo;
using NzbDrone.Common.Messaging; using NzbDrone.Common.Messaging;
using NzbDrone.Core.Configuration; using NzbDrone.Core.Configuration;
using NzbDrone.Core.MediaFiles.Commands; using NzbDrone.Core.MediaFiles.Commands;
@ -68,6 +69,12 @@ namespace NzbDrone.Core.MediaFiles
if (String.IsNullOrWhiteSpace(recyclingBin)) if (String.IsNullOrWhiteSpace(recyclingBin))
{ {
logger.Info("Recycling Bin has not been configured, deleting permanently."); logger.Info("Recycling Bin has not been configured, deleting permanently.");
if (!OsInfo.IsLinux)
{
logger.Trace(_diskProvider.GetFileAttributes(path));
}
_diskProvider.DeleteFile(path); _diskProvider.DeleteFile(path);
logger.Trace("File has been permanently deleted: {0}", path); logger.Trace("File has been permanently deleted: {0}", path);
} }