[SabreTools] Fix diffing flags

Due to real changes in the code base, having a single "diff" master flag no longer works. separating out the few flags that were still sitting under what is now "diff-all" makes it more easy to see the intent in the flags themselves.

SabreTools.Library/README.1ST

@@ -915,111 +915,118 @@ Options:
 		  -b, --no-automatic-date	 Don't include date in file name
 			  Normally, the DAT will be created with the date in the file name
 			  in brackets. This flag removes that instead of the default.
-	  -di, --diff				 Create diffdats from inputs (all outputs)
-		  By default, all DATs are processed individually with the
-		  user-specified flags. With this flag enabled, input DATs are diffed
-		  against each other in all ways specified by the --diff-X flags.
 
-		  -ag, --against			  Diff all inputs against a set of base DATs
+      -di, --diff-all             Create diffdats from inputs (all standard outputs)
-			  This flag will enable a special type of diffing in which a set of
+          By default, all DATs are processed individually with the
-			  base DATs are used as a comparison point for each of the input
+          user-specified flags. With this flag enabled, input DATs are diffed
-			  DATs. This allows users to get a slightly different output to
+          against each other to find duplicates, no duplicates, and only in
-			  cascaded diffing, which may be more useful in some cases. This is
+          individuals.
-			  heavily influenced by the diffing model used by Romba.
 
-			  -bd, --base-dat			 Add a base DAT for processing
+          -b, --no-automatic-date     Don't include date in file name
-				  Add a DAT or folder of DATs to the base set to be used for
+              Normally, the DAT will be created with the date in the file name
-				  all operations. Multiple instances of this flag are allowed.
+              in brackets. This flag removes that instead of the default.
 
-		  -b, --no-automatic-date	 Don't include date in file name
+      -did, --diff-duplicates     Create diffdat containing just duplicates
-			  Normally, the DAT will be created with the date in the file name
+          All files that have duplicates outside of the original DAT are
-			  in brackets. This flag removes that instead of the default.
+          included.
 
-		  -c, --cascade			   Enable cascaded diffing
+          -b, --no-automatic-date     Don't include date in file name
-			  This flag allows for a special type of diffing in which the first
+              Normally, the DAT will be created with the date in the file name
-			  DAT is considered a base, and for each additional input DAT, it
+              in brackets. This flag removes that instead of the default.
-			  only leaves the files that are not in one of the previous DATs.
-			  This can allow for the creation of rollback sets or even just
-			  reduce the amount of duplicates across multiple sets.
 
-		  -rc, --reverse-cascade	  Enable reverse cascaded diffing
+      -dii, --diff-individuals    Create diffdats for individual DATs
-			  This flag allows for a special type of diffing in which the last
+          All files that have no duplicates outside of the original DATs are
-			  DAT is considered a base, and for each additional input DAT, it
+          put into DATs that are named after the source DAT.
-			  only leaves the files that are not in one of the previous DATs.
-			  This can allow for the creation of rollback sets or even just
-			  reduce the amount of duplicates across multiple sets.
 
-			  -sf, --skip-first-output	Skip output of first DAT
+          -b, --no-automatic-date     Don't include date in file name
-				  In times where the first DAT does not need to be written out
+              Normally, the DAT will be created with the date in the file name
-				  a second time, this will skip writing it. This can often
+              in brackets. This flag removes that instead of the default.
-				  speed up the output process.
-				  [Both Cascade and Reverse Cascade]
 
-	  -did, --diff-du			 Create diffdat containing just duplicates
+      -din, --diff-no-duplicates  Create diffdat containing no duplicates
-		  All files that have duplicates outside of the original DAT are
+          All files that have no duplicates outside of the original DATs are
-		  included.
+          included.
 
-	  -dii, --diff-in			 Create diffdats for individual DATs
+          -b, --no-automatic-date     Don't include date in file name
-		  All files that have no duplicates outside of the original DATs are
+              Normally, the DAT will be created with the date in the file name
-		  put into DATs that are named after the source DAT.
+              in brackets. This flag removes that instead of the default.
 
