More code cleanup

This change comprises of multiple smaller changes:
- Convert all WriteToDat to WriteToDatFromDict, including MissFile
- Change obsolete Import to use updated ParseDict
- Remove all references to Parse
- Rename all references to "Dict" specific code to shorter names
- Remove more unused methods rendered obsolete by other changes

DATFromDir/DATFromDir.cs

@@ -23,7 +23,7 @@ namespace SabreTools
 		private string _tempDir;
 
 		// Extraction and listing related variables
-		private List<RomData> _roms;
+		private Dictionary<string, List<RomData>> _dict;
 		private List<String> _inputs;
 
 		// User specified flags
@@ -214,8 +214,8 @@ namespace SabreTools
 		/// <returns>True if the DAT could be created, false otherwise</returns>
 		public bool Start()
 		{
-			// Create an output array for all found items
+			// Create an output dictionary for all found items
-			_roms = new List<RomData>();
+			_dict = new Dictionary<string, List<RomData>>();
 
 			/*
 			For clarity, here is the process for SuperDAT:
@@ -283,25 +283,11 @@ namespace SabreTools
 			}
 
 			// If we found nothing (error state), exit
-			if (_roms.Count == 0)
+			if (_dict.Count == 0)
 			{
 				return false;
 			}
 
-			// Order the roms by name of parent, then name of rom
-			_roms.Sort(delegate (RomData A, RomData B)
-			{
-				if (A.Game == B.Game)
-				{
-					if (A.Name == B.Name)
-					{
-						return (int)(A.Size - B.Size);
-					}
-					return String.Compare(A.Name, B.Name);
-				}
-				return String.Compare(A.Game, B.Game);
-			});
-
 			// Double check to see what it needs to be named
 			if (_name == "")
 			{
@@ -321,8 +307,21 @@ namespace SabreTools
 			_name = (_name == "" ? "Default" : _name);
 			_desc = (_desc == "" ? _name + (_bare ? "" : " (" + _date + ")") : _desc);
 
+			DatData datdata = new DatData
+			{
+				Name = _name,
+				Description = _desc,
+				Version = _version,
+				Date = _date,
+				Category = _cat,
+				Author = _author,
+				ForcePacking = (_forceunpack ? ForcePacking.Unzip : ForcePacking.None),
+				OutputFormat = (_old ? OutputFormat.ClrMamePro : OutputFormat.Xml),
+				Roms = _dict,
+			};
+
 			// Now write it all out as a DAT
-			Output.WriteToDat(_name, _desc, _version, _date, _cat, _author, _forceunpack, _old, Environment.CurrentDirectory, _roms, _logger);
+			Output.WriteDatfile(datdata, Environment.CurrentDirectory, _logger);
 
 			return true;
 		}
@@ -331,7 +330,7 @@ namespace SabreTools
 		/// Check a given file for hashes, based on current settings
 		/// </summary>
 		/// <param name="item">Filename of the item to be checked</param>
-		private void ProcessFile (string item)
+		private void ProcessFile(string item)
 		{
 			// Create the temporary output directory
 			DirectoryInfo di = Directory.CreateDirectory(_tempDir);
@@ -409,7 +408,7 @@ namespace SabreTools
 						continue;
 					}
 
-					_roms.Add(new RomData
+					RomData rom = new RomData
 					{
 						Type = "rom",
 						Game = Path.GetFileNameWithoutExtension(item),
@@ -418,7 +417,19 @@ namespace SabreTools
 						CRC = fileCRC,
 						MD5 = fileMD5,
 						SHA1 = fileSHA1,
-					});
+					};
+
+					string key = rom.Size + "-" + rom.CRC;
+					if (_dict.ContainsKey(key))
+					{
+						_dict[key].Add(rom);
+					}
+					else
+					{
+						List<RomData> temp = new List<RomData>();
+						temp.Add(rom);
+						_dict.Add(key, temp);
+					}
 
 					_logger.User("File added: " + entry + Environment.NewLine);
 				}
@@ -473,7 +484,7 @@ namespace SabreTools
 
 					_logger.Log("Actual item added: " + actualitem);
 
-					_roms.Add(new RomData
+					RomData rom = new RomData
 					{
 						Type = "rom",
 						Game = actualroot,
@@ -482,7 +493,19 @@ namespace SabreTools
 						CRC = fileCRC,
 						MD5 = fileMD5,
 						SHA1 = fileSHA1,
-					});
+					};
+
+					string key = rom.Size + "-" + rom.CRC;
+					if (_dict.ContainsKey(key))
+					{
+						_dict[key].Add(rom);
+					}
+					else
+					{
+						List<RomData> temp = new List<RomData>();
+						temp.Add(rom);
+						_dict.Add(key, temp);
+					}
 
 					_logger.User("File added: " + actualitem + Environment.NewLine);
 				}

DATabase/DATabase.cs

@@ -1314,12 +1314,12 @@ Make a selection:
 					MergeRoms = false,
 				};
 
-				datdata = RomManipulation.ParseDict(filename, 0, 0, datdata, logger);
+				datdata = RomManipulation.Parse(filename, 0, 0, datdata, logger);
 
 				logger.User("datdata.Description: " + datdata.Description);
 
 				datdata.Description += ".new";
-				Output.WriteToDatFromDict(datdata, Path.GetDirectoryName(filename), logger);
+				Output.WriteDatfile(datdata, Path.GetDirectoryName(filename), logger);
 			}
 			else
 			{
@@ -1354,12 +1354,12 @@ Make a selection:
 					MergeRoms = false,
 				};
 
-				datdata = RomManipulation.ParseDict(filename, 0, 0, datdata, logger);
+				datdata = RomManipulation.Parse(filename, 0, 0, datdata, logger);
 
 				logger.User("datdata.Description: " + datdata.Description);
 
 				datdata.Description += ".new";
-				Output.WriteToDatFromDict(datdata, Path.GetDirectoryName(filename), logger);
+				Output.WriteDatfile(datdata, Path.GetDirectoryName(filename), logger);
 			}
 			else
 			{
@@ -1394,12 +1394,12 @@ Make a selection:
 					MergeRoms = false,
 				};
 
-				datdata = RomManipulation.ParseDict(filename, 0, 0, datdata, logger);
+				datdata = RomManipulation.Parse(filename, 0, 0, datdata, logger);
 
 				logger.User("datdata.Description: " + datdata.Description);
 
 				datdata.Description += ".new";
-				Output.WriteToDatFromDict(datdata, Path.GetDirectoryName(filename), logger);
+				Output.WriteDatfile(datdata, Path.GetDirectoryName(filename), logger);
 			}
 			else
 			{
@@ -1430,11 +1430,42 @@ Make a selection:
 				input = Path.GetFullPath(input);
 
 				// Get the output name
-				string name = Path.GetFileNameWithoutExtension(input) + "-miss.txt";
+				string name = Path.GetFileNameWithoutExtension(input) + "-miss";
 
 				// Read in the roms from the DAT and then write them to the file
 				logger.User("Converting " + input);
-				Output.WriteToText(name, Path.GetDirectoryName(input), RomManipulation.Parse(input, 0, 0, logger), logger, usegame, prefix, postfix, addext, repext, quotes, gamename);
+				DatData datdata = new DatData
+				{
+					Name = "",
+					Description = "",
+					Category = "",
+					Version = "",
+					Date = "",
+					Author = "",
+					Email = "",
+					Homepage = "",
+					Url = "",
+					Comment = "",
+					Roms = new Dictionary<string, List<RomData>>(),
+					OutputFormat = OutputFormat.MissFile,
+
+					UseGame = usegame,
+					Prefix = prefix,
+					Postfix = postfix,
+					AddExt = addext,
+					RepExt = repext,
+					Quotes = quotes,
+					GameName = gamename,
+				};
+				datdata = RomManipulation.Parse(input, 0, 0, datdata, logger);
+				datdata.Name += "-miss";
+				datdata.Description += "-miss";
+
+				// Normalize the extensions
+				addext = (addext == "" || addext.StartsWith(".") ? addext : "." + addext);
+				repext = (repext == "" || repext.StartsWith(".") ? repext : "." + repext);
+
+				Output.WriteDatfile(datdata, Path.GetDirectoryName(input), logger);
 				logger.User(input + " converted to: " + name);
 				return;
 			}

DATabase/ExtSplit.cs

@@ -73,7 +73,7 @@ namespace SabreTools
 			};
 
 			// Load the current DAT to be processed
-			datdata = RomManipulation.ParseDict(_filename, 0, 0, datdata, _logger);
+			datdata = RomManipulation.Parse(_filename, 0, 0, datdata, _logger);
 
 			// Set all of the appropriate outputs for each of the subsets
 			OutputFormat outputFormat = RomManipulation.GetOutputFormat(_filename);
@@ -172,8 +172,8 @@ namespace SabreTools
 			}
 
 			// Then write out both files
-			bool success = Output.WriteToDatFromDict(datdataA, _outdir, _logger);
+			bool success = Output.WriteDatfile(datdataA, _outdir, _logger);
-			success &= Output.WriteToDatFromDict(datdataB, _outdir, _logger);
+			success &= Output.WriteDatfile(datdataB, _outdir, _logger);
 
 			return success;
 		}

DATabase/Generate.cs

@@ -155,10 +155,10 @@ namespace SabreTools
 			}
 
 			// Retrieve the list of processed roms
-			List<RomData> roms = ProcessRoms();
+			Dictionary<string, List<RomData>> dict = ProcessRoms();
 
 			// If the output is null, nothing was found so return false
-			if (roms == null)
+			if (dict.Count == 0)
 			{
 				return false;
 			}
@@ -168,16 +168,29 @@ namespace SabreTools
 			string intname = systemname + " (" + sourcename + ")";
 			string datname = systemname + " (" + sourcename + " " + version + ")";
 
-			return Output.WriteToDat(intname, datname, version, version, "The Wizard of DATz", "The Wizard of DATz", false, _old, _outdir, roms, _logger);
+			DatData datdata = new DatData
+			{
+				Name = intname,
+				Description = datname,
+				Version = version,
+				Date = version,
+				Category = "The Wizard of DATz",
+				Author = "The Wizard of DATz",
+				ForcePacking = ForcePacking.None,
+				OutputFormat = (_old ? OutputFormat.ClrMamePro : OutputFormat.Xml),
+				Roms = dict,
+			};
+
+			return Output.WriteDatfile(datdata, _outdir, _logger);
 		}
 
 		/// <summary>
 		/// Preprocess the rom data that is to be included in the outputted DAT
 		/// </summary>
 		/// <returns>A List of RomData objects containing all information about the files</returns>
-		public List<RomData> ProcessRoms()
+		public Dictionary<string, List<RomData>> ProcessRoms()
 		{
-			List<RomData> roms = new List<RomData>();
+			Dictionary<string, List<RomData>> roms = new Dictionary<string, List<RomData>>();
 
 			// Check if we have listed sources or systems
 			bool sysmerged = (_systems == "" || _systems.Split(',').Length > 1);
@@ -250,7 +263,17 @@ JOIN checksums
 									(srcmerged ? " [" + temp.Source + "]" : "");
 							}
 
-							roms.Add(temp);
+							string key = temp.Size + "-" + temp.CRC;
+							if (roms.ContainsKey(key))
+							{
+								roms[key].Add(temp);
+							}
+							else
+							{
+								List<RomData> templist = new List<RomData>();
+								templist.Add(temp);
+								roms.Add(key, templist);
+							}
 						}
 					}
 				}
@@ -259,8 +282,10 @@ JOIN checksums
 			// If we're in a merged mode, merge and then resort by the correct parameters
 			if (merged)
 			{
-				roms = RomManipulation.Merge(roms, true);
+				foreach (string key in roms.Keys)
-				RomManipulation.Sort(roms, _norename);
+				{
+					roms[key] = RomManipulation.Merge(roms[key]);
+				}
 			}
 			// END COMMENT
 
@@ -338,7 +363,17 @@ JOIN source
 										(srcmerged ? " [" + temp.Source + "]" : "");
 								}
 
-								roms.Add(temp);
+								string key = temp.Size + "-" + temp.CRC;
+								if (roms.ContainsKey(key))
+								{
+									roms[key].Add(temp);
+								}
+								else
+								{
+									List<RomData> templist = new List<RomData>();
+									templist.Add(temp);
+									roms.Add(key, templist);
+								}
 
 								// Reset the variables
 								game = "";
@@ -380,13 +415,16 @@ JOIN source
 			// If we're in a merged mode, merge
 			if (merged)
 			{
-				roms = RomManipulation.Merge(roms);
+				foreach (string key in roms.Keys)
+				{
+					roms[key] = RomManipulation.Merge(roms[key]);
+				}
 			}
-
-			// Now sort the roms by the correct parameters
-			RomManipulation.Sort(roms, _norename);
 			*/
 
+			/*
+			// THIS CODE SHOULD BE PUT IN WriteToDatFromDict
+
 			// Now check rename within games
 			string lastname = "", lastgame = "";
 			for (int i = 0; i < roms.Count; i++)
@@ -420,6 +458,7 @@ JOIN source
 				// Assign back just in case
 				roms[i] = rom;
 			}
+			*/
 
 			return roms;
 		}

