[FileTools] Create and use safe file/directory delete

This commit is contained in:
Matt Nadareski
2017-03-15 14:44:44 -07:00
parent 0995718106
commit 26d49d9e19
6 changed files with 88 additions and 73 deletions

View File

@@ -447,7 +447,7 @@ namespace SabreTools.Helper.Dats
try
{
Globals.Logger.Verbose("Attempting to delete input file '" + file + "'");
File.Delete(file);
FileTools.SafeTryDeleteFile(file, true);
Globals.Logger.Verbose("File '" + file + "' deleted");
}
catch (Exception ex)
@@ -457,11 +457,7 @@ namespace SabreTools.Helper.Dats
}
// Now delete the temp directory
try
{
Directory.Delete(tempSubDir, true);
}
catch { }
FileTools.SafeTryDeleteDirectory(tempSubDir);
}
/// <summary>
@@ -768,11 +764,7 @@ namespace SabreTools.Helper.Dats
// And now clear the temp folder to get rid of any transient files if we unzipped
if (isZip)
{
try
{
Directory.Delete(tempDir, true);
}
catch { }
FileTools.SafeTryDeleteDirectory(tempDir);
}
return rebuilt;