-	  -din, --diff-nd			 Create diffdat containing no duplicates
+      -dag, --diff-against        Diff all inputs against a set of base DATs
-		  All files that have no duplicates outside of the original DATs are
+          This flag will enable a special type of diffing in which a set of
-		  included.
+          base DATs are used as a comparison point for each of the input DATs.
+          This allows users to get a slightly different output to cascaded
+          diffing, which may be more useful in some cases. This is heavily
+          influenced by the diffing model used by Romba.
 
-		  -b, --no-automatic-date	 Don't include date in file name
+          -bd, --base-dat             Add a base DAT for processing
-			  Normally, the DAT will be created with the date in the file name
+              Add a DAT or folder of DATs to the base set to be used for all
-			  in brackets. This flag removes that instead of the default.
+              operations. Multiple instances of this flag are allowed.
-			  [All 3 diff-X flags]
 
-	  -br, --base-replace		 Replace from base DATs in order
+      -br, --base-replace         Replace from base DATs in order
-		  By default, no item names are changed except when there is a merge
+          By default, no item names are changed except when there is a merge
-		  occurring. This flag enables users to define a DAT or set of base
+          occurring. This flag enables users to define a DAT or set of base
-		  DATs to use as "replacements" for all input DATs. Note that the first
+          DATs to use as "replacements" for all input DATs. Note that the
-		  found instance of an item in the base DAT(s) will be used and all
+          first found instance of an item in the base DAT(s) will be used and
-		  others will be discarded. If no additional flag is given, it will
+          all others will be discarded. If no additional flag is given, it
-		  default to updating names.
+          will default to updating names.
-		
-	  -rbr, --reverse-base-replace Replace item names from base DATs in reverse
-		  By default, no item names are changed except when there is a merge
-		  occurring. This flag enables users to define a DAT or set of base
-		  DATs to use as "replacements" for all input DATs. Note that the first
-		  found instance of an item in the last base DAT(s) will be used and
-		  all others will be discarded. If no additional flag is given, it will
-		  default to updating names.
 
-		  -bd, --base-dat			 Add a base DAT for processing
+      -rbr, --reverse-base-replace Replace item names from base DATs in reverse
-			  Add a DAT or folder of DATs to the base set to be used for all
+          By default, no item names are changed except when there is a merge
-			  operations. Multiple instances of this flag are allowed.
+          occurring. This flag enables users to define a DAT or set of base
-			  [Both Base Replace and Reverse Base Replace]
+          DATs to use as "replacements" for all input DATs. Note that the
+          first found instance of an item in the last base DAT(s) will be used
+          and all others will be discarded. If no additional flag is given, it
+          will default to updating names.
 
-		  -un, --update-names		 Update item names from base DATs
+          -bd, --base-dat             Add a base DAT for processing
-			  This flag enables updating of item names from base DATs.
+              Add a DAT or folder of DATs to the base set to be used for all
-			  [Both Base Replace and Reverse Base Replace]
+              operations. Multiple instances of this flag are allowed.
+			  [Both base-replace and reverse-base-replace]
 
-		  -uh, --update-hashes		Update hashes from base DATs
+          -un, --update-names         Update item names from base DATs
-			  This flag enables updating of hashes from base DATs.
+              This flag enables updating of item names from base DATs.
-			  [Both Base Replace and Reverse Base Replace]
+			  [Both base-replace and reverse-base-replace]
 
-		  -udd, --update-description  Update machine descriptions from base DATs
+          -uh, --update-hashes        Update hashes from base DATs
-			  This flag enables updating of machine descriptions from base
+              This flag enables updating of hashes from base DATs.
-			  DATs.
+			  [Both base-replace and reverse-base-replace]
-			  [Both Base Replace and Reverse Base Replace]
 
-			  -ons, --only-same		   Only update description if machine name matches description
+          -udd, --update-description  Update machine descriptions from base DATs
-				  Normally, updating the description will always overwrite if
+              This flag enables updating of machine descriptions from base
-				  the machine names are the same. With this flag, descriptions
+              DATs. [Both base-replace and reverse-base-replace]
-				  will only be overwritten if they are the same as the machine
-				  names.
 
