[SabreTools, Enums] "Split" should be "NonMerged"

This commit is contained in:
Matt Nadareski
2017-01-09 12:13:53 -08:00
parent 2bd5b72ac7
commit 9b7e486749
5 changed files with 7 additions and 7 deletions

View File

@@ -315,7 +315,7 @@ namespace SabreTools.Helper.Data
helptext.Add(" -xof, --exclude-of Exclude romof, cloneof, sampleof tags"); helptext.Add(" -xof, --exclude-of Exclude romof, cloneof, sampleof tags");
helptext.Add(" -clean Clean game names according to WoD standards"); helptext.Add(" -clean Clean game names according to WoD standards");
helptext.Add(" -sl, --softlist Use Software List name instead of description"); helptext.Add(" -sl, --softlist Use Software List name instead of description");
helptext.Add(" -ds, --dat-split Create split sets in the output DAT"); helptext.Add(" -dnm, --dat-nm Create non-merged sets in the output DAT");
helptext.Add(" -dm, --dat-merge Create merged sets in the output DAT"); helptext.Add(" -dm, --dat-merge Create merged sets in the output DAT");
helptext.Add(" -df, --dat-fm Create fully merged sets in the output"); helptext.Add(" -df, --dat-fm Create fully merged sets in the output");
helptext.Add(" -trim Trim file names to fit NTFS length"); helptext.Add(" -trim Trim file names to fit NTFS length");

View File

@@ -260,7 +260,7 @@
public enum SplitType public enum SplitType
{ {
None = 0, None = 0,
Split, NonMerged,
Merged, Merged,
MergedWithDevice, MergedWithDevice,
} }

View File

@@ -127,7 +127,7 @@ namespace SabreTools.Helper.Dats
} }
// Now we pre-process the DAT with the splitting/merging mode // Now we pre-process the DAT with the splitting/merging mode
if (splitType == SplitType.Split) if (splitType == SplitType.NonMerged)
{ {
CreateSplitSets(false, logger, output: false); CreateSplitSets(false, logger, output: false);
} }

View File

@@ -730,7 +730,7 @@ Options:
Enabling this flag allows for the original name to be preserved and keeping Enabling this flag allows for the original name to be preserved and keeping
the description as just a description. the description as just a description.
-ds, --dat-split Create split sets in the output DAT -dnm, --dat-nm Create non-merged sets in the output DAT
-dm, --dat-merge Create merged sets in the output DAT -dm, --dat-merge Create merged sets in the output DAT
-df, --dat-fm Create fully merged sets (including devices) in the output DAT -df, --dat-fm Create fully merged sets (including devices) in the output DAT
Each of the above flags allow for preprocessing an outputted DAT in the case that Each of the above flags allow for preprocessing an outputted DAT in the case that

View File

@@ -280,9 +280,9 @@ namespace SabreTools
case "--dat-merge": case "--dat-merge":
splitType = SplitType.Merged; splitType = SplitType.Merged;
break; break;
case "-ds": case "-dnm":
case "--dat-split": case "--dat-nm":
splitType = SplitType.Split; splitType = SplitType.NonMerged;
break; break;
case "-f": case "-f":
case "--files": case "--files":