Better shorthand, change internal naming

SabreTools.Library/DatFiles/DatFile.cs

@@ -136,12 +136,12 @@ namespace SabreTools.Library.DatFiles
                 case DatFormat.RomCenter:
                     return new RomCenter(baseDat);
 
-                case DatFormat.SabreDAT:
-                    return new SabreDat(baseDat);
-
                 case DatFormat.SabreJSON:
                     return new SabreJSON(baseDat);
 
+                case DatFormat.SabreXML:
+                    return new SabreXML(baseDat);
+
                 case DatFormat.SoftwareList:
                     return new SoftwareList(baseDat);
 

SabreTools.Library/DatFiles/DatHeader.cs

@@ -981,16 +981,16 @@ namespace SabreTools.Library.DatFiles
             }
 
             // SabreDAT
-            if (DatFormat.HasFlag(DatFormat.SabreDAT))
+            if (DatFormat.HasFlag(DatFormat.SabreXML))
             {
                 if (usedExtensions.Contains(".xml"))
                 {
-                    outfileNames.Add(DatFormat.SabreDAT, CreateOutFileNamesHelper(outDir, ".sd.xml", overwrite));
+                    outfileNames.Add(DatFormat.SabreXML, CreateOutFileNamesHelper(outDir, ".sd.xml", overwrite));
                     usedExtensions.Add(".sd.xml");
                 }
                 else
                 {
-                    outfileNames.Add(DatFormat.SabreDAT, CreateOutFileNamesHelper(outDir, ".xml", overwrite));
+                    outfileNames.Add(DatFormat.SabreXML, CreateOutFileNamesHelper(outDir, ".xml", overwrite));
                     usedExtensions.Add(".xml");
                 }
             }

SabreTools.Library/DatFiles/Enums.cs

@@ -38,7 +38,7 @@ namespace SabreTools.Library.DatFiles
         /// <summary>
         /// SabreDAT XML
         /// </summary>
-        SabreDAT = 1 << 5,
+        SabreXML = 1 << 5,
 
         /// <summary>
         /// openMSX Software List XML
@@ -55,7 +55,7 @@ namespace SabreTools.Library.DatFiles
         ClrMamePro = 1 << 7,
 
         /// <summary>
-        /// RomCetner INI-based
+        /// RomCenter INI-based
         /// </summary>
         RomCenter = 1 << 8,
 

SabreTools.Library/DatFiles/SabreJSON.cs