-		  -uy, --update-year		  Update machine years from base DATs
+              -ons, --only-same           Only update description if machine name matches description
-			  This flag enables updating of machine years from base DATs.
+                  Normally, updating the description will always overwrite if
-			  [Both Base Replace and Reverse Base Replace]
+                  the machine names are the same. With this flag, descriptions
+                  will only be overwritten if they are the same as the machine
+                  names.
 
-		  -um, --update-manufacturer  Update machine manufacturers from base DATs
+          -uy, --update-year          Update machine years from base DATs
-			  This flag enables updating of machine manufacturers from base
+              This flag enables updating of machine years from base DATs.
-			  DATs.
+			 [Both base-replace and reverse-base-replace]
-			  [Both Base Replace and Reverse Base Replace]
+
+          -um, --update-manufacturer  Update machine manufacturers from base DATs
+              This flag enables updating of machine manufacturers from base
+              DATs. [Both base-replace and reverse-base-replace]
+
+      -dc, --diff-cascade         Enable cascaded diffing
+          This flag allows for a special type of diffing in which the first
+          DAT is considered a base, and for each additional input DAT, it only
+          leaves the files that are not in one of the previous DATs. This can
+          allow for the creation of rollback sets or even just reduce the
+          amount of duplicates across multiple sets.
+
+      -drc, --diff-reverse-cascade Enable reverse cascaded diffing
+          This flag allows for a special type of diffing in which the last DAT
+          is considered a base, and for each additional input DAT, it only
+          leaves the files that are not in one of the previous DATs. This can
+          allow for the creation of rollback sets or even just reduce the
+          amount of duplicates across multiple sets. [Both diff-cascade and
+		  diff-reverse-cascade]
+
+          -sf, --skip-first-output    Skip output of first DAT
+              In times where the first DAT does not need to be written out a
+              second time, this will skip writing it. This can often speed up
+              the output process.
 
 	  -gn, --game-name			Filter by game name
 		  Include only items with this game name in the output. Additionally,
@@ -1313,10 +1320,10 @@ users of SabreTools. Thanks to Kludge for most of these suggestions!
 	files in the same set.
 	
 	Long form:
-		SabreTools.exe --update --diff --against --base-dat="Path\To\Base" InDr
+		SabreTools.exe --update --diff-against --base-dat="Path\To\Base" InDr
 		
 	Short form:
-		SabreTools.exe -ud -di -ag -bd="Path\To\Base" InDr
+		SabreTools.exe -ud -dag -bd="Path\To\Base" InDr
 
 ** Section 4.0 - Contributors
 
@@ -1349,12 +1356,18 @@ This section contains remappings from old flag names to new ones for the purpose
 
 -ab, --add-blank -> -ab, --add-blank-files
 -ae, --add-ext -> -ae, --add-extension
+-ag, --against -> -dag, --diff-against
 -b, --bare -> -b, --no-automatic-date
 -bc, --baddump-col -> -bc, --baddump-column
+-c, --cascade -> -dc, --diff-cascade
 -c, --cat -> -c, --category
 -dan, --desc-name -> -dan, --description-as-name
 -de, --desc -> -de, --description
 -df, --dat-fullnonmerged -> -df, --dat-full-non-merged
+-di, --diff -> -di, --diff-all
+-did, --diff-du -> -did, --diff-duplicates
+-din, --diff-in -> -din, --diff-individuals
+-dnd, --diff-nd -> -dnd, --diff-no-duplicates
 -dnd, --dat-devnonmerged -> -dnd, --dat-device-non-merged
 -dnm, --dat-nonmerged -> -dnm, --dat-non-merged
 -es, --ext -> -es, --extension
@@ -1405,7 +1418,8 @@ This section contains remappings from old flag names to new ones for the purpose
 -otsv, --output-tsv -> -ot=tsv, --output-type=tsv
 -ox, --output-xml -> -ot=xml, --output-type=logiqx
 -out, --out -> -out, --output-dir
