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

[SimpleSort] Make the user experience better

Browse Source
This commit is contained in:
Matt Nadareski
2016-06-22 21:44:58 -07:00
parent c3e55b7334
commit b943fee50d
1 changed files with 25 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
SimpleSort/SimpleSort.cs
View File

@@ -281,15 +281,14 @@ namespace SabreTools
Output.CleanDirectory(_tempdir); Output.CleanDirectory(_tempdir);
} }
// Then, loop through and check each of the inputs // Create a list of just files from inputs
_logger.User("Starting to loop through inputs"); List<string> files = new List<string>();
foreach (string input in _inputs) foreach (string input in _inputs)
{ {
if (File.Exists(input)) if (File.Exists(input))
{ {
_logger.Log("File found: '" + input + "'"); _logger.Log("File found: '" + input + "'");
success &= RebuildToOutputHelper(input); files.Add(Path.GetFullPath(input));
Output.CleanDirectory(_tempdir);
} }
else if (Directory.Exists(input)) else if (Directory.Exists(input))
{ {
@@ -297,8 +296,7 @@ namespace SabreTools
foreach (string file in Directory.EnumerateFiles(input, "*", SearchOption.AllDirectories)) foreach (string file in Directory.EnumerateFiles(input, "*", SearchOption.AllDirectories))
{ {
_logger.Log("File found: '" + file + "'"); _logger.Log("File found: '" + file + "'");
success &= RebuildToOutputHelper(file); files.Add(Path.GetFullPath(file));
Output.CleanDirectory(_tempdir);
} }
} }
else else
@@ -307,6 +305,14 @@ namespace SabreTools
} }
} }
// Then, loop through and check each of the inputs
_logger.User("Starting to loop through inputs\n");
for (int i = 0; i < files.Count; i++)
{
success &= RebuildToOutputHelper(files[i], i, files.Count);
Output.CleanDirectory(_tempdir);
}
// Now one final delete of the temp directory // Now one final delete of the temp directory
while (Directory.Exists(_tempdir)) while (Directory.Exists(_tempdir))
{ {
@@ -330,16 +336,18 @@ namespace SabreTools
/// <summary> /// <summary>
/// Process an individual file against the DAT /// Process an individual file against the DAT
/// </summary> /// </summary>
/// <param name="input">The name of the input file</param> /// <param name="input">Name of the input file</param>
/// <param name="index">Index of the current file</param>
/// <param name="total">Total number of files</param>
/// <param name="recurse">True if this is in a recurse step and the file should be deleted, false otherwise (default)</param> /// <param name="recurse">True if this is in a recurse step and the file should be deleted, false otherwise (default)</param>
/// <returns>True if it was processed properly, false otherwise</returns> /// <returns>True if it was processed properly, false otherwise</returns>
private bool RebuildToOutputHelper(string input, bool recurse = false) private bool RebuildToOutputHelper(string input, int index, int total, bool recurse = false)
{ {
bool success = true; bool success = true;
// Get the full path of the input for movement purposes // Get the full path of the input for movement purposes
input = Path.GetFullPath(input); string statement = "\r" + (100 * index / total) + "% - Processing '" + input + "'";
_logger.User("Beginning processing of '" + input + "'"); _logger.LogExact(statement.PadRight(79, ' '));
// Get if the file should be scanned internally and externally // Get if the file should be scanned internally and externally
bool shouldExternalScan = true; bool shouldExternalScan = true;
@@ -397,7 +405,7 @@ namespace SabreTools
Directory.CreateDirectory(gamedir); Directory.CreateDirectory(gamedir);
} }
_logger.User("Rebuilding file '" + Path.GetFileName(rom.Name) + "' to '" + found.Name + "'"); _logger.Log("Rebuilding file '" + Path.GetFileName(rom.Name) + "' to '" + found.Name + "'");
try try
{ {
File.Copy(input, Path.Combine(gamedir, Path.GetFileName(found.Name))); File.Copy(input, Path.Combine(gamedir, Path.GetFileName(found.Name)));
@@ -444,7 +452,7 @@ namespace SabreTools
Directory.CreateDirectory(gamedir); Directory.CreateDirectory(gamedir);
} }
_logger.User("Rebuilding file '" + Path.GetFileName(rom.Name) + "' to '" + found.Name + "'"); _logger.Log("Rebuilding file '" + Path.GetFileName(rom.Name) + "' to '" + found.Name + "'");
try try
{ {
File.Copy(newinput, Path.Combine(gamedir, Path.GetFileName(found.Name))); File.Copy(newinput, Path.Combine(gamedir, Path.GetFileName(found.Name)));
@@ -469,7 +477,7 @@ namespace SabreTools
Directory.CreateDirectory(gamedir); Directory.CreateDirectory(gamedir);
} }
_logger.User("Rebuilding file '" + Path.GetFileName(rom.Name) + "' to '" + newfound.Name + "'"); _logger.Log("Rebuilding file '" + Path.GetFileName(rom.Name) + "' to '" + newfound.Name + "'");
try try
{ {
File.Copy(input, Path.Combine(gamedir, Path.GetFileName(newfound.Name))); File.Copy(input, Path.Combine(gamedir, Path.GetFileName(newfound.Name)));
@@ -518,7 +526,7 @@ namespace SabreTools
if (_toFolder) if (_toFolder)
{ {
// Copy file to output directory // Copy file to output directory
_logger.User("Rebuilding file '" + Path.GetFileName(rom.Name) + "' to '" + found.Name + "'"); _logger.Log("Rebuilding file '" + Path.GetFileName(rom.Name) + "' to '" + found.Name + "'");
string outfile = ArchiveTools.ExtractSingleItemFromArchive(input, rom.Name, _tempdir, _logger); string outfile = ArchiveTools.ExtractSingleItemFromArchive(input, rom.Name, _tempdir, _logger);
if (File.Exists(outfile)) if (File.Exists(outfile))
{ {
@@ -538,7 +546,7 @@ namespace SabreTools
else else
{ {
// Copy file between archives // Copy file between archives
_logger.User("Rebuilding file '" + Path.GetFileName(rom.Name) + "' to '" + found.Name + "'"); _logger.Log("Rebuilding file '" + Path.GetFileName(rom.Name) + "' to '" + found.Name + "'");
if (Build.MonoEnvironment) if (Build.MonoEnvironment)
{ {
@@ -585,10 +593,10 @@ namespace SabreTools
// If no errors were encountered, we loop through the temp directory // If no errors were encountered, we loop through the temp directory
if (!encounteredErrors) if (!encounteredErrors)
{ {
_logger.User("Archive found! Successfully extracted"); _logger.Log("Archive found! Successfully extracted");
foreach (string file in Directory.EnumerateFiles(_tempdir, "*", SearchOption.AllDirectories)) foreach (string file in Directory.EnumerateFiles(_tempdir, "*", SearchOption.AllDirectories))
{ {
success &= RebuildToOutputHelper(file, true); success &= RebuildToOutputHelper(file, index, total, true);
} }
} }
} }