DATabase/Import.cs

@@ -399,25 +399,57 @@ namespace SabreTools
 			}
 
 			// Get all roms that are found in the DAT to see what needs to be added
-			List<RomData> roms = RomManipulation.Parse(_filepath, sysid, srcid, _logger);
+			DatData datdata = new DatData
+			{
+				Roms = new Dictionary<string, List<RomData>>(),
+			};
+			datdata = RomManipulation.Parse(_filepath, sysid, srcid, datdata, _logger);
 
-			// Sort and loop over all roms, checking for adds
+			// Sort inputted roms into games
+			SortedDictionary<string, List<RomData>> sortable = new SortedDictionary<string, List<RomData>>();
+			long count = 0;
+			foreach (List<RomData> roms in datdata.Roms.Values)
+			{
+				List<RomData> newroms = roms;
+				if (datdata.MergeRoms)
+				{
+					newroms = RomManipulation.Merge(newroms);
+				}
+
+				foreach (RomData rom in newroms)
+				{
+					count++;
+					string key = rom.SystemID.ToString().PadLeft(10, '0') + "-" + rom.SourceID.ToString().PadLeft(10, '0') + "-" + rom.Game.ToLowerInvariant();
+					if (sortable.ContainsKey(key))
+					{
+						sortable[key].Add(rom);
+					}
+					else
+					{
+						List<RomData> temp = new List<RomData>();
+						temp.Add(rom);
+						sortable.Add(key, temp);
+					}
+				}
+			}
+
+			// Loop over all roms, checking for adds
+			foreach (string key in sortable.Keys)
+			{
+				List<RomData> roms = sortable[key];
 				RomManipulation.Sort(roms, true);
-			string lastgame = "";
+
 				long gameid = -1;
 				using (SqliteConnection dbc = new SqliteConnection(_connectionString))
 				{
 					dbc.Open();
+
+					// For each game, check for a new ID
+					gameid = AddGame(sysid, roms[0].Game, srcid, dbc);
+
 					foreach (RomData rom in roms)
 					{
 						// BEGIN COMMENT
-					// If we have a new game, check for a new ID
-					if (rom.Game != lastgame)
-					{
-						gameid = AddGame(sysid, rom.Game, srcid, dbc);
-						lastgame = rom.Game;
-					}
-
 						// Try to add the rom with the game information
 						AddRom(rom, gameid, date, dbc);
 						// END COMMENT
@@ -428,6 +460,7 @@ namespace SabreTools
 						*/
 					}
 				}
+			}
 
 			return true;
 		}

