[DatFile, FileTools] Tweak SL and SD types

SabreTools.Helper/Data/Flags.cs

@@ -29,6 +29,7 @@ namespace SabreTools.Helper
 		RedumpMD5 = 0x040,
 		RedumpSHA1 = 0x080,
 		RedumpSFV = 0x100,
+		SoftwareList = 0x200,
 	}
 
 	/// <summary>

SabreTools.Helper/Objects/Dat/DatFile.cs

@@ -1213,12 +1213,14 @@ namespace SabreTools.Helper
 			switch (FileTools.GetOutputFormat(filename, logger))
 			{
 				case OutputFormat.ClrMamePro:
+				case OutputFormat.DOSCenter:
 					ParseCMP(filename, sysid, srcid, gamename, romname, romtype, sgt, slt, seq, crc, md5, sha1, itemStatus, trim, single, root, logger, keep, clean);
 					break;
 				case OutputFormat.RomCenter:
 					ParseRC(filename, sysid, srcid, gamename, romname, romtype, sgt, slt, seq, crc, md5, sha1, itemStatus, trim, single, root, logger, clean);
 					break;
 				case OutputFormat.SabreDat:
+				case OutputFormat.SoftwareList:
 				case OutputFormat.Xml:
 					ParseXML(filename, sysid, srcid, gamename, romname, romtype, sgt, slt, seq, crc, md5, sha1, itemStatus, trim, single, root, logger, keep, clean, softlist);
 					break;
@@ -2130,6 +2132,48 @@ namespace SabreTools.Helper
 							{
 								Description = (String.IsNullOrEmpty(Description) ? xtr.GetAttribute("description") : Description);
 							}
+							if (xtr.GetAttribute("forcemerging") != null)
+							{
+								switch (xtr.GetAttribute("forcemerging"))
+								{
+									case "split":
+										ForceMerging = ForceMerging.Split;
+										break;
+									case "none":
+										ForceMerging = ForceMerging.None;
+										break;
+									case "full":
+										ForceMerging = ForceMerging.Full;
+										break;
+								}
+							}
+							if (xtr.GetAttribute("forceitemStatus") != null)
+							{
+								switch (xtr.GetAttribute("forceitemStatus"))
+								{
+									case "obsolete":
+										ForceNodump = ForceNodump.Obsolete;
+										break;
+									case "required":
+										ForceNodump = ForceNodump.Required;
+										break;
+									case "ignore":
+										ForceNodump = ForceNodump.Ignore;
+										break;
+								}
+							}
+							if (xtr.GetAttribute("forcepacking") != null)
+							{
+								switch (xtr.GetAttribute("forcepacking"))
+								{
+									case "zip":
+										ForcePacking = ForcePacking.Zip;
+										break;
+									case "unzip":
+										ForcePacking = ForcePacking.Unzip;
+										break;
+								}
+							}
 							xtr.Read();
 							break;
 						// Handle M1 DATs since they're 99% the same as a SL DAT
@@ -3202,7 +3246,7 @@ namespace SabreTools.Helper
 						break;
 					case OutputFormat.SabreDat:
 						header = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
-							"<!DOCTYPE datafile PUBLIC \"-//Logiqx//DTD ROM Management Datafile//EN\" \"http://www.logiqx.com/Dats/datafile.dtd\">\n\n" +
+							"<!DOCTYPE sabredat SYSTEM \"newdat.xsd\">\n\n" +
 							"<datafile>\n" +
 							"\t<header>\n" +
 							"\t\t<name>" + HttpUtility.HtmlEncode(Name) + "</name>\n" +

SabreTools.Helper/Tools/FileTools.cs

@@ -69,26 +69,55 @@ namespace SabreTools.Helper
 
 			try
 			{
+				// Get the first two lines to check
 				StreamReader sr = File.OpenText(filename);
-				string first = sr.ReadLine();
+				string first = sr.ReadLine().ToLowerInvariant();
+				string second = sr.ReadLine().ToLowerInvariant();
 				sr.Dispose();
-				if (first.Contains("<") && first.Contains(">"))
+
+				// If we have an XML-based DAT
+				if (first.StartsWith("<?xml") && first.EndsWith("?>"))
 				{
-					return OutputFormat.Xml;
+					if (second.StartsWith("<!doctype datafile"))
+					{
+						return OutputFormat.Xml;
+					}
+					else if (second.StartsWith("<!doctype softwarelist"))
+					{
+						return OutputFormat.SoftwareList;
+					}
+					else if (second.StartsWith("<!doctype sabredat"))
+					{
+						return OutputFormat.SabreDat;
+					}
 				}
+
+				// If we have an INI-based DAT
 				else if (first.Contains("[") && first.Contains("]"))
 				{
 					return OutputFormat.RomCenter;
 				}
-				else
+
+				// If we have a CMP-based DAT
+				else if (first.StartsWith("clrmamepro"))
 				{
 					return OutputFormat.ClrMamePro;
 				}
+				else if (first.StartsWith("romvault"))
+				{
+					return OutputFormat.ClrMamePro;
+				}
+				else if (first.StartsWith("doscenter"))
+				{
+					return OutputFormat.DOSCenter;
+				}
 			}
 			catch (Exception)
 			{
 				return 0;
 			}
+
+			return 0;
 		}
 
 		/// <summary>