From 4768771d69eb945b7d6fa85a00ac10347e7b7caa Mon Sep 17 00:00:00 2001 From: Matt Nadareski Date: Mon, 8 Jan 2018 18:39:11 -0800 Subject: [PATCH] [DatFile, SeparatedValue, Utilities] Fix SSV --- SabreTools.Library/DatFiles/DatFile.cs | 14 ++++++++++++++ SabreTools.Library/DatFiles/SeparatedValue.cs | 9 ++++++++- SabreTools.Library/Tools/Utilities.cs | 1 + 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/SabreTools.Library/DatFiles/DatFile.cs b/SabreTools.Library/DatFiles/DatFile.cs index 66da973b..a657b996 100644 --- a/SabreTools.Library/DatFiles/DatFile.cs +++ b/SabreTools.Library/DatFiles/DatFile.cs @@ -2135,6 +2135,20 @@ namespace SabreTools.Library.DatFiles DatFile outerDiffData = new DatFile(); DatFile dupeData = new DatFile(); + Parallel.For(0, inputs.Count, Globals.ParallelOptions, i => + { + string path = ""; + int id = 0; + + lock (inputs) + { + path = inputs[i]; + id = inputs.Count - i; + } + + Parse(path, id, id, keep: true); + }); + // Fill in any information not in the base DAT if (String.IsNullOrWhiteSpace(FileName)) { diff --git a/SabreTools.Library/DatFiles/SeparatedValue.cs b/SabreTools.Library/DatFiles/SeparatedValue.cs index b097f04b..7fb93ba4 100644 --- a/SabreTools.Library/DatFiles/SeparatedValue.cs +++ b/SabreTools.Library/DatFiles/SeparatedValue.cs @@ -153,6 +153,9 @@ namespace SabreTools.Library.DatFiles case "item status": columns.Add("DatItem.Nodump"); break; + case "date": + columns.Add("DatItem.Date"); + break; default: columns.Add("INVALID"); break; @@ -174,7 +177,7 @@ namespace SabreTools.Library.DatFiles // Set the output item information string machineName = null, machineDesc = null, name = null, crc = null, md5 = null, sha1 = null, - sha256 = null, sha384 = null, sha512 = null; + sha256 = null, sha384 = null, sha512 = null, date = null; long size = -1; ItemType itemType = ItemType.Rom; ItemStatus status = ItemStatus.None; @@ -234,6 +237,9 @@ namespace SabreTools.Library.DatFiles case "DatItem.Nodump": status = Utilities.GetItemStatus(value); break; + case "DatItem.Date": + date = value; + break; } } @@ -302,6 +308,7 @@ namespace SabreTools.Library.DatFiles SHA256 = sha256, SHA384 = sha384, SHA512 = sha512, + Date = date, MachineName = machineName, MachineDescription = machineDesc, diff --git a/SabreTools.Library/Tools/Utilities.cs b/SabreTools.Library/Tools/Utilities.cs index 43510599..5069f2d8 100644 --- a/SabreTools.Library/Tools/Utilities.cs +++ b/SabreTools.Library/Tools/Utilities.cs @@ -2423,6 +2423,7 @@ namespace SabreTools.Library.Tools case "sha256": case "sha384": case "sha512": + case "ssv": case "tsv": case "txt": case "xml":