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] Make reversing make more sense

Browse Source
This commit is contained in:
Matt Nadareski
2017-12-05 12:36:52 -08:00
parent 711e37c51a
commit 6c86af0d7d
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1589,11 +1589,15 @@ namespace SabreTools.Library.DatFiles
return; return;
} }
// Reverse if we're in a required mode // Reverse inputs if we're in a required mode
if ((updateMode & UpdateMode.DiffReverseCascade) != 0) if ((updateMode & UpdateMode.DiffReverseCascade) != 0)
{ {
inputFileNames.Reverse(); inputFileNames.Reverse();
} }
if ((updateMode & UpdateMode.ReverseBaseReplace) != 0)
{
baseFileNames.Reverse();
}
// Populate the combined data and get the headers // Populate the combined data and get the headers
List<DatFile> datHeaders = PopulateUserData(inputFileNames, inplace, clean, List<DatFile> datHeaders = PopulateUserData(inputFileNames, inplace, clean,
@@ -1626,8 +1630,7 @@ namespace SabreTools.Library.DatFiles
else if ((updateMode & UpdateMode.BaseReplace) != 0 else if ((updateMode & UpdateMode.BaseReplace) != 0
|| (updateMode & UpdateMode.ReverseBaseReplace) != 0) || (updateMode & UpdateMode.ReverseBaseReplace) != 0)
{ {
bool brrev = (updateMode & UpdateMode.ReverseBaseReplace) != 0; BaseReplace(inputFileNames, baseFileNames, outDir, inplace, clean, remUnicode, descAsName, filter, splitType, trim, single, root);
BaseReplace(inputFileNames, baseFileNames, outDir, inplace, clean, remUnicode, descAsName, filter, splitType, trim, single, root, brrev);
} }
return; return;
@@ -1712,9 +1715,8 @@ namespace SabreTools.Library.DatFiles
/// <param name="trim">True if we are supposed to trim names to NTFS length, false otherwise</param> /// <param name="trim">True if we are supposed to trim names to NTFS length, false otherwise</param>
/// <param name="single">True if all games should be replaced by '!', false otherwise</param> /// <param name="single">True if all games should be replaced by '!', false otherwise</param>
/// <param name="root">String representing root directory to compare against for length calculation</param> /// <param name="root">String representing root directory to compare against for length calculation</param>
/// <param name="reverse">True if the base DATs should be reverse-ordered, false otherwise</param>
public void BaseReplace(List<string> inputFileNames, List<string> baseFileNames, string outDir, bool inplace, bool clean, bool remUnicode, public void BaseReplace(List<string> inputFileNames, List<string> baseFileNames, string outDir, bool inplace, bool clean, bool remUnicode,
bool descAsName, Filter filter, SplitType splitType, bool trim, bool single, string root, bool reverse) bool descAsName, Filter filter, SplitType splitType, bool trim, bool single, string root)
{ {
// First we want to parse all of the base DATs into the input // First we want to parse all of the base DATs into the input
InternalStopwatch watch = new InternalStopwatch("Populating base DAT for replacement..."); InternalStopwatch watch = new InternalStopwatch("Populating base DAT for replacement...");
@@ -1727,7 +1729,7 @@ namespace SabreTools.Library.DatFiles
lock (baseFileNames) lock (baseFileNames)
{ {
path = baseFileNames[i]; path = baseFileNames[i];
id = (reverse ? i : baseFileNames.Count - i); id = baseFileNames.Count - i;
} }
Parse(path, id, id, keep: true, clean: clean, remUnicode: remUnicode, descAsName: descAsName); Parse(path, id, id, keep: true, clean: clean, remUnicode: remUnicode, descAsName: descAsName);