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 accessors

Browse Source
This commit is contained in:
Matt Nadareski
2017-03-15 20:07:28 -07:00
parent 26d49d9e19
commit e7f3192476
11 changed files with 197 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
SabreTools.Helper/Dats/Partials/DatFile.DFD.cs
View File

@@ -151,7 +151,7 @@ namespace SabreTools.Helper.Dats
Globals.Logger.User("Cleaning temp folder");
if (tempDir != Path.GetTempPath())
{
FileTools.SafeTryDeleteDirectory(tempDir);
FileTools.TryDeleteDirectory(tempDir);
}
return true;
@@ -326,11 +326,11 @@ namespace SabreTools.Helper.Dats
// Cue to delete the file if it's a copy
if (copyFiles && item != newItem)
{
FileTools.SafeTryDeleteDirectory(newBasePath);
FileTools.TryDeleteDirectory(newBasePath);
}
// Delete the sub temp directory
FileTools.SafeTryDeleteDirectory(tempSubDir);
FileTools.TryDeleteDirectory(tempSubDir);
}
/// <summary>

20
SabreTools.Helper/Dats/Partials/DatFile.Parsers.cs
View File

@@ -226,7 +226,7 @@ namespace SabreTools.Helper.Dats
{
// Open a file reader
Encoding enc = Style.GetEncoding(filename);
StreamReader sr = new StreamReader(File.Open(filename, FileMode.Open, FileAccess.Read, FileShare.ReadWrite), enc);
StreamReader sr = new StreamReader(FileTools.TryOpenRead(filename), enc);
sr.ReadLine(); // Skip the first line since it's the header
while (!sr.EndOfStream)
@@ -317,7 +317,7 @@ namespace SabreTools.Helper.Dats
{
// Open a file reader
Encoding enc = Style.GetEncoding(filename);
StreamReader sr = new StreamReader(File.Open(filename, FileMode.Open, FileAccess.Read, FileShare.ReadWrite), enc);
StreamReader sr = new StreamReader(FileTools.TryOpenRead(filename), enc);
bool block = false, superdat = false;
string blockname = "", tempgamename = "", gamedesc = "", cloneof = "",
@@ -933,7 +933,7 @@ namespace SabreTools.Helper.Dats
{
// Open a file reader
Encoding enc = Style.GetEncoding(filename);
StreamReader sr = new StreamReader(File.Open(filename, FileMode.Open, FileAccess.Read, FileShare.ReadWrite), enc);
StreamReader sr = new StreamReader(FileTools.TryOpenRead(filename), enc);
// Create an empty list of columns to parse though
List<string> columns = new List<string>();
@@ -2441,7 +2441,7 @@ namespace SabreTools.Helper.Dats
{
// Open a file reader
Encoding enc = Style.GetEncoding(filename);
StreamReader sr = new StreamReader(File.Open(filename, FileMode.Open, FileAccess.Read, FileShare.ReadWrite), enc);
StreamReader sr = new StreamReader(FileTools.TryOpenRead(filename), enc);
while (!sr.EndOfStream)
{
@@ -2500,7 +2500,7 @@ namespace SabreTools.Helper.Dats
{
// Open a file reader
Encoding enc = Style.GetEncoding(filename);
StreamReader sr = new StreamReader(File.Open(filename, FileMode.Open, FileAccess.Read, FileShare.ReadWrite), enc);
StreamReader sr = new StreamReader(FileTools.TryOpenRead(filename), enc);
while (!sr.EndOfStream)
{
@@ -2559,7 +2559,7 @@ namespace SabreTools.Helper.Dats
{
// Open a file reader
Encoding enc = Style.GetEncoding(filename);
StreamReader sr = new StreamReader(File.Open(filename, FileMode.Open, FileAccess.Read, FileShare.ReadWrite), enc);
StreamReader sr = new StreamReader(FileTools.TryOpenRead(filename), enc);
while (!sr.EndOfStream)
{
@@ -2618,7 +2618,7 @@ namespace SabreTools.Helper.Dats
{
// Open a file reader
Encoding enc = Style.GetEncoding(filename);
StreamReader sr = new StreamReader(File.Open(filename, FileMode.Open, FileAccess.Read, FileShare.ReadWrite), enc);
StreamReader sr = new StreamReader(FileTools.TryOpenRead(filename), enc);
while (!sr.EndOfStream)
{
@@ -2677,7 +2677,7 @@ namespace SabreTools.Helper.Dats
{
// Open a file reader
Encoding enc = Style.GetEncoding(filename);
StreamReader sr = new StreamReader(File.Open(filename, FileMode.Open, FileAccess.Read, FileShare.ReadWrite), enc);
StreamReader sr = new StreamReader(FileTools.TryOpenRead(filename), enc);
while (!sr.EndOfStream)
{
@@ -2736,7 +2736,7 @@ namespace SabreTools.Helper.Dats
{
// Open a file reader
Encoding enc = Style.GetEncoding(filename);
StreamReader sr = new StreamReader(File.Open(filename, FileMode.Open, FileAccess.Read, FileShare.ReadWrite), enc);
StreamReader sr = new StreamReader(FileTools.TryOpenRead(filename), enc);
while (!sr.EndOfStream)
{
@@ -2797,7 +2797,7 @@ namespace SabreTools.Helper.Dats
{
// Open a file reader
Encoding enc = Style.GetEncoding(filename);
StreamReader sr = new StreamReader(File.Open(filename, FileMode.Open, FileAccess.Read, FileShare.ReadWrite), enc);
StreamReader sr = new StreamReader(FileTools.TryOpenRead(filename), enc);
string blocktype = "";
while (!sr.EndOfStream)

6
SabreTools.Helper/Dats/Partials/DatFile.Rebuild.cs
View File

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

10
SabreTools.Helper/Dats/Partials/DatFile.Statistics.cs
View File

@@ -11,8 +11,6 @@ using System.IO;
#else
using Alphaleonis.Win32.Filesystem;
using FileAccess = System.IO.FileAccess;
using FileMode = System.IO.FileMode;
using SearchOption = System.IO.SearchOption;
using StreamWriter = System.IO.StreamWriter;
#endif
@@ -512,7 +510,7 @@ Please check the log folder if the stats scrolled offscreen", false);
Path.Combine(outDir, reportName);
// Create the StreamWriter for this file
output.Add(StatDatFormat.None, new StreamWriter(File.Open(reportName, FileMode.Create, FileAccess.Write)));
output.Add(StatDatFormat.None, new StreamWriter(FileTools.TryCreate(reportName)));
}
if ((statDatFormat & StatDatFormat.CSV) != 0)
{
@@ -520,7 +518,7 @@ Please check the log folder if the stats scrolled offscreen", false);
Path.Combine(outDir, reportName);
// Create the StreamWriter for this file
output.Add(StatDatFormat.CSV, new StreamWriter(File.Open(reportName, FileMode.Create, FileAccess.Write)));
output.Add(StatDatFormat.CSV, new StreamWriter(FileTools.TryCreate(reportName)));
}
if ((statDatFormat & StatDatFormat.HTML) != 0)
{
@@ -528,7 +526,7 @@ Please check the log folder if the stats scrolled offscreen", false);
Path.Combine(outDir, reportName);
// Create the StreamWriter for this file
output.Add(StatDatFormat.HTML, new StreamWriter(File.Open(reportName, FileMode.Create, FileAccess.Write)));
output.Add(StatDatFormat.HTML, new StreamWriter(FileTools.TryCreate(reportName)));
}
if ((statDatFormat & StatDatFormat.TSV) != 0)
{
@@ -536,7 +534,7 @@ Please check the log folder if the stats scrolled offscreen", false);
Path.Combine(outDir, reportName);
// Create the StreamWriter for this file
output.Add(StatDatFormat.TSV, new StreamWriter(File.Open(reportName, FileMode.Create, FileAccess.Write)));
output.Add(StatDatFormat.TSV, new StreamWriter(FileTools.TryCreate(reportName)));
}
return output;