[DatFiles/] Specific formats should not be exposed outside of the library

SabreTools.Library/DatFiles/AttractMode.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Text;
 
 using SabreTools.Library.Data;
@@ -23,7 +22,7 @@ namespace SabreTools.Library.DatFiles
 	/// <summary>
 	/// Represents parsing and writing of an AttractMode DAT
 	/// </summary>
-	public class AttractMode : DatFile
+	internal class AttractMode : DatFile
 	{
 		/// <summary>
 		/// Constructor designed for casting a base DatFile

SabreTools.Library/DatFiles/ClrMamePro.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Text;
 using System.Text.RegularExpressions;
 
@@ -24,7 +23,7 @@ namespace SabreTools.Library.DatFiles
 	/// <summary>
 	/// Represents parsing and writing of a ClrMamePro DAT
 	/// </summary>
-	public class ClrMamePro : DatFile
+	internal class ClrMamePro : DatFile
 	{
 		/// <summary>
 		/// Constructor designed for casting a base DatFile

SabreTools.Library/DatFiles/DatFile.cs

@@ -3065,7 +3065,7 @@ namespace SabreTools.Library.DatFiles
 						new ClrMamePro(this).ParseFile(filename, sysid, srcid, keep, clean, remUnicode);
 						break;
 					case DatFormat.CSV:
-						new SeparatedValue(this).ParseFile(filename, sysid, srcid, ',', keep, clean, remUnicode);
+						new SeparatedValue(this, ',').ParseFile(filename, sysid, srcid, keep, clean, remUnicode);
 						break;
 					case DatFormat.DOSCenter:
 						new DosCenter(this).ParseFile(filename, sysid, srcid, keep, clean, remUnicode);
@@ -3107,7 +3107,7 @@ namespace SabreTools.Library.DatFiles
 						new SoftwareList(this).ParseFile(filename, sysid, srcid, keep, clean, remUnicode);
 						break;
 					case DatFormat.TSV:
-						new SeparatedValue(this).ParseFile(filename, sysid, srcid, '\t', keep, clean, remUnicode);
+						new SeparatedValue(this, '\t').ParseFile(filename, sysid, srcid, keep, clean, remUnicode);
 						break;
 					default:
 						return;
@@ -5467,7 +5467,7 @@ namespace SabreTools.Library.DatFiles
 								new ClrMamePro(this).WriteToFile(outfile, ignoreblanks);
 								break;
 							case DatFormat.CSV:
-								new SeparatedValue(this).WriteToFile(outfile, ',', ignoreblanks);
+								new SeparatedValue(this, ',').WriteToFile(outfile, ignoreblanks);
 								break;
 							case DatFormat.DOSCenter:
 								new DosCenter(this).WriteToFile(outfile, ignoreblanks);
@@ -5512,7 +5512,7 @@ namespace SabreTools.Library.DatFiles
 								new SoftwareList(this).WriteToFile(outfile, ignoreblanks);
 								break;
 							case DatFormat.TSV:
-								new SeparatedValue(this).WriteToFile(outfile, '\t', ignoreblanks);
+								new SeparatedValue(this, '\t').WriteToFile(outfile, ignoreblanks);
 								break;
 						}
 					}

SabreTools.Library/DatFiles/DosCenter.cs

@@ -22,7 +22,7 @@ namespace SabreTools.Library.DatFiles
 	/// <summary>
 	/// Represents parsing and writing of a DosCenter DAT
 	/// </summary>
-	public class DosCenter : DatFile
+	internal class DosCenter : DatFile
 	{
 		/// <summary>
 		/// Constructor designed for casting a base DatFile
@@ -57,7 +57,7 @@ namespace SabreTools.Library.DatFiles
 			bool remUnicode)
 		{
 			// ClrMamePro and DosCenter parsing are identical so it just calls one implementation
-			(this as DatFile as ClrMamePro).ParseFile(filename, sysid, srcid, keep, clean, remUnicode);
+			new ClrMamePro(this).ParseFile(filename, sysid, srcid, keep, clean, remUnicode);
 		}
 
 

SabreTools.Library/DatFiles/Hashfile.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Text;
 
 using SabreTools.Library.Data;
@@ -23,7 +22,7 @@ namespace SabreTools.Library.DatFiles
 	/// <summary>
 	/// Represents parsing and writing of a hashfile such as an SFV, MD5, or SHA-1 file
 	/// </summary>