DATabase/MergeDiff.cs

@@ -115,7 +115,7 @@ namespace SabreTools
 			foreach (string input in _inputs)
 			{
 				_logger.User("Adding DAT: " + input);
-				userData = RomManipulation.ParseDict(input, i, 0, userData, _logger);
+				userData = RomManipulation.Parse(input, i, 0, userData, _logger);
 				i++;
 			}
 			
@@ -164,7 +164,7 @@ namespace SabreTools
 				post = " (No Duplicates)";
 
 				// Output the difflist (a-b)+(b-a) diff
-				Output.WriteToDatFromDict(outerDiffData, "", _logger);
+				Output.WriteDatfile(outerDiffData, "", _logger);
 
 				// For the AB mode-style diffs, get all required dictionaries and output with a new name
 				// Loop through _inputs first and filter from all diffed roms to find the ones that have the same "System"
@@ -205,7 +205,7 @@ namespace SabreTools
 					}
 
 					post = " (" + Path.GetFileNameWithoutExtension(_inputs[j]) + " Only)";
-					Output.WriteToDatFromDict(diffData, "", _logger);
+					Output.WriteDatfile(diffData, "", _logger);
 				}
 
 				// Get all entries that have External dupes
@@ -246,12 +246,12 @@ namespace SabreTools
 					}
 				}
 
-				Output.WriteToDatFromDict(dupeData, "", _logger);
+				Output.WriteDatfile(dupeData, "", _logger);
 			}
 			// Output all entries with user-defined merge
 			else
 			{
-				Output.WriteToDatFromDict(userData, "", _logger);
+				Output.WriteDatfile(userData, "", _logger);
 			}
 
 			return true;

DATabase/TrimMerge.cs

@@ -98,7 +98,7 @@ namespace SabreTools
 				ForcePacking = (_forceunpack ? ForcePacking.Unzip : ForcePacking.None),
 				OutputFormat = RomManipulation.GetOutputFormat(filename),
 			};
-			datdata = RomManipulation.ParseDict(filename, 0, 0, datdata, _logger);
+			datdata = RomManipulation.Parse(filename, 0, 0, datdata, _logger);
 
 			// Trim all file names according to the path that's set
 			foreach (string key in datdata.Roms.Keys)