--rc, --rev-cascade -> -rc, --reverse-cascade
+-rc, --rev-cascade -> -drc, --diff-reverse-cascade
+-rc, --reverse-cascade -> -drc, --diff-reverse-cascade
 -rep, --rep-ext -> -rep, --replace-extension
 -rmd5, --rem-md5 -> -rmd5, --remove-md5
 -rme, --rem-ext -> -rme, --remove-extensions

SabreTools/SabreTools.Help.cs

@@ -33,18 +33,6 @@ namespace SabreTools
 					longDescription: "If this flag is set, then the Date will be appended to each file information in the output DAT. The output format is standardized as \"yyyy/MM/dd HH:mm:ss\".");
 			}
 		}
-		private static Feature againstFlag
-		{
-			get
-			{
-				return new Feature(
-					"against",
-					new List<string>() { "-ag", "--against" },
-					"Diff all inputs against a set of base DATs",
-					FeatureType.Flag,
-					"This flag will enable a special type of diffing in which a set of base DATs are used as a comparison point for each of the input DATs. This allows users to get a slightly different output to cascaded diffing, which may be more useful in some cases. This is heavily influenced by the diffing model used by Romba.");
-			}
-		}
 		private static Feature allStatsFlag
 		{
 			get
@@ -105,18 +93,6 @@ namespace SabreTools
 					longDescription: "By default, no item names are changed except when there is a merge occurring. This flag enables users to define a DAT or set of base DATs to use as \"replacements\" for all input DATs. Note that the first found instance of an item in the base DAT(s) will be used and all others will be discarded. If no additional flag is given, it will default to updating names.");
 			}
 		}
-		private static Feature cascadeFlag
-		{
-			get
-			{
-				return new Feature(
-					"cascade",
-					new List<string>() { "-c", "--cascade" },
-					"Enable cascaded diffing",
-					FeatureType.Flag,
-					longDescription: "This flag allows for a special type of diffing in which the first DAT is considered a base, and for each additional input DAT, it only leaves the files that are not in one of the previous DATs. This can allow for the creation of rollback sets or even just reduce the amount of duplicates across multiple sets.");
-			}
-		}
 		private static Feature chdsAsFilesFlag
 		{
 			get
@@ -285,54 +261,90 @@ namespace SabreTools
 					longDescription: "By default, all DATs are converted exactly as they are input. Enabling this flag allows for the machine names in the DAT to be replaced by the machine description instead. In most cases, this will result in no change in the output DAT, but a notable example would be a software list DAT where the machine names are generally DOS-friendly while the description is more complete.");
 			}
 		}
-		private static Feature diffFlag
+		private static Feature diffAgainstFlag
 		{
 			get
 			{
 				return new Feature(
-					"diff",
+					"diff-against",
-					new List<string>() { "-di", "--diff" },
+					new List<string>() { "-dag", "--diff-against" },
-					"Create diffdats from inputs (all outputs)",
+					"Diff all inputs against a set of base DATs",
 					FeatureType.Flag,
-					longDescription: "By default, all DATs are processed individually with the user-specified flags. With this flag enabled, input DATs are diffed against each other in all ways specified by the --diff-X flags.");
+					"This flag will enable a special type of diffing in which a set of base DATs are used as a comparison point for each of the input DATs. This allows users to get a slightly different output to cascaded diffing, which may be more useful in some cases. This is heavily influenced by the diffing model used by Romba.");
 			}
 		}
-		private static Feature diffDuFlag
+		private static Feature diffAllFlag
 		{
 			get
 			{
 				return new Feature(
-					"diff-du",
+					"diff-all",
-					new List<string>() { "-did", "--diff-du" },
+					new List<string>() { "-di", "--diff-all" },
+					"Create diffdats from inputs (all standard outputs)",
+					FeatureType.Flag,
+					longDescription: "By default, all DATs are processed individually with the user-specified flags. With this flag enabled, input DATs are diffed against each other to find duplicates, no duplicates, and only in individuals.");
+			}
+		}
+		private static Feature diffCascadeFlag
+		{
+			get
+			{
+				return new Feature(
+					"diff-cascade",
+					new List<string>() { "-dc", "--diff-cascade" },
+					"Enable cascaded diffing",
+					FeatureType.Flag,
+					longDescription: "This flag allows for a special type of diffing in which the first DAT is considered a base, and for each additional input DAT, it only leaves the files that are not in one of the previous DATs. This can allow for the creation of rollback sets or even just reduce the amount of duplicates across multiple sets.");
+			}
+		}
+		private static Feature diffDuplicatesFlag
+		{
+			get
+			{
+				return new Feature(
+					"diff-duplicates",
+					new List<string>() { "-did", "--diff-duplicates" },
 					"Create diffdat containing just duplicates",
 					FeatureType.Flag,
 					longDescription: "All files that have duplicates outside of the original DAT are included.");
 			}
 		}
