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

[DatFile] Populate user data with DiffNoCascade

Browse Source
This commit is contained in:
Matt Nadareski
2018-03-10 00:19:36 -08:00
parent df0c866cc4
commit f2d0a0aa87
1 changed files with 7 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
SabreTools.Library/DatFiles/DatFile.cs
View File

@@ -1665,6 +1665,8 @@ namespace SabreTools.Library.DatFiles
|| (updateMode & UpdateMode.DiffNoDupesOnly) != 0 || (updateMode & UpdateMode.DiffNoDupesOnly) != 0
|| (updateMode & UpdateMode.DiffIndividualsOnly) != 0) || (updateMode & UpdateMode.DiffIndividualsOnly) != 0)
{ {
// Populate the combined data
PopulateUserData(inputFileNames, inplace, clean, remUnicode, descAsName, outDir, filter, splitType);
DiffNoCascade(inputFileNames, outDir, filter, updateMode); DiffNoCascade(inputFileNames, outDir, filter, updateMode);
} }
// If we have one of the cascaded diffing modes // If we have one of the cascaded diffing modes
@@ -1719,7 +1721,7 @@ namespace SabreTools.Library.DatFiles
DedupeRoms = DedupeRoms, DedupeRoms = DedupeRoms,
}; };
datHeaders[i].Parse(input, i, 0, splitType, keep: true, clean: clean, remUnicode: remUnicode, descAsName: descAsName); datHeaders[i].Parse(input, i, i, splitType, keep: true, clean: clean, remUnicode: remUnicode, descAsName: descAsName);
}); });
watch.Stop(); watch.Stop();
@@ -2134,23 +2136,6 @@ namespace SabreTools.Library.DatFiles
DatFile outerDiffData = new DatFile(); DatFile outerDiffData = new DatFile();
DatFile dupeData = 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 - 1;
}
Parse(path, id, id, keep: true);
});
// Now that we have a combined DAT, filter it
filter.FilterDatFile(this);
// Fill in any information not in the base DAT // Fill in any information not in the base DAT
if (String.IsNullOrWhiteSpace(FileName)) if (String.IsNullOrWhiteSpace(FileName))
{ {
@@ -2158,6 +2143,7 @@ namespace SabreTools.Library.DatFiles
} }
if (String.IsNullOrWhiteSpace(Name)) if (String.IsNullOrWhiteSpace(Name))
{ {
Name = "All DATs"; Name = "All DATs";
} }
if (String.IsNullOrWhiteSpace(Description)) if (String.IsNullOrWhiteSpace(Description))
@@ -2236,14 +2222,14 @@ namespace SabreTools.Library.DatFiles
// Individual DATs that are output // Individual DATs that are output
if ((diff & UpdateMode.DiffIndividualsOnly) != 0) if ((diff & UpdateMode.DiffIndividualsOnly) != 0)
{ {
outDats[inputs.Count - item.SystemID - 1].Add(key, item); outDats[item.SystemID].Add(key, item);
} }
// Merged no-duplicates DAT // Merged no-duplicates DAT
if ((diff & UpdateMode.DiffNoDupesOnly) != 0) if ((diff & UpdateMode.DiffNoDupesOnly) != 0)
{ {
DatItem newrom = item.Clone() as DatItem; DatItem newrom = item.Clone() as DatItem;
newrom.MachineName += " (" + Path.GetFileNameWithoutExtension(inputs[inputs.Count - item.SystemID - 1].Split('¬')[0]) + ")"; newrom.MachineName += " (" + Path.GetFileNameWithoutExtension(inputs[item.SystemID].Split('¬')[0]) + ")";
outerDiffData.Add(key, newrom); outerDiffData.Add(key, newrom);
} }
@@ -2256,7 +2242,7 @@ namespace SabreTools.Library.DatFiles
if ((item.Dupe & DupeType.External) != 0) if ((item.Dupe & DupeType.External) != 0)
{ {
DatItem newrom = item.Clone() as DatItem; DatItem newrom = item.Clone() as DatItem;
newrom.MachineName += " (" + Path.GetFileNameWithoutExtension(inputs[inputs.Count - item.SystemID - 1].Split('¬')[0]) + ")"; newrom.MachineName += " (" + Path.GetFileNameWithoutExtension(inputs[item.SystemID].Split('¬')[0]) + ")";
dupeData.Add(key, newrom); dupeData.Add(key, newrom);
} }