@@ -130,7 +130,7 @@ namespace SabreTools
 			}
 
 			// Now write the file out accordingly
-			Output.WriteToDatFromDict(datdata, Path.GetDirectoryName(filename), _logger);
+			Output.WriteDatfile(datdata, Path.GetDirectoryName(filename), _logger);
 
 			// Remove the original file if different and inform the user
 			if (filename != datdata.Description + (RomManipulation.GetOutputFormat(filename) == OutputFormat.Xml ? ".xml" : ".dat"))

DATabaseTwo/Generate.cs

@@ -174,7 +174,7 @@ namespace SabreTools
 				{
 					Int32.TryParse(sourcemap[hash], out tempSrcId);
 				}
-				datdata = RomManipulation.ParseDict(file, 0, tempSrcId, datdata, _logger);
+				datdata = RomManipulation.Parse(file, 0, tempSrcId, datdata, _logger);
 			}
 
 			// If the dictionary is empty for any reason, tell the user and exit
@@ -239,7 +239,7 @@ namespace SabreTools
 			}
 
 			// Then write out the file
-			Output.WriteToDatFromDict(datdata, _outroot, _logger, _norename);
+			Output.WriteDatfile(datdata, _outroot, _logger, _norename);
 
 			return true;
 		}

OfflineMerge/OfflineMerge.cs

@@ -148,8 +148,8 @@ namespace SabreTools
 				{
 					Roms = new Dictionary<string, List<RomData>>(),
 				};
-				completeDats = RomManipulation.ParseDict(_currentAllMerged, 0, 0, completeDats, _logger);
+				completeDats = RomManipulation.Parse(_currentAllMerged, 0, 0, completeDats, _logger);
-				completeDats = RomManipulation.ParseDict(_currentNewMerged, 0, 0, completeDats, _logger);
+				completeDats = RomManipulation.Parse(_currentNewMerged, 0, 0, completeDats, _logger);
 
 				// Now get Net New output dictionary [(currentNewMerged)-(currentAllMerged)]
 				_logger.User("Creating and populating Net New dictionary");
@@ -205,7 +205,7 @@ namespace SabreTools
 				{
 					Roms = new Dictionary<string, List<RomData>>(),
 				};
-				midMissing = RomManipulation.ParseDict(_currentMissingMerged, 0, 0, midMissing, _logger);
+				midMissing = RomManipulation.Parse(_currentMissingMerged, 0, 0, midMissing, _logger);
 				foreach (string key in unneeded.Keys)
 				{
 					if (midMissing.Roms.ContainsKey(key))
@@ -441,10 +441,10 @@ namespace SabreTools
 					Roms = have,
 				};
 
-				Output.WriteToDatFromDict(netNewData, "", _logger);
+				Output.WriteDatfile(netNewData, "", _logger);
-				Output.WriteToDatFromDict(unneededData, "", _logger);
+				Output.WriteDatfile(unneededData, "", _logger);
-				Output.WriteToDatFromDict(newMissingData, "", _logger);
+				Output.WriteDatfile(newMissingData, "", _logger);
-				Output.WriteToDatFromDict(haveData, "", _logger);
+				Output.WriteDatfile(haveData, "", _logger);
 
 				return true;
 			}
@@ -458,8 +458,8 @@ namespace SabreTools
 				{
 					Roms = new Dictionary<string, List<RomData>>(),
 				};
-				midHave = RomManipulation.ParseDict(_currentMissingMerged, 0, 0, midHave, _logger);
+				midHave = RomManipulation.Parse(_currentMissingMerged, 0, 0, midHave, _logger);
-				midHave = RomManipulation.ParseDict(_currentAllMerged, 0, 0, midHave, _logger);
+				midHave = RomManipulation.Parse(_currentAllMerged, 0, 0, midHave, _logger);
 				Dictionary<string, List<RomData>> have = new Dictionary<string, List<RomData>>();
 				foreach (string key in midHave.Roms.Keys)
 				{
@@ -517,7 +517,7 @@ namespace SabreTools
 					MergeRoms = true,
 					Roms = have,
 				};
-				Output.WriteToDatFromDict(haveData, "", _logger);
+				Output.WriteDatfile(haveData, "", _logger);
 
 				return true;
 			}
@@ -531,8 +531,8 @@ namespace SabreTools
 				{
 					Roms = new Dictionary<string, List<RomData>>(),
 				};
-				midHave = RomManipulation.ParseDict(_currentMissingMerged, 0, 0, midHave, _logger);
+				midHave = RomManipulation.Parse(_currentMissingMerged, 0, 0, midHave, _logger);
-				midHave = RomManipulation.ParseDict(_currentNewMerged, 0, 0, midHave, _logger);
+				midHave = RomManipulation.Parse(_currentNewMerged, 0, 0, midHave, _logger);
 				Dictionary<string, List<RomData>> have = new Dictionary<string, List<RomData>>();
 				foreach (string key in midHave.Roms.Keys)
 				{
@@ -590,7 +590,7 @@ namespace SabreTools
 					MergeRoms = true,
 					Roms = have,
 				};
-				Output.WriteToDatFromDict(haveData, "", _logger);
+				Output.WriteDatfile(haveData, "", _logger);
 
 				return true;
 			}

SabreHelper/Output.cs