-	public class Hashfile : DatFile
+	internal class Hashfile : DatFile
 	{
 		/// <summary>
 		/// Constructor designed for casting a base DatFile

SabreTools.Library/DatFiles/Listroms.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Text;
 using System.Text.RegularExpressions;
 
@@ -24,7 +23,7 @@ namespace SabreTools.Library.DatFiles
 	/// <summary>
 	/// Represents parsing and writing of a MAME Listroms DAT
 	/// </summary>
-	public class Listroms : DatFile
+	internal class Listroms : DatFile
 	{
 		/// <summary>
 		/// Constructor designed for casting a base DatFile

SabreTools.Library/DatFiles/Logiqx.cs

@@ -25,7 +25,7 @@ namespace SabreTools.Library.DatFiles
 	/// <summary>
 	/// Represents parsing and writing of a Logiqx-derived DAT
 	/// </summary>
-	public class Logiqx : DatFile
+	internal class Logiqx : DatFile
 	{
 		/// <summary>
 		/// Constructor designed for casting a base DatFile

SabreTools.Library/DatFiles/Missfile.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Text;
 
 using SabreTools.Library.Data;
@@ -22,7 +21,7 @@ namespace SabreTools.Library.DatFiles
 	/// <summary>
 	/// Represents parsing and writing of a Missfile
 	/// </summary>
-	public class Missfile : DatFile
+	internal class Missfile : DatFile
 	{
 		/// <summary>
 		/// Constructor designed for casting a base DatFile

SabreTools.Library/DatFiles/OfflineList.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Text;
 using System.Web;
 
@@ -23,7 +22,7 @@ namespace SabreTools.Library.DatFiles
 	/// <summary>
 	/// Represents parsing and writing of an OfflineList XML DAT
 	/// </summary>
-	public class OfflineList : DatFile
+	internal class OfflineList : DatFile
 	{
 		/// <summary>
 		/// Constructor designed for casting a base DatFile

SabreTools.Library/DatFiles/RomCenter.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Text;
 using System.Web;
 
@@ -24,7 +23,7 @@ namespace SabreTools.Library.DatFiles
 	/// <summary>
 	/// Represents parsing and writing of a RomCenter DAT
 	/// </summary>
-	public class RomCenter : DatFile
+	internal class RomCenter : DatFile
 	{
 		/// <summary>
 		/// Constructor designed for casting a base DatFile

SabreTools.Library/DatFiles/SabreDat.cs

@@ -23,7 +23,7 @@ namespace SabreTools.Library.DatFiles
 	/// <summary>
 	/// Represents parsing and writing of an SabreDat XML DAT
 	/// </summary>
-	public class SabreDat : DatFile
+	internal class SabreDat : DatFile
 	{
 		/// <summary>
 		/// Constructor designed for casting a base DatFile

SabreTools.Library/DatFiles/SeparatedValue.cs

@@ -21,18 +21,23 @@ namespace SabreTools.Library.DatFiles
 	/// <summary>
 	/// Represents parsing and writing of a value-separated DAT
 	/// </summary>
-	public class SeparatedValue : DatFile
+	internal class SeparatedValue : DatFile
 	{
+		// Private instance variables specific to Separated Value DATs
+		char _delim;
+
 		/// <summary>
 		/// Constructor designed for casting a base DatFile
 		/// </summary>
 		/// <param name="datFile">Parent DatFile to copy from</param>
-		public SeparatedValue(DatFile datFile)
+		/// <param name="delim">Delimiter for parsing individual lines</param>
+		public SeparatedValue(DatFile datFile, char delim)
 		{
 			this._datHeader = datFile._datHeader;
 			this._items = datFile._items;
 			this._sortedBy = datFile._sortedBy;
 			this._datStats = datFile._datStats;
+			_delim = delim;
 		}
 
 		/// <summary>
@@ -41,7 +46,6 @@ namespace SabreTools.Library.DatFiles
 		/// <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="delim">Delimiter for parsing individual lines</param>
 		/// <param name="keep">True if full pathnames are to be kept, false otherwise (default)</param>
 		/// <param name="clean">True if game names are sanitized, false otherwise (default)</param>
 		/// <param name="remUnicode">True if we should remove non-ASCII characters from output, false otherwise (default)</param>
@@ -50,7 +54,6 @@ namespace SabreTools.Library.DatFiles
 			string filename,
 			int sysid,
 			int srcid,
-			char delim,
 
 			// Miscellaneous
 			bool keep,
@@ -73,7 +76,7 @@ namespace SabreTools.Library.DatFiles
 				// Parse the first line, getting types from the column names
 				if (linenum == 0)
 				{
-					string[] parsedColumns = line.Split(delim);
+					string[] parsedColumns = line.Split(_delim);
 					foreach (string parsed in parsedColumns)
 					{
 						switch (parsed.ToLowerInvariant().Trim('"'))
@@ -163,7 +166,7 @@ namespace SabreTools.Library.DatFiles
 				}
 
 				// Otherwise, we want to split the line and parse
-				string[] parsedLine = line.Split(delim);
+				string[] parsedLine = line.Split(_delim);
 
 				// If the line doesn't have the correct number of columns, we log and skip
 				if (parsedLine.Length != columns.Count)
@@ -369,10 +372,9 @@ namespace SabreTools.Library.DatFiles
 		/// Create and open an output file for writing direct from a dictionary
 		/// </summary>
 		/// <param name="outfile">Name of the file to write to</param>
-		/// <param name="delim">Delimiter for parsing individual lines</param>
 		/// <param name="ignoreblanks">True if blank roms should be skipped on output, false otherwise (default)</param>
 		/// <returns>True if the DAT was written correctly, false otherwise</returns>
-		public bool WriteToFile(string outfile, char delim, bool ignoreblanks = false)
+		public bool WriteToFile(string outfile, bool ignoreblanks = false)
 		{
 			try
 			{
@@ -389,7 +391,7 @@ namespace SabreTools.Library.DatFiles
 				StreamWriter sw = new StreamWriter(fs, new UTF8Encoding(false));
 
 				// Write out the header
-				WriteHeader(sw, delim);
+				WriteHeader(sw);
 
 				// Get a properly sorted set of keys
 				List<string> keys = Keys;
@@ -422,7 +424,7 @@ namespace SabreTools.Library.DatFiles
 						}
 
 						// Now, output the rom data
-						WriteDatItem(sw, delim, rom, ignoreblanks);
+						WriteDatItem(sw, rom, ignoreblanks);
 					}
 				}
 
@@ -443,14 +445,13 @@ namespace SabreTools.Library.DatFiles
 		/// Write out DAT header using the supplied StreamWriter
 		/// </summary>
 		/// <param name="sw">StreamWriter to output to</param>
-		/// <param name="delim">Delimiter for parsing individual lines</param>
 		/// <returns>True if the data was written, false on error</returns>
-		private bool WriteHeader(StreamWriter sw, char delim)
+		private bool WriteHeader(StreamWriter sw)
 		{
 			try
 			{
 				string header = string.Format("\"File Name\"{0}\"Internal Name\"{0}\"Description\"{0}\"Game Name\"{0}\"Game Description\"{0}\"Type\"{0}\"" +
-								"Rom Name\"{0}\"Disk Name\"{0}\"Size\"{0}\"CRC\"{0}\"MD5\"{0}\"SHA1\"{0}\"SHA256\"{0}\"Nodump\"\n", delim);
+								"Rom Name\"{0}\"Disk Name\"{0}\"Size\"{0}\"CRC\"{0}\"MD5\"{0}\"SHA1\"{0}\"SHA256\"{0}\"Nodump\"\n", _delim);
 
 				// Write the header out
 				sw.Write(header);
@@ -469,11 +470,10 @@ namespace SabreTools.Library.DatFiles
 		/// Write out DatItem using the supplied StreamWriter
 		/// </summary>
 		/// <param name="sw">StreamWriter to output to</param>
-		/// <param name="delim">Delimiter for parsing individual lines</param>
 		/// <param name="rom">DatItem object to be output</param>
 		/// <param name="ignoreblanks">True if blank roms should be skipped on output, false otherwise (default)</param>
 		/// <returns>True if the data was written, false on error</returns>
-		private bool WriteDatItem(StreamWriter sw, char delim, DatItem rom, bool ignoreblanks = false)
+		private bool WriteDatItem(StreamWriter sw, DatItem rom, bool ignoreblanks = false)
 		{
 			// If we are in ignore blanks mode AND we have a blank (0-size) rom, skip
 			if (ignoreblanks
@@ -580,7 +580,7 @@ namespace SabreTools.Library.DatFiles
 						+ "{0}\"" + ((Rom)rom).SHA256 + "\""
 						// + "{0}\"" + ((Rom)rom).SHA384 + "\""
 						// + "{0}\"" + ((Rom)rom).SHA512 + "\""
-						+ "{0}" + (((Rom)rom).ItemStatus != ItemStatus.None ? "\"" + ((Rom)rom).ItemStatus.ToString() + "\"" : "\"\""), delim);
+						+ "{0}" + (((Rom)rom).ItemStatus != ItemStatus.None ? "\"" + ((Rom)rom).ItemStatus.ToString() + "\"" : "\"\""), _delim);
 					state += pre + inline + post + "\n";
 				}
 				else if (rom.Type == ItemType.Disk)
@@ -600,7 +600,7 @@ namespace SabreTools.Library.DatFiles
 						+ "{0}\"" + ((Disk)rom).SHA256 + "\""
 						// + "{0}\"" + ((Rom)rom).SHA384 + "\""
 						// + "{0}\"" + ((Rom)rom).SHA512 + "\""
-						+ "{0}" + (((Disk)rom).ItemStatus != ItemStatus.None ? "\"" + ((Disk)rom).ItemStatus.ToString() + "\"" : "\"\""), delim);
+						+ "{0}" + (((Disk)rom).ItemStatus != ItemStatus.None ? "\"" + ((Disk)rom).ItemStatus.ToString() + "\"" : "\"\""), _delim);
 					state += pre + inline + post + "\n";
 				}
 

SabreTools.Library/DatFiles/SoftwareList.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Text;
 using System.Web;
 
@@ -23,7 +22,7 @@ namespace SabreTools.Library.DatFiles
 	/// <summary>
 	/// Represents parsing and writing of an SabreDat XML DAT
 	/// </summary>
-	public class SoftwareList : DatFile
+	internal class SoftwareList : DatFile
 	{
 		/// <summary>
 		/// Constructor designed for casting a base DatFile
@@ -37,6 +36,7 @@ namespace SabreTools.Library.DatFiles
 			this._datStats = datFile._datStats;
 
 		}
+
 		/// <summary>
 		/// Parse an SabreDat XML DAT and return all found games and roms within
 		/// </summary>