From e0688bf4c6e5575976bd87d01e507c3dc968a54a Mon Sep 17 00:00:00 2001 From: Matt Nadareski Date: Fri, 2 Jun 2017 16:06:52 -0700 Subject: [PATCH] [DatFile, FileTools] Revert some natural sorting stuff --- .../Dats/Partials/DatFile.ConvertUpdate.cs | 8 +++++++- SabreTools.Library/Tools/FileTools.cs | 13 +------------ 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/SabreTools.Library/Dats/Partials/DatFile.ConvertUpdate.cs b/SabreTools.Library/Dats/Partials/DatFile.ConvertUpdate.cs index 2bde7732..c41d1198 100644 --- a/SabreTools.Library/Dats/Partials/DatFile.ConvertUpdate.cs +++ b/SabreTools.Library/Dats/Partials/DatFile.ConvertUpdate.cs @@ -47,7 +47,13 @@ namespace SabreTools.Library.Dats if (merge || (diff != 0 && (diff & DiffMode.Against) == 0)) { // Make sure there are no folders in inputs - List newInputFileNames = FileTools.GetOnlyFilesFromInputs(inputPaths, appendparent: true, reverse: (diff & DiffMode.ReverseCascade) != 0); + List newInputFileNames = FileTools.GetOnlyFilesFromInputs(inputPaths, appendparent: true); + + // Reverse if we have to + if ((diff & DiffMode.ReverseCascade) != 0) + { + newInputFileNames.Reverse(); + } // Create a dictionary of all ROMs from the input DATs List datHeaders = PopulateUserData(newInputFileNames, inplace, clean, diff --git a/SabreTools.Library/Tools/FileTools.cs b/SabreTools.Library/Tools/FileTools.cs index d6b2eb58..e04f15e4 100644 --- a/SabreTools.Library/Tools/FileTools.cs +++ b/SabreTools.Library/Tools/FileTools.cs @@ -408,9 +408,8 @@ namespace SabreTools.Library.Tools /// /// List of strings representing directories and files /// True if the parent name should be appended after the special character "¬", false otherwise (default) - /// True if the order output should be reversed, false otherwise (default) /// List of strings representing just files from the inputs - public static List GetOnlyFilesFromInputs(List inputs, bool appendparent = false, bool reverse = false) + public static List GetOnlyFilesFromInputs(List inputs, bool appendparent = false) { List outputs = new List(); foreach (string input in inputs) @@ -451,16 +450,6 @@ namespace SabreTools.Library.Tools } } - // Make sure the outputs are ordered correctly - if (reverse) - { - outputs.Sort(new NaturalReversedComparer()); - } - else - { - outputs.Sort(new NaturalComparer()); - } - return outputs; }