-		private static Feature diffInFlag
+		private static Feature diffIndividualsFlag
 		{
 			get
 			{
 				return new Feature(
-					"diff-in",
+					"diff-individuals",
-					new List<string>() { "-dii", "--diff-in" },
+					new List<string>() { "-dii", "--diff-individuals" },
 					"Create diffdats for individual DATs",
 					FeatureType.Flag,
 					longDescription: "All files that have no duplicates outside of the original DATs are put into DATs that are named after the source DAT.");
 			}
 		}
-		private static Feature diffNdFlag
+		private static Feature diffNoDuplicatesFlag
 		{
 			get
 			{
 				return new Feature(
-					"diff-nd",
+					"diff-no-duplicates",
-					new List<string>() { "-din", "--diff-nd" },
+					new List<string>() { "-din", "--diff-no-duplicates" },
 					"Create diffdat containing no duplicates",
 					FeatureType.Flag,
 					longDescription: "All files that have no duplicates outside of the original DATs are included.");
 			}
 		}
+		private static Feature diffReverseCascadeFlag
+		{
+			get
+			{
+				return new Feature(
+					"diff-reverse-cascade",
+					new List<string>() { "-drc", "--diff-reverse-cascade" },
+					"Enable reverse cascaded diffing",
+					FeatureType.Flag,
+					longDescription: "This flag allows for a special type of diffing in which the last DAT is considered a base, and for each additional input DAT, it only leaves the files that are not in one of the previous DATs. This can allow for the creation of rollback sets or even just reduce the amount of duplicates across multiple sets.");
+			}
+		}
 		private static Feature excludeOfFlag
 		{
 			get
@@ -921,18 +933,6 @@ namespace SabreTools
 					longDescription: "By default, no item names are changed except when there is a merge occurring. This flag enables users to define a DAT or set of base DATs to use as \"replacements\" for all input DATs. Note that the first found instance of an item in the last base DAT(s) will be used and all others will be discarded. If no additional flag is given, it will default to updating names.");
 			}
 		}
