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

[Flags] Clarify flag names

Browse Source
This commit is contained in:
Matt Nadareski
2017-10-30 16:32:59 -07:00
parent 4652e8cdf9
commit 0fa2a1a7e2
3 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1609,7 +1609,7 @@ namespace SabreTools.Library.DatFiles
{ {
// If we're in merging or diffing mode, use the full list of inputs // If we're in merging or diffing mode, use the full list of inputs
if (merge || (updateMode != UpdateMode.None if (merge || (updateMode != UpdateMode.None
&& (updateMode & UpdateMode.Against) == 0) && (updateMode & UpdateMode.DiffAgainst) == 0)
&& (updateMode & UpdateMode.BaseReplace) == 0 && (updateMode & UpdateMode.BaseReplace) == 0
&& (updateMode & UpdateMode.ReverseBaseReplace) == 0) && (updateMode & UpdateMode.ReverseBaseReplace) == 0)
{ {
@@ -1617,7 +1617,7 @@ namespace SabreTools.Library.DatFiles
List<string> newInputFileNames = FileTools.GetOnlyFilesFromInputs(inputPaths, appendparent: true); List<string> newInputFileNames = FileTools.GetOnlyFilesFromInputs(inputPaths, appendparent: true);
// Reverse if we have to // Reverse if we have to
if ((updateMode & UpdateMode.ReverseCascade) != 0) if ((updateMode & UpdateMode.DiffReverseCascade) != 0)
{ {
newInputFileNames.Reverse(); newInputFileNames.Reverse();
} }
@@ -1627,12 +1627,12 @@ namespace SabreTools.Library.DatFiles
remUnicode, descAsName, outDir, filter, splitType, trim, single, root); remUnicode, descAsName, outDir, filter, splitType, trim, single, root);
// Modify the Dictionary if necessary and output the results // Modify the Dictionary if necessary and output the results
if (updateMode != 0 && updateMode < UpdateMode.Cascade) if (updateMode != 0 && updateMode < UpdateMode.DiffCascade)
{ {
DiffNoCascade(updateMode, outDir, newInputFileNames); DiffNoCascade(updateMode, outDir, newInputFileNames);
} }
// If we're in cascade and diff, output only cascaded diffs // If we're in cascade and diff, output only cascaded diffs
else if (updateMode != 0 && updateMode >= UpdateMode.Cascade) else if (updateMode != 0 && updateMode >= UpdateMode.DiffCascade)
{ {
DiffCascade(outDir, inplace, newInputFileNames, datHeaders, skip); DiffCascade(outDir, inplace, newInputFileNames, datHeaders, skip);
} }
@@ -1643,7 +1643,7 @@ namespace SabreTools.Library.DatFiles
} }
} }
// If we're in "diff against" mode, we treat the inputs differently // If we're in "diff against" mode, we treat the inputs differently
else if ((updateMode & UpdateMode.Against) != 0) else if ((updateMode & UpdateMode.DiffAgainst) != 0)
{ {
DiffAgainst(inputPaths, basePaths, outDir, inplace, clean, remUnicode, descAsName, filter, splitType, trim, single, root); DiffAgainst(inputPaths, basePaths, outDir, inplace, clean, remUnicode, descAsName, filter, splitType, trim, single, root);
} }
@@ -2080,7 +2080,7 @@ namespace SabreTools.Library.DatFiles
} }
// Don't have External dupes // Don't have External dupes
if ((diff & UpdateMode.NoDupes) != 0) if ((diff & UpdateMode.DiffNoDupesOnly) != 0)
{ {
post = " (No Duplicates)"; post = " (No Duplicates)";
outerDiffData = new DatFile(this); outerDiffData = new DatFile(this);
@@ -2091,7 +2091,7 @@ namespace SabreTools.Library.DatFiles
} }
// Have External dupes // Have External dupes
if ((diff & UpdateMode.Dupes) != 0) if ((diff & UpdateMode.DiffDupesOnly) != 0)
{ {
post = " (Duplicates)"; post = " (Duplicates)";
dupeData = new DatFile(this); dupeData = new DatFile(this);
@@ -2105,7 +2105,7 @@ namespace SabreTools.Library.DatFiles
List<DatFile> outDats = new List<DatFile>(); List<DatFile> outDats = new List<DatFile>();
// Loop through each of the inputs and get or create a new DatData object // Loop through each of the inputs and get or create a new DatData object
if ((diff & UpdateMode.Individuals) != 0) if ((diff & UpdateMode.DiffIndividualsOnly) != 0)
{ {
DatFile[] outDatsArray = new DatFile[inputs.Count]; DatFile[] outDatsArray = new DatFile[inputs.Count];
@@ -2143,18 +2143,18 @@ namespace SabreTools.Library.DatFiles
foreach (DatItem item in items) foreach (DatItem item in items)
{ {
// No duplicates // No duplicates
if ((diff & UpdateMode.NoDupes) != 0 || (diff & UpdateMode.Individuals) != 0) if ((diff & UpdateMode.DiffNoDupesOnly) != 0 || (diff & UpdateMode.DiffIndividualsOnly) != 0)
{ {
if ((item.Dupe & DupeType.Internal) != 0) if ((item.Dupe & DupeType.Internal) != 0)
{ {
// Individual DATs that are output // Individual DATs that are output
if ((diff & UpdateMode.Individuals) != 0) if ((diff & UpdateMode.DiffIndividualsOnly) != 0)
{ {
outDats[item.SystemID].Add(key, item); outDats[item.SystemID].Add(key, item);
} }
// Merged no-duplicates DAT // Merged no-duplicates DAT
if ((diff & UpdateMode.NoDupes) != 0) if ((diff & UpdateMode.DiffNoDupesOnly) != 0)
{ {
DatItem newrom = item.Clone() as DatItem; DatItem newrom = item.Clone() as DatItem;
newrom.MachineName += " (" + Path.GetFileNameWithoutExtension(inputs[newrom.SystemID].Split('¬')[0]) + ")"; newrom.MachineName += " (" + Path.GetFileNameWithoutExtension(inputs[newrom.SystemID].Split('¬')[0]) + ")";
@@ -2165,7 +2165,7 @@ namespace SabreTools.Library.DatFiles
} }
// Duplicates only // Duplicates only
if ((diff & UpdateMode.Dupes) != 0) if ((diff & UpdateMode.DiffDupesOnly) != 0)
{ {
if ((item.Dupe & DupeType.External) != 0) if ((item.Dupe & DupeType.External) != 0)
{ {
@@ -2184,19 +2184,19 @@ namespace SabreTools.Library.DatFiles
watch.Start("Outputting all created DATs"); watch.Start("Outputting all created DATs");
// Output the difflist (a-b)+(b-a) diff // Output the difflist (a-b)+(b-a) diff
if ((diff & UpdateMode.NoDupes) != 0) if ((diff & UpdateMode.DiffNoDupesOnly) != 0)
{ {
outerDiffData.WriteToFile(outDir); outerDiffData.WriteToFile(outDir);
} }
// Output the (ab) diff // Output the (ab) diff
if ((diff & UpdateMode.Dupes) != 0) if ((diff & UpdateMode.DiffDupesOnly) != 0)
{ {
dupeData.WriteToFile(outDir); dupeData.WriteToFile(outDir);
} }
// Output the individual (a-b) DATs // Output the individual (a-b) DATs
if ((diff & UpdateMode.Individuals) != 0) if ((diff & UpdateMode.DiffIndividualsOnly) != 0)
{ {
Parallel.For(0, inputs.Count, Globals.ParallelOptions, j => Parallel.For(0, inputs.Count, Globals.ParallelOptions, j =>
{ {

18
SabreTools.Library/Data/Flags.cs
View File

@@ -263,20 +263,20 @@ namespace SabreTools.Library.Data
None = 0x00, None = 0x00,
// Standard diffs // Standard diffs
Dupes = 0x01, DiffDupesOnly = 0x01,
NoDupes = Dupes << 1, DiffNoDupesOnly = DiffDupesOnly << 1,
Individuals = NoDupes << 1, DiffIndividualsOnly = DiffNoDupesOnly << 1,
All = Dupes | NoDupes | Individuals, AllDiffs = DiffDupesOnly | DiffNoDupesOnly | DiffIndividualsOnly,
// Cascaded diffs // Cascaded diffs
Cascade = Individuals << 1, DiffCascade = DiffIndividualsOnly << 1,
ReverseCascade = Cascade << 1, DiffReverseCascade = DiffCascade << 1,
// Base diffs // Base diffs
Against = ReverseCascade << 1, DiffAgainst = DiffReverseCascade << 1,
// Not technically diffs // Special update modes
BaseReplace = Against << 1, BaseReplace = DiffAgainst << 1,
ReverseBaseReplace = BaseReplace << 1, ReverseBaseReplace = BaseReplace << 1,
} }

14
SabreTools/SabreTools.cs
View File

@@ -290,7 +290,7 @@ namespace SabreTools
break; break;
case "-ag": case "-ag":
case "--against": case "--against":
updateMode |= UpdateMode.Against; updateMode |= UpdateMode.DiffAgainst;
break; break;
case "-b": case "-b":
case "--bare": case "--bare":
@@ -310,7 +310,7 @@ namespace SabreTools
break; break;
case "-c": case "-c":
case "--cascade": case "--cascade":
updateMode |= UpdateMode.Cascade; updateMode |= UpdateMode.DiffCascade;
break; break;
case "-cf": case "-cf":
case "--copy-files": case "--copy-files":
@@ -342,19 +342,19 @@ namespace SabreTools
break; break;
case "-di": case "-di":
case "--diff": case "--diff":
updateMode |= UpdateMode.All; updateMode |= UpdateMode.AllDiffs;
break; break;
case "-did": case "-did":
case "--diff-du": case "--diff-du":
updateMode |= UpdateMode.Dupes; updateMode |= UpdateMode.DiffDupesOnly;
break; break;
case "-dii": case "-dii":
case "--diff-in": case "--diff-in":
updateMode |= UpdateMode.Individuals; updateMode |= UpdateMode.DiffIndividualsOnly;
break; break;
case "-din": case "-din":
case "--diff-nd": case "--diff-nd":
updateMode |= UpdateMode.NoDupes; updateMode |= UpdateMode.DiffNoDupesOnly;
break; break;
case "-dm": case "-dm":
case "--dat-merged": case "--dat-merged":
@@ -530,7 +530,7 @@ namespace SabreTools
break; break;
case "-rc": case "-rc":
case "--rev-cascade": case "--rev-cascade":
updateMode |= UpdateMode.ReverseCascade; updateMode |= UpdateMode.DiffReverseCascade;
break; break;
case "-rmd5": case "-rmd5":
case "--rem-md5": case "--rem-md5":