@@ -10,134 +10,6 @@ namespace SabreTools.Helper
 {
 	public class Output
 	{
-		/// <summary>
-		/// Create and open an output file for writing
-		/// </summary>
-		/// <param name="name">Internal name of the DAT</param>
-		/// <param name="description">Description and external name of the DAT</param>
-		/// <param name="version">Version or iteration of the DAT</param>
-		/// <param name="date">Usually the DAT creation date</param>
-		/// <param name="category">Category of the DAT</param>
-		/// <param name="author">DAT author</param>
-		/// <param name="forceunpack">Force all sets to be unzipped</param>
-		/// <param name="old">Set output mode to old-style DAT</param>
-		/// <param name="outDir">Set the output directory</param>
-		/// <param name="roms">List of RomData objects representing the games to be written out</param>
-		/// <param name="logger">Logger object for console and/or file output</param>
-		/// <returns>Tru if the DAT was written correctly, false otherwise</returns>
-		public static bool WriteToDat(string name, string description, string version, string date, string category, string author,
-			bool forceunpack, bool old, string outDir, List<RomData> roms, Logger logger)
-		{
-			// If it's empty, use the current folder
-			if (outDir.Trim() == "")
-			{
-				outDir = Environment.CurrentDirectory;
-			}
-
-			// Double check the outdir for the end delim
-			if (!outDir.EndsWith(Path.DirectorySeparatorChar.ToString()))
-			{
-				outDir += Path.DirectorySeparatorChar;
-			}
-
-			// (currently uses current time, change to "last updated time")
-			logger.User("Opening file for writing: " + outDir + description + (old ? ".dat" : ".xml"));
-
-			try
-			{
-				FileStream fs = File.Create(outDir + description + (old ? ".dat" : ".xml"));
-				StreamWriter sw = new StreamWriter(fs, Encoding.UTF8);
-
-				string header_old = "clrmamepro (\n" +
-					"\tname \"" + HttpUtility.HtmlEncode(name) + "\"\n" +
-					"\tdescription \"" + HttpUtility.HtmlEncode(description) + "\"\n" +
-					"\tcategory \"" + HttpUtility.HtmlEncode(category) + "\"\n" +
-					"\tversion \"" + HttpUtility.HtmlEncode(version) + "\"\n" +
-					"\tdate \"" + HttpUtility.HtmlEncode(date) + "\"\n" +
-					"\tauthor \"" + HttpUtility.HtmlEncode(author) + "\"\n" +
-					(forceunpack ? "\tforcezipping no\n" : "") +
-					")\n";
-
-				string 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" +
-					"<datafile>\n" +
-					"\t<header>\n" +
-					"\t\t<name>" + HttpUtility.HtmlEncode(name) + "</name>\n" +
-					"\t\t<description>" + HttpUtility.HtmlEncode(description) + "</description>\n" +
-					"\t\t<category>" + HttpUtility.HtmlEncode(category) + "</category>\n" +
-					"\t\t<version>" + HttpUtility.HtmlEncode(version) + "</version>\n" +
-					"\t\t<date>" + HttpUtility.HtmlEncode(date) + "</date>\n" +
-					"\t\t<author>" + HttpUtility.HtmlEncode(author) + "</author>\n" +
-					(forceunpack ? "\t\t<clrmamepro forcepacking=\"unzip\" />\n" : "") +
-					"\t</header>\n";
-
-				// Write the header out
-				sw.Write((old ? header_old : header));
-
-				// Write out each of the machines and roms
-				string lastgame = null;
-				foreach (RomData rom in roms)
-				{
-					string state = "";
-					if (lastgame != null && lastgame != rom.Game)
-					{
-						state += (old ? ")\n" : "\t</machine>\n");
-					}
-
-					if (lastgame != rom.Game)
-					{
-						state += (old ? "game (\n\tname \"" + rom.Game + "\"\n" +
-							"\tdescription \"" + rom.Game + "\"\n" :
-							"\t<machine name=\"" + HttpUtility.HtmlEncode(rom.Game) + "\">\n" +
-							"\t\t<description>" + HttpUtility.HtmlEncode(rom.Game) + "</description>\n");
-					}
-
-					if (old)
-					{
-						state += "\t" + rom.Type + " ( name \"" + rom.Name + "\"" +
-							(rom.Size != -1 &&
-								rom.Size != 0 &&
-								rom.CRC != RomManipulation.CRCZero &&
-								rom.MD5 != RomManipulation.MD5Zero &&
-								rom.SHA1 != RomManipulation.SHA1Zero ? " size " + rom.Size : "") +
-							(rom.CRC != "" ? " crc " + rom.CRC.ToLowerInvariant() : "") +
-							(rom.MD5 != "" ? " md5 " + rom.MD5.ToLowerInvariant() : "") +
-							(rom.SHA1 != "" ? " sha1 " + rom.SHA1.ToLowerInvariant() : "") +
-							" )\n";
-					}
-					else
-					{
-						state += "\t\t<" + rom.Type + " name=\"" + HttpUtility.HtmlEncode(rom.Name) + "\"" +
-							(rom.Size != -1 &&
-								rom.Size != 0 &&
-								rom.CRC != RomManipulation.CRCZero &&
-								rom.MD5 != RomManipulation.MD5Zero &&
-								rom.SHA1 != RomManipulation.SHA1Zero ? " size=\"" + rom.Size + "\"" : "") +
-							(rom.CRC != "" ? " crc=\"" + rom.CRC.ToLowerInvariant() + "\"" : "") +
-							(rom.MD5 != "" ? " md5=\"" + rom.MD5.ToLowerInvariant() + "\"" : "") +
-							(rom.SHA1 != "" ? " sha1=\"" + rom.SHA1.ToLowerInvariant() + "\"" : "") +
-							"/>\n";
-					}
-
-					lastgame = rom.Game;
-
-					sw.Write(state);
-				}
-
-				sw.Write((old ? ")" : "\t</machine>\n</datafile>"));
-				logger.User("File written!" + Environment.NewLine);
-				sw.Close();
-				fs.Close();
-			}
-			catch (Exception ex)
-			{
-				logger.Error(ex.ToString());
-				return false;
-			}
-
-			return true;
-		}
-
 		/// <summary>
 		/// Create and open an output file for writing direct from a dictionary
 		/// </summary>
@@ -150,8 +22,13 @@ namespace SabreTools.Helper
 		/// The following features have been requested for file output:
 		/// - Have the ability to strip special (non-ASCII) characters from rom information
 		/// - Add a flag for ignoring roms with blank sizes
+		/// - For OutputFormat.MissFile:
+		///		+ Have switch for automatically outputting to Romba format:
+		///			e.g. /aa/bb/cc/dd/aabbccddef770b06131a878b46d4302ac28dd126.gz
+		///			Anything without a SHA-1 has to be skipped
 		/// </remarks>
-		public static bool WriteToDatFromDict(DatData datdata, string outDir, Logger logger, bool norename = true)
+		/// </remarks>
+		public static bool WriteDatfile(DatData datdata, string outDir, Logger logger, bool norename = true)
 		{
 			// Get all values in the dictionary and write out
 			SortedDictionary<string, List<RomData>> sortable = new SortedDictionary<string, List<RomData>>();
@@ -299,6 +176,36 @@ namespace SabreTools.Helper
 									(rom.SHA1 != "" ? " sha1 " + rom.SHA1.ToLowerInvariant() : "") +
 									" )\n";
 								break;
+							case OutputFormat.MissFile:
+								string pre = datdata.Prefix + (datdata.Quotes ? "\"" : "");
+								string post = (datdata.Quotes ? "\"" : "") + datdata.Postfix;
+								string name = (datdata.UseGame ? rom.Game : rom.Name);
+								if (datdata.RepExt != "")
+								{
+									string dir = Path.GetDirectoryName(name);
+									dir = (dir.EndsWith(Path.DirectorySeparatorChar.ToString()) ? dir : dir + Path.DirectorySeparatorChar);
+									dir = (dir.StartsWith(Path.DirectorySeparatorChar.ToString()) ? dir.Remove(0, 1) : dir);
+									name = dir + Path.GetFileNameWithoutExtension(name) + datdata.RepExt;
+								}
+								if (datdata.AddExt != "")
+								{
+									name += datdata.AddExt;
+								}
+								if (!datdata.UseGame && datdata.GameName)
+								{
+									name = (rom.Game.EndsWith(Path.DirectorySeparatorChar.ToString()) ? rom.Game : rom.Game + Path.DirectorySeparatorChar) + name;
+								}
+
+								if (datdata.UseGame && rom.Game != lastgame)
+								{
+									state += pre + name + post + "\n";
+									lastgame = rom.Game;
+								}
+								else if (!datdata.UseGame)
+								{
+									state += pre + name + post + "\n";
+								}
+								break;
 							case OutputFormat.RomCenter:
 								state += "¬¬¬" + HttpUtility.HtmlEncode(rom.Game) +
 									"¬" + HttpUtility.HtmlEncode(rom.Game) +
@@ -346,185 +253,5 @@ namespace SabreTools.Helper
 
 			return true;
 		}
-
-		/// <summary>
-		/// Output a list of roms as a text file with an arbitrary prefix and postfix
-		/// </summary>
-		/// <param name="textfile">Name of the output file</param>
-		/// <param name="outdir">Output directory for the miss file</param>
-		/// <param name="roms">List of RomData objects representing the roms to be output</param>
-		/// <param name="logger">Logger object for console and/or file output</param>
-		/// <param name="useGame">True if only games are written to text file (default), false for files only</param>
-		/// <param name="prefix">Arbitrary string to prefix each line</param>
-		/// <param name="postfix">Arbitrary string to postfix each line</param>
-		/// <param name="quotes">True if quotes should be put around the item, false otherwise (default)</param>
-		/// <param name="addext">Arbitrary extension added to the end of each item</param>
-		/// <param name="repext">Arbitrary extension to replace all extensions in the item</param>
-		/// <param name="gamename">True if the game name is appended (only when !usegame), false otherwise</param>
-		/// <returns>True if the file was written, false otherwise</returns>
-		/// <remarks>
-		/// The following features have been requested for this method:
-		/// - Have switch for automatically outputting to Romba format:
-		///		e.g. /aa/bb/cc/dd/aabbccddef770b06131a878b46d4302ac28dd126.gz
-		///		Anything without a SHA-1 has to be skipped
-		/// </remarks>
-		public static bool WriteToText(string textfile, string outdir, List<RomData> roms, Logger logger, bool useGame = true, string prefix = "",
-			string postfix = "", string addext = "", string repext = "", bool quotes = false, bool gamename = false)
-		{
-			// Normalize the output directory
-			if (outdir == "")
-			{
-				outdir = Environment.CurrentDirectory;
-			}
-			if (!outdir.EndsWith(Path.DirectorySeparatorChar.ToString()))
-			{
-				outdir += Path.DirectorySeparatorChar;
-			}
-
-			// Make the output directory if it doesn't exist
-			if (!Directory.Exists(outdir))
-			{
-				Directory.CreateDirectory(outdir);
-			}
-
-			// Normalize the extensions
-			addext = (addext == "" || addext.StartsWith(".") ? addext : "." + addext);
-			repext = (repext == "" || repext.StartsWith(".") ? repext : "." + repext);
-
-			logger.User("Opening file for writing: " + outdir + textfile);
-
-			try
-			{
-				FileStream fs = File.Create(outdir + textfile);
-				StreamWriter sw = new StreamWriter(fs, Encoding.UTF8);
-
-				string lastgame = "";
-				foreach (RomData rom in roms)
-				{
-					string pre = prefix + (quotes ? "\"" : "");
-					string post = (quotes ? "\"" : "") + postfix;
-					string name = (useGame ? rom.Game : rom.Name);
-					if (repext != "")
-					{
-						string dir = Path.GetDirectoryName(name);
-						dir = (dir.EndsWith(Path.DirectorySeparatorChar.ToString()) ? dir : dir + Path.DirectorySeparatorChar);
-						dir = (dir.StartsWith(Path.DirectorySeparatorChar.ToString()) ? dir.Remove(0, 1) : dir);
-						name = dir + Path.GetFileNameWithoutExtension(name) + repext;
-					}
-					if (addext != "")
-					{
-						name += addext;
-					}
-					if (!useGame && gamename)
-					{
-						name = (rom.Game.EndsWith(Path.DirectorySeparatorChar.ToString()) ? rom.Game : rom.Game + Path.DirectorySeparatorChar) + name;
-					}
-
-					if (useGame && rom.Game != lastgame)
-					{
-						sw.WriteLine(pre + name + post);
-						lastgame = rom.Game;
-					}
-					else if (!useGame)
-					{
-						sw.WriteLine(pre + name + post);
-					}
-				}
-
-				logger.User("File written!" + Environment.NewLine);
-				sw.Close();
-				fs.Close();
-			}
-			catch (Exception ex)
-			{
-				logger.Error(ex.ToString());
-				return false;
-			}
-
-			return true;
-		}
-
-		/// <summary>
-		/// Convert a List of RomData objects to a List of tab-deliminated strings
-		/// </summary>
-		/// <param name="roms">List of RomData objects representing the roms to be parsed</param>
-		/// <returns>List of Strings representing the roms</returns>
-		public static List<String> RomDataToString(List<RomData> roms)
-		{
-			List<String> outlist = new List<String>();
-			foreach (RomData rom in roms)
-			{
-				outlist.Add(rom.Manufacturer + "\t" +
-					rom.System + "\t" +
-					rom.SystemID + "\t" +
-					rom.Source + "\t" +
-					rom.URL + "\t" +
-					rom.SourceID + "\t" +
-					rom.Game + "\t" +
-					rom.Name + "\t" +
-					rom.Type + "\t" +
-					rom.Size + "\t" +
-					rom.CRC + "\t" +
-					rom.MD5 + "\t" +
-					rom.SHA1);
-			}
-			return outlist;
-		}
-
-		/// <summary>
-		/// Convert a List of RomData objects' hash information to a List of tab-deliminated strings
-		/// </summary>
-		/// <param name="roms">List of RomData objects representing the roms to be parsed</param>
-		/// <returns>List of Strings representing the rom hashes</returns>
-		public static List<String> HashDataToString(List<RomData> roms)
-		{
-			List<String> outlist = new List<String>();
-			foreach (RomData rom in roms)
-			{
-				outlist.Add(rom.Size + "\t" +
-					rom.CRC + "\t" +
-					rom.MD5 + "\t" +
-					rom.SHA1);
-			}
-			return outlist;
-		}
-
-		/// <summary>
-		/// Convert a List of tab-deliminated strings objects to a List of RomData objects
-		/// </summary>
-		/// <param name="roms">List of Strings representing the roms to be parsed</param>
-		/// <returns>List of RomData objects representing the roms</returns>
-		public static List<RomData> StringToRomData(List<String> roms)
-		{
-			List<RomData> outlist = new List<RomData>();
-			foreach (String rom in roms)
-			{
-				string[] temp = rom.Split('\t');
-				try
-				{
-					outlist.Add(new RomData
-					{
-						Manufacturer = temp[0],
-						System = temp[1],
-						SystemID = Int32.Parse(temp[2]),
-						Source = temp[3],
-						URL = temp[4],
-						SourceID = Int32.Parse(temp[5]),
-						Game = temp[6],
-						Name = temp[7],
-						Type = temp[8],
-						Size = Int64.Parse(temp[9]),
-						CRC = temp[10],
-						MD5 = temp[11],
-						SHA1 = temp[12],
-					});
-				}
-				catch (Exception ex)
-				{
-					Console.WriteLine(ex.ToString());
-				}
-			}
-			return outlist;
-		}
 	}
 }