-		private static Feature reverseCascadeFlag
-		{
-			get
-			{
-				return new Feature(
-					"reverse-cascade",
-					new List<string>() { "-rc", "--reverse-cascade" },
-					"Enable reverse cascaded diffing",
-					FeatureType.Flag,
-					longDescription: "This flag allows for a special type of diffing in which the last DAT is considered a base, and for each additional input DAT, it only leaves the files that are not in one of the previous DATs. This can allow for the creation of rollback sets or even just reduce the amount of duplicates across multiple sets.");
-			}
-		}
 		private static Feature rombaFlag
 		{
 			get
@@ -2589,20 +2589,16 @@ The stats that are outputted are as follows:
 			update.AddFeature(gameDedupFlag);
 			update.AddFeature(mergeFlag);
 				update[mergeFlag].AddFeature(noAutomaticDateFlag);
-			update.AddFeature(diffFlag);
+			update.AddFeature(diffAllFlag);
-				update[diffFlag].AddFeature(againstFlag);
+				update[diffAllFlag].AddFeature(noAutomaticDateFlag);
-					update[diffFlag][againstFlag].AddFeature(baseDatListInput);
+			update.AddFeature(diffDuplicatesFlag);
-				update[diffFlag].AddFeature(noAutomaticDateFlag);
+				update[diffDuplicatesFlag].AddFeature(noAutomaticDateFlag);
-				update[diffFlag].AddFeature(cascadeFlag);
+			update.AddFeature(diffIndividualsFlag);
-					update[diffFlag][cascadeFlag].AddFeature(skipFirstOutputFlag);
+				update[diffIndividualsFlag].AddFeature(noAutomaticDateFlag);
-				update[diffFlag].AddFeature(reverseCascadeFlag);
+			update.AddFeature(diffNoDuplicatesFlag);
-					update[diffFlag][reverseCascadeFlag].AddFeature(skipFirstOutputFlag);
+				update[diffNoDuplicatesFlag].AddFeature(noAutomaticDateFlag);
-			update.AddFeature(diffDuFlag);
+			update.AddFeature(diffAgainstFlag);
-				update[diffDuFlag].AddFeature(noAutomaticDateFlag);
+				update[diffAgainstFlag].AddFeature(baseDatListInput);
-			update.AddFeature(diffInFlag);
-				update[diffInFlag].AddFeature(noAutomaticDateFlag);
-			update.AddFeature(diffNdFlag);
-				update[diffNdFlag].AddFeature(noAutomaticDateFlag);
 			update.AddFeature(baseReplaceFlag);
 				update[baseReplaceFlag].AddFeature(baseDatListInput);
 				update[baseReplaceFlag].AddFeature(updateNamesFlag);
@@ -2619,6 +2615,10 @@ The stats that are outputted are as follows:
 					update[reverseBaseReplaceFlag][updateDescriptionFlag].AddFeature(onlySameFlag);
 				update[reverseBaseReplaceFlag].AddFeature(updateYearFlag);
 				update[reverseBaseReplaceFlag].AddFeature(updateManufacturerFlag);
+			update.AddFeature(diffCascadeFlag);
+				update[diffCascadeFlag].AddFeature(skipFirstOutputFlag);
+			update.AddFeature(diffReverseCascadeFlag);
+				update[diffReverseCascadeFlag].AddFeature(skipFirstOutputFlag);
 			update.AddFeature(gameNameListInput);
 			update.AddFeature(notGameNameListInput);
 			update.AddFeature(gameDescriptionListInput);

SabreTools/SabreTools.cs

@@ -204,9 +204,6 @@ namespace SabreTools
 					case "add-date":
 						addFileDates = true;
 						break;
-					case "against":
-						updateMode |= UpdateMode.DiffAgainst;
-						break;
 					case "all-stats":
 						statDatFormat = StatReportFormat.All;
 						break;
@@ -222,9 +219,6 @@ namespace SabreTools
 					case "base-replace":
 						updateMode |= UpdateMode.BaseReplace;
 						break;
-					case "cascade":
-						updateMode |= UpdateMode.DiffCascade;
-						break;
 					case "chds-as-Files":
 						chdsAsFiles = true;
 						break;
@@ -272,18 +266,27 @@ namespace SabreTools
 					case "description-as-name":
 						descAsName = true;
 						break;
-					case "diff":
+					case "diff-against":
+						updateMode |= UpdateMode.DiffAgainst;
+						break;
+					case "diff-all":
 						updateMode |= UpdateMode.AllDiffs;
 						break;
-					case "diff-du":
+					case "diff-cascade":
+						updateMode |= UpdateMode.DiffCascade;
+						break;
+					case "diff-duplicates":
 						updateMode |= UpdateMode.DiffDupesOnly;
 						break;
-					case "diff-in":
+					case "diff-individuals":
 						updateMode |= UpdateMode.DiffIndividualsOnly;
 						break;
-					case "diff-nd":
+					case "diff-no-duplicates":
 						updateMode |= UpdateMode.DiffNoDupesOnly;
 						break;
+					case "diff-reverse-cascade":
+						updateMode |= UpdateMode.DiffReverseCascade;
+						break;
 					case "exclude-of":
 						datHeader.ExcludeOf = true;
 						break;
@@ -457,9 +460,6 @@ namespace SabreTools
 					case "reverse-base-name":
 						updateMode |= UpdateMode.ReverseBaseReplace;
 						break;
-					case "reverse-cascade":
-						updateMode |= UpdateMode.DiffReverseCascade;
-						break;
 					case "romba":
 						datHeader.Romba = true;
 						break;