From 20b62082116fd1fb41596d11586475a437ff1431 Mon Sep 17 00:00:00 2001 From: Matt Nadareski Date: Thu, 1 Jun 2017 18:03:37 -0700 Subject: [PATCH] [DatFile, NaturalComparer, Style] Fix current directory; fix sorting order If we find stuff that's "identical" then we should really compare to see if it's ACTUALLY identical or not, or else this can make some things REALLY weird --- .../Dats/Partials/DatFile.ConvertUpdate.cs | 10 +++++----- SabreTools.Library/Dats/Partials/DatFile.Statistics.cs | 4 ---- .../External/NaturalSort/NaturalComparer.cs | 4 ++-- .../External/NaturalSort/NaturalReversedComparer.cs | 4 ++-- 4 files changed, 9 insertions(+), 13 deletions(-) diff --git a/SabreTools.Library/Dats/Partials/DatFile.ConvertUpdate.cs b/SabreTools.Library/Dats/Partials/DatFile.ConvertUpdate.cs index f10b985f..2bde7732 100644 --- a/SabreTools.Library/Dats/Partials/DatFile.ConvertUpdate.cs +++ b/SabreTools.Library/Dats/Partials/DatFile.ConvertUpdate.cs @@ -269,7 +269,7 @@ namespace SabreTools.Library.Dats DatFile diffData; // If we're in inplace mode, take the appropriate DatData object already stored - if (inplace || !String.IsNullOrEmpty(outDir)) + if (inplace || outDir != Environment.CurrentDirectory) { diffData = datHeaders[j]; } @@ -330,7 +330,7 @@ namespace SabreTools.Library.Dats { path = Path.GetDirectoryName(inputs[j].Split('¬')[0]); } - else if (!String.IsNullOrEmpty(outDir)) + else if (outDir != Environment.CurrentDirectory) { string[] split = inputs[j].Split('¬'); path = outDir + (split[0] == split[1] @@ -598,7 +598,7 @@ namespace SabreTools.Library.Dats innerDatdata.Filter(filter, trim, single, root); // Try to output the file - innerDatdata.WriteToFile((realOutDir == "" ? Path.GetDirectoryName(inputFileName) : realOutDir), overwrite: (realOutDir != "")); + innerDatdata.WriteToFile((realOutDir == Environment.CurrentDirectory ? Path.GetDirectoryName(inputFileName) : realOutDir), overwrite: (realOutDir != Environment.CurrentDirectory)); } else if (Directory.Exists(inputFileName)) { @@ -621,8 +621,8 @@ namespace SabreTools.Library.Dats innerDatdata.Filter(filter, trim, single, root); // Try to output the file - innerDatdata.WriteToFile((realOutDir == "" ? Path.GetDirectoryName(file) : realOutDir + Path.GetDirectoryName(file).Remove(0, inputFileName.Length - 1)), - overwrite: (realOutDir != "")); + innerDatdata.WriteToFile((realOutDir == Environment.CurrentDirectory ? Path.GetDirectoryName(file) : realOutDir + Path.GetDirectoryName(file).Remove(0, inputFileName.Length - 1)), + overwrite: (realOutDir != Environment.CurrentDirectory)); }); } else diff --git a/SabreTools.Library/Dats/Partials/DatFile.Statistics.cs b/SabreTools.Library/Dats/Partials/DatFile.Statistics.cs index 34231ca7..d3b2f054 100644 --- a/SabreTools.Library/Dats/Partials/DatFile.Statistics.cs +++ b/SabreTools.Library/Dats/Partials/DatFile.Statistics.cs @@ -285,10 +285,6 @@ namespace SabreTools.Library.Dats } // Get the proper output file name - if (String.IsNullOrEmpty(outDir)) - { - outDir = Environment.CurrentDirectory; - } if (String.IsNullOrEmpty(reportName)) { reportName = "report"; diff --git a/SabreTools.Library/External/NaturalSort/NaturalComparer.cs b/SabreTools.Library/External/NaturalSort/NaturalComparer.cs index b7c18660..f90ed9d2 100644 --- a/SabreTools.Library/External/NaturalSort/NaturalComparer.cs +++ b/SabreTools.Library/External/NaturalSort/NaturalComparer.cs @@ -43,13 +43,13 @@ namespace NaturalSort if (!table.TryGetValue(x, out x1)) { //x1 = Regex.Split(x.Replace(" ", ""), "([0-9]+)"); - x1 = Regex.Split(x, "([0-9]+)").Where(s => s != "").ToArray(); + x1 = Regex.Split(x.ToLowerInvariant(), "([0-9]+)").Where(s => s != "").ToArray(); table.Add(x, x1); } if (!table.TryGetValue(y, out y1)) { //y1 = Regex.Split(y.Replace(" ", ""), "([0-9]+)"); - y1 = Regex.Split(y, "([0-9]+)").Where(s => s != "").ToArray(); + y1 = Regex.Split(y.ToLowerInvariant(), "([0-9]+)").Where(s => s != "").ToArray(); table.Add(y, y1); } diff --git a/SabreTools.Library/External/NaturalSort/NaturalReversedComparer.cs b/SabreTools.Library/External/NaturalSort/NaturalReversedComparer.cs index c35be112..c70e785a 100644 --- a/SabreTools.Library/External/NaturalSort/NaturalReversedComparer.cs +++ b/SabreTools.Library/External/NaturalSort/NaturalReversedComparer.cs @@ -43,13 +43,13 @@ namespace NaturalSort if (!table.TryGetValue(x, out x1)) { //x1 = Regex.Split(x.Replace(" ", ""), "([0-9]+)"); - x1 = Regex.Split(x, "([0-9]+)").Where(s => s != "").ToArray(); + x1 = Regex.Split(x.ToLowerInvariant(), "([0-9]+)").Where(s => s != "").ToArray(); table.Add(x, x1); } if (!table.TryGetValue(y, out y1)) { //y1 = Regex.Split(y.Replace(" ", ""), "([0-9]+)"); - y1 = Regex.Split(y, "([0-9]+)").Where(s => s != "").ToArray(); + y1 = Regex.Split(y.ToLowerInvariant(), "([0-9]+)").Where(s => s != "").ToArray(); table.Add(y, y1); }