SabreHelper/RomManipulation.cs

@@ -89,152 +89,6 @@ namespace SabreTools.Helper
 			return xtr;
 		}
 
-		/// <summary>
-		/// Parse a DAT and return all found games and roms within
-		/// </summary>
-		/// <param name="filename">Name of the file to be parsed</param>
-		/// <param name="sysid">System ID for the DAT</param>
-		/// <param name="srcid">Source ID for the DAT</param>
-		/// <param name="logger">Logger object for console and/or file output</param>
-		/// <returns>List of RomData objects representing the found data</returns>
-		public static List<RomData> Parse(string filename, int sysid, int srcid, Logger logger)
-		{
-			List<RomData> roms = new List<RomData>();
-			XmlTextReader xtr = GetXmlTextReader(filename, logger);
-			bool superdat = false, shouldbreak = false;
-			string parent = "";
-			if (xtr != null)
-			{
-				xtr.MoveToContent();
-				while (xtr.NodeType != XmlNodeType.None)
-				{
-					// We only want elements
-					if (xtr.NodeType != XmlNodeType.Element)
-					{
-						xtr.Read();
-						continue;
-					}
-
-					switch (xtr.Name)
-					{
-						case "datafile":
-						case "softwarelist":
-							parent = xtr.Name;
-							xtr.Read();
-							break;
-						case "header":
-							xtr.ReadToDescendant("name");
-							string content = xtr.ReadElementContentAsString();
-							superdat = (content != null ? content.Contains(" - SuperDAT") : false);
-							while (xtr.Name != "header")
-							{
-								xtr.Read();
-							}
-							xtr.Read();
-							break;
-						case "machine":
-						case "game":
-						case "software":
-							string temptype = xtr.Name;
-							string tempname = "";
-
-							// We want to process the entire subtree of the game
-							XmlReader subreader = xtr.ReadSubtree();
-
-							if (subreader != null)
-							{
-								if (temptype == "software" && subreader.ReadToFollowing("description"))
-								{
-									tempname = subreader.ReadElementContentAsString();
-								}
-								else
-								{
-									// There are rare cases where a malformed XML will not have the required attributes. We can only skip them.
-									if (xtr.AttributeCount == 0)
-									{
-										logger.Error("No attributes were found");
-										xtr.ReadToNextSibling(xtr.Name);
-										continue;
-									}
-									tempname = xtr.GetAttribute("name");
-								}
-
-								if (superdat)
-								{
-									tempname = Regex.Match(tempname, @".*?\\(.*)").Groups[1].Value;
-								}
-
-								while (subreader.Read())
-								{
-									// We only want elements
-									if (subreader.NodeType != XmlNodeType.Element)
-									{
-										continue;
-									}
-
-									// Get the roms from the machine
-									switch (subreader.Name)
-									{
-										case "rom":
-										case "disk":
-											// Take care of hex-sized files
-											long size = -1;
-											if (xtr.GetAttribute("size") != null && xtr.GetAttribute("size").Contains("0x"))
-											{
-												size = Convert.ToInt64(xtr.GetAttribute("size"), 16);
-											}
-											else if (xtr.GetAttribute("size") != null)
-											{
-												Int64.TryParse(xtr.GetAttribute("size"), out size);
-											}
-
-											// Take care of hex-prefixed hashes
-											string crc = (xtr.GetAttribute("crc") != null ? xtr.GetAttribute("crc").ToLowerInvariant().Trim() : "");
-											crc = (crc.StartsWith("0x") ? crc.Remove(0, 2) : crc);
-											string md5 = (xtr.GetAttribute("md5") != null ? xtr.GetAttribute("md5").ToLowerInvariant().Trim() : "");
-											md5 = (md5.StartsWith("0x") ? md5.Remove(0, 2) : md5);
-											string sha1 = (xtr.GetAttribute("sha1") != null ? xtr.GetAttribute("sha1").ToLowerInvariant().Trim() : "");
-											sha1 = (sha1.StartsWith("0x") ? sha1.Remove(0, 2) : sha1);
-
-											roms.Add(new RomData
-											{
-												Game = tempname,
-												Name = xtr.GetAttribute("name"),
-												Type = xtr.Name,
-												SystemID = sysid,
-												SourceID = srcid,
-												Size = size,
-												CRC = crc,
-												MD5 = md5,
-												SHA1 = sha1,
-											});
-											break;
-									}
-								}
-							}
-
-							// Read to next game
-							if (!xtr.ReadToNextSibling(temptype))
-							{
-								shouldbreak = true;
-							}
-							break;
-						default:
-							xtr.Read();
-							break;
-					}
-
-					// If we hit an endpoint, break out of the loop early
-					if (shouldbreak)
-					{
-						break;
-					}
-				}
-			}
-
-			return roms;
-		}
-
 		/// <summary>
 		/// Parse a DAT and return all found games and roms within
 		/// </summary>