@@ -13,7 +13,7 @@ using Newtonsoft.Json.Linq;
 namespace SabreTools.Library.DatFiles
 {
     /// <summary>
-    /// Represents parsing and writing of a reference SabreJSON DAT
+    /// Represents parsing and writing of a reference SabreDAT JSON
     /// </summary>
     internal class SabreJSON : DatFile
     {

SabreTools.Library/DatFiles/SabreXML.cs

@@ -12,15 +12,15 @@ using SabreTools.Library.IO;
 namespace SabreTools.Library.DatFiles
 {
     /// <summary>
-    /// Represents parsing and writing of a SabreDat XML DAT
+    /// Represents parsing and writing of a SabreDAT XML
     /// </summary>
-    internal class SabreDat : DatFile
+    internal class SabreXML : DatFile
     {
         /// <summary>
         /// Constructor designed for casting a base DatFile
         /// </summary>
         /// <param name="datFile">Parent DatFile to copy from</param>
-        public SabreDat(DatFile datFile)
+        public SabreXML(DatFile datFile)
             : base(datFile)
         {
         }

SabreTools.Library/IO/FileExtensions.cs

@@ -148,7 +148,7 @@ namespace SabreTools.Library.IO
                         return DatFormat.SoftwareList;
 
                     else if (second.StartsWith("<!doctype sabredat"))
-                        return DatFormat.SabreDAT;
+                        return DatFormat.SabreXML;
 
                     else if ((second.StartsWith("<dat") && !second.StartsWith("<datafile"))
                         || second.StartsWith("<?xml-stylesheet"))

SabreTools.Library/README.1ST

@@ -262,7 +262,6 @@ Options:
 		  cmp, clrmamepro	- ClrMamePro
 		  csv				- Standardized Comma-Separated Value
 		  dc, doscenter		- DOSCenter
-		  json				- SabreJSON
 		  lr, listrom		- MAME Listrom
 		  lx, listxml		- MAME Listxml
 		  miss, missfile	- GoodTools Missfile
@@ -271,7 +270,8 @@ Options:
 		  ol, offlinelist	- OfflineList XML
 		  rc, romcenter		- RomCenter
 		  ripemd160         - RIPEMD160 (.NET Framework 4.8 only)
-		  sd, sabredat		- SabreDAT XML
+		  sj, sabrejson     - SabreJSON
+		  sx, sabrexml      - SabreDAT XML
 		  sfv				- SFV
 		  sha1				- SHA1
 		  sha256			- SHA256
@@ -635,7 +635,6 @@ Options:
 		  cmp, clrmamepro	- ClrMamePro
 		  csv				- Standardized Comma-Separated Value
 		  dc, doscenter		- DOSCenter
-		  json				- SabreJSON
 		  lr, listrom		- MAME Listrom
 		  lx, listxml		- MAME Listxml
 		  miss, missfile	- GoodTools Missfile
@@ -644,7 +643,8 @@ Options:
 		  ol, offlinelist	- OfflineList XML
 		  rc, romcenter		- RomCenter
 		  ripemd160			- RIPEMD160 (.NET Framework 4.8 only)
-		  sd, sabredat		- SabreDAT XML
+		  sj, sabrejson     - SabreJSON
+		  sx, sabrexml      - SabreDAT XML
 		  sfv				- SFV
 		  sha1				- SHA1
 		  sha256			- SHA256
@@ -790,7 +790,6 @@ Options:
 		  cmp, clrmamepro	- ClrMamePro
 		  csv				- Standardized Comma-Separated Value
 		  dc, doscenter		- DOSCenter
-		  json				- SabreJSON
 		  lr, listrom		- MAME Listrom
 		  lx, listxml		- MAME Listxml
 		  miss, missfile	- GoodTools Missfile
@@ -799,7 +798,8 @@ Options:
 		  ol, offlinelist	- OfflineList XML
 		  rc, romcenter		- RomCenter
 		  ripemd160			- RIPEMD160 (.NET Framework 4.8 only)
-		  sd, sabredat		- SabreDAT XML
+		  sj, sabrejson     - SabreJSON
+		  sx, sabrexml      - SabreDAT XML
 		  sfv				- SFV
 		  sha1				- SHA1
 		  sha256			- SHA256

SabreTools.Library/Tools/Converters.cs

@@ -187,6 +187,8 @@ namespace SabreTools.Library.Tools
                 case "smdb":
                     return DatFormat.EverdriveSMDB;
                 case "json":
+                case "sj":
+                case "sabrejson":
                     return DatFormat.SabreJSON;
                 case "lr":
                 case "listrom":
@@ -214,7 +216,9 @@ namespace SabreTools.Library.Tools
 #endif
                 case "sd":
                 case "sabredat":
-                    return DatFormat.SabreDAT;
+                case "sx":
+                case "sabrexml":
+                    return DatFormat.SabreXML;
                 case "sfv":
                     return DatFormat.RedumpSFV;
                 case "sha1":

SabreTools/Features/BaseFeature.cs

@@ -1741,7 +1741,6 @@ Possible values are:
     cmp, clrmamepro  - ClrMamePro
     csv              - Standardized Comma-Separated Value
     dc, doscenter    - DOSCenter
-    json             - SabreJSON
     lr, listrom      - MAME Listrom
     lx, listxml      - MAME Listxml
     miss, missfile   - GoodTools Missfile
@@ -1754,7 +1753,8 @@ Possible values are:
     ripemd160        - RIPEMD160"
 #endif
 + @"
-    sd, sabredat     - SabreDAT XML
+    sj, sabrejson    - SabreJSON
+    sx, sabrexml     - SabreDAT XML
     sfv              - SFV
     sha1             - SHA1
     sha256           - SHA256