claunia/SabreTools
1
0
Fork 0
mirror of https://github.com/claunia/SabreTools.git synced 2025-12-16 19:14:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

[FileTools] Create and use safe file/directory delete

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

32
SabreTools.Helper/Tools/ArchiveTools.cs
View File

@@ -1290,7 +1290,7 @@ namespace SabreTools.Helper.Tools
// If the old file exists, delete it and replace
if (File.Exists(archiveFileName))
{
File.Delete(archiveFileName);
FileTools.SafeTryDeleteFile(archiveFileName);
}
File.Move(tempFile, archiveFileName);
@@ -1402,11 +1402,7 @@ namespace SabreTools.Helper.Tools
}
FileTools.CleanDirectory(tempPath);
try
{
Directory.Delete(tempPath);
}
catch { }
FileTools.SafeTryDeleteDirectory(tempPath);
}
// Otherwise, sort the input files and write out in the correct order
@@ -1474,11 +1470,7 @@ namespace SabreTools.Helper.Tools
zipFile.CompressFiles(zipFileStream, inputFiles[index]);
oldZipFileEntryStream.Dispose();
try
{
File.Delete(inputFiles[index]);
}
catch { }
FileTools.SafeTryDeleteFile(inputFiles[index]);
}
}
@@ -1497,7 +1489,7 @@ namespace SabreTools.Helper.Tools
// If the old file exists, delete it and replace
if (File.Exists(archiveFileName))
{
File.Delete(archiveFileName);
FileTools.SafeTryDeleteFile(archiveFileName);
}
File.Move(tempFile, archiveFileName);
@@ -1785,11 +1777,7 @@ namespace SabreTools.Helper.Tools
}
FileTools.CleanDirectory(tempPath);
try
{
Directory.Delete(tempPath);
}
catch { }
FileTools.SafeTryDeleteDirectory(tempPath);
}
// Otherwise, sort the input files and write out in the correct order
@@ -1857,11 +1845,7 @@ namespace SabreTools.Helper.Tools
zipFile.CompressFiles(zipFileStream, inputFiles[index]);
oldZipFileEntryStream.Dispose();
try
{
File.Delete(inputFiles[index]);
}
catch { }
FileTools.SafeTryDeleteFile(inputFiles[index]);
}
}
@@ -1880,7 +1864,7 @@ namespace SabreTools.Helper.Tools
// If the old file exists, delete it and replace
if (File.Exists(archiveFileName))
{
File.Delete(archiveFileName);
FileTools.SafeTryDeleteFile(archiveFileName);
}
File.Move(tempFile, archiveFileName);
@@ -2146,7 +2130,7 @@ namespace SabreTools.Helper.Tools
// If the old file exists, delete it and replace
if (File.Exists(archiveFileName))
{
File.Delete(archiveFileName);
FileTools.SafeTryDeleteFile(archiveFileName);
}
File.Move(tempFile, archiveFileName);