@@ -244,7 +98,7 @@ namespace SabreTools.Helper
 		/// <param name="datdata">The DatData object representing found roms to this point</param>
 		/// <param name="logger">Logger object for console and/or file output</param>
 		/// <returns>DatData object representing the read-in data</returns>
-		public static DatData ParseDict(string filename, int sysid, int srcid, DatData datdata, Logger logger)
+		public static DatData Parse(string filename, int sysid, int srcid, DatData datdata, Logger logger)
 		{
 			XmlTextReader xtr = GetXmlTextReader(filename, logger);
 			bool superdat = false, shouldbreak = false;
@@ -695,50 +549,5 @@ namespace SabreTools.Helper
 			});
 			return true;
 		}
-
-		/// <summary>
-		/// Get differences between two lists of RomData objects
-		/// </summary>
-		/// <param name="A">First RomData list</param>
-		/// <param name="B">Second RomData list</param>
-		/// <returns>Any rom that's not in both lists</returns>
-		/// <remarks>Adapted from http://stackoverflow.com/questions/5620266/the-opposite-of-intersect</remarks>
-		public static List<RomData> Diff(List<RomData> A, List<RomData> B)
-		{
-			List<String> AString = Output.RomDataToString(A);
-			List<String> BString = Output.RomDataToString(B);
-			List<String> CString = AString.Except(BString).Union(BString.Except(AString)).ToList();
-			return Output.StringToRomData(CString);
-		}
-
-		/// <summary>
-		/// Get all RomData objects that are in A but not in B
-		/// </summary>
-		/// <param name="A">First RomData list</param>
-		/// <param name="B">Second RomData list</param>
-		/// <returns>Any rom that's only in the first list</returns>
-		/// <remarks>Adapted from http://stackoverflow.com/questions/5620266/the-opposite-of-intersect</remarks>
-		public static List<RomData> DiffOnlyInA(List<RomData> A, List<RomData> B)
-		{
-			List<String> AString = Output.RomDataToString(A);
-			List<String> BString = Output.RomDataToString(B);
-			List<String> CString = AString.Except(BString).ToList();
-			return Output.StringToRomData(CString);
-		}
-
-		/// <summary>
-		/// Get all RomData objects that are in A and B
-		/// </summary>
-		/// <param name="A">First RomData list</param>
-		/// <param name="B">Second RomData list</param>
-		/// <returns>Any rom that's in both lists</returns>
-		/// <remarks>Adapted from http://stackoverflow.com/questions/5620266/the-opposite-of-intersect</remarks>
-		public static List<RomData> DiffInAB(List<RomData> A, List<RomData> B)
-		{
-			List<String> AString = Output.RomDataToString(A);
-			List<String> BString = Output.RomDataToString(B);
-			List<String> CString = AString.Union(BString).Except(AString.Except(BString).Union(BString.Except(AString))).ToList();
-			return Output.StringToRomData(CString);
-		}
 	}
 }

SabreHelper/Structs.cs

@@ -28,6 +28,7 @@ namespace SabreTools.Helper
 	/// </summary>
 	public struct DatData
 	{
+		// Data common to most DAT types
 		public string Name;
 		public string Description;
 		public string Category;
@@ -45,5 +46,15 @@ namespace SabreTools.Helper
 		public OutputFormat OutputFormat;
 		public bool MergeRoms;
 		public Dictionary<string, List<RomData>> Roms;
+
+		// Data specific to the Miss DAT type
+		public bool UseGame;
+		public string Prefix;
+		public string Postfix;
+		public bool Quotes;
+		public string RepExt;
+		public string AddExt;
+		public bool GameName;
+		public bool Romba;
 	}
 }

UncompressedSize/UncompressedSize.cs

@@ -38,7 +38,7 @@ namespace SabreTools
 				{
 					Roms = new Dictionary<string, List<RomData>>(),
 				};
-				datdata = RomManipulation.ParseDict(filename, 0, 0, datdata, logger);
+				datdata = RomManipulation.Parse(filename, 0, 0, datdata, logger);
 				foreach (List<RomData> romlist in datdata.Roms.Values)
 				{
 					foreach (RomData rom in romlist)