claunia/SabreTools
1
0
Fork 0
mirror of https://github.com/claunia/SabreTools.git synced 2025-12-16 19:14:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

[DatTools] Continuation of last

Browse Source
This commit is contained in:
Matt Nadareski
2016-09-09 15:54:10 -07:00
parent 883860873d
commit 2789dddd58
1 changed files with 80 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

160
SabreTools.Helper/Tools/DatTools.cs
View File

@@ -21,9 +21,9 @@ namespace SabreTools.Helper
/// Get what type of DAT the input file is /// Get what type of DAT the input file is
/// </summary> /// </summary>
/// <param name="filename">Name of the file to be parsed</param> /// <param name="filename">Name of the file to be parsed</param>
/// <returns>The OutputFormatFlagcorresponding to the DAT</returns> /// <returns>The OutputFormat corresponding to the DAT</returns>
/// <remarks>There is currently no differentiation between XML and SabreDAT here</remarks> /// <remarks>There is currently no differentiation between XML and SabreDAT here</remarks>
public static OutputFormatFlag GetOutputFormat(string filename, Logger logger) public static OutputFormat GetOutputFormat(string filename, Logger logger)
{ {
// Limit the output formats based on extension // Limit the output formats based on extension
string ext = Path.GetExtension(filename).ToLowerInvariant(); string ext = Path.GetExtension(filename).ToLowerInvariant();
@@ -50,15 +50,15 @@ namespace SabreTools.Helper
sr.Dispose(); sr.Dispose();
if (first.Contains("<") && first.Contains(">")) if (first.Contains("<") && first.Contains(">"))
{ {
return OutputFormatFlag.Xml; return OutputFormat.Xml;
} }
else if (first.Contains("[") && first.Contains("]")) else if (first.Contains("[") && first.Contains("]"))
{ {
return OutputFormatFlag.RomCenter; return OutputFormat.RomCenter;
} }
else else
{ {
return OutputFormatFlag.ClrMamePro; return OutputFormat.ClrMamePro;
} }
} }
catch (Exception) catch (Exception)
@@ -175,7 +175,7 @@ namespace SabreTools.Helper
datdata.FileName = (String.IsNullOrEmpty(datdata.FileName) ? (keepext ? Path.GetFileName(filename) : Path.GetFileNameWithoutExtension(filename)) : datdata.FileName); datdata.FileName = (String.IsNullOrEmpty(datdata.FileName) ? (keepext ? Path.GetFileName(filename) : Path.GetFileNameWithoutExtension(filename)) : datdata.FileName);
// If the output type isn't set already, get the internal output type // If the output type isn't set already, get the internal output type
datdata.OutputFormatFlag = (datdata.OutputFormatFlag == 0 ? GetOutputFormat(filename, logger) : datdata.OutputFormatFlag); datdata.OutputFormat = (datdata.OutputFormat == 0 ? GetOutputFormat(filename, logger) : datdata.OutputFormat);
// Make sure there's a dictionary to read to // Make sure there's a dictionary to read to
if (datdata.Files == null) if (datdata.Files == null)
@@ -186,12 +186,12 @@ namespace SabreTools.Helper
// Now parse the correct type of DAT // Now parse the correct type of DAT
switch (GetOutputFormat(filename, logger)) switch (GetOutputFormat(filename, logger))
{ {
case OutputFormatFlag.ClrMamePro: case OutputFormat.ClrMamePro:
return ParseCMP(filename, sysid, srcid, datdata, gamename, romname, romtype, sgt, slt, seq, crc, md5, sha1, nodump, trim, single, root, logger, keep, clean); return ParseCMP(filename, sysid, srcid, datdata, gamename, romname, romtype, sgt, slt, seq, crc, md5, sha1, nodump, trim, single, root, logger, keep, clean);
case OutputFormatFlag.RomCenter: case OutputFormat.RomCenter:
return ParseRC(filename, sysid, srcid, datdata, gamename, romname, romtype, sgt, slt, seq, crc, md5, sha1, nodump, trim, single, root, logger, clean); return ParseRC(filename, sysid, srcid, datdata, gamename, romname, romtype, sgt, slt, seq, crc, md5, sha1, nodump, trim, single, root, logger, clean);
case OutputFormatFlag.SabreDat: case OutputFormat.SabreDat:
case OutputFormatFlag.Xml: case OutputFormat.Xml:
return ParseXML(filename, sysid, srcid, datdata, gamename, romname, romtype, sgt, slt, seq, crc, md5, sha1, nodump, trim, single, root, logger, keep, clean, softlist); return ParseXML(filename, sysid, srcid, datdata, gamename, romname, romtype, sgt, slt, seq, crc, md5, sha1, nodump, trim, single, root, logger, keep, clean, softlist);
default: default:
return datdata; return datdata;
@@ -1842,7 +1842,7 @@ namespace SabreTools.Helper
int i = 0; int i = 0;
userData = new Dat userData = new Dat
{ {
OutputFormatFlag = (inputDat.OutputFormatFlag != 0 ? inputDat.OutputFormatFlag : 0), OutputFormat = (inputDat.OutputFormat != 0 ? inputDat.OutputFormat : 0),
Files = new Dictionary<string, List<Rom>>(), Files = new Dictionary<string, List<Rom>>(),
MergeRoms = inputDat.MergeRoms, MergeRoms = inputDat.MergeRoms,
}; };
@@ -1862,7 +1862,7 @@ namespace SabreTools.Helper
Dictionary<string, List<Rom>> temp = userData.Files; Dictionary<string, List<Rom>> temp = userData.Files;
userData = new Dat userData = new Dat
{ {
OutputFormatFlag = (inputDat.OutputFormatFlag != 0 ? inputDat.OutputFormatFlag : 0), OutputFormat = (inputDat.OutputFormat != 0 ? inputDat.OutputFormat : 0),
Files = temp, Files = temp,
MergeRoms = inputDat.MergeRoms, MergeRoms = inputDat.MergeRoms,
}; };
@@ -2410,7 +2410,7 @@ namespace SabreTools.Helper
/// </summary> /// </summary>
/// <param name="inputFileNames">Names of the input files and/or folders</param> /// <param name="inputFileNames">Names of the input files and/or folders</param>
/// <param name="datdata">User specified inputs contained in a DatData object</param> /// <param name="datdata">User specified inputs contained in a DatData object</param>
/// <param name="outputFormatFlag">Non-zero flag for output format, zero otherwise for default</param> /// <param name="outputFormat">Non-zero flag for output format, zero otherwise for default</param>
/// <param name="outputDirectory">Optional param for output directory</param> /// <param name="outputDirectory">Optional param for output directory</param>
/// <param name="merge">True if input files should be merged into a single file, false otherwise</param> /// <param name="merge">True if input files should be merged into a single file, false otherwise</param>
/// <param name="diff">Non-zero flag for diffing mode, zero otherwise</param> /// <param name="diff">Non-zero flag for diffing mode, zero otherwise</param>
@@ -2435,7 +2435,7 @@ namespace SabreTools.Helper
/// <param name="root">String representing root directory to compare against for length calculation</param> /// <param name="root">String representing root directory to compare against for length calculation</param>
/// <param name="maxDegreeOfParallelism">Integer representing the maximum amount of parallelization to be used</param> /// <param name="maxDegreeOfParallelism">Integer representing the maximum amount of parallelization to be used</param>
/// <param name="logger">Logging object for console and file output</param> /// <param name="logger">Logging object for console and file output</param>
public static void UpdateParallel(List<string> inputFileNames, Dat datdata, OutputFormatFlag outputFormatFlag, string outputDirectory, bool merge, public static void UpdateParallel(List<string> inputFileNames, Dat datdata, OutputFormat outputFormat, string outputDirectory, bool merge,
DiffMode diff, bool? cascade, bool inplace, bool skip, bool bare, bool clean, bool softlist, string gamename, string romname, string romtype, DiffMode diff, bool? cascade, bool inplace, bool skip, bool bare, bool clean, bool softlist, string gamename, string romname, string romtype,
long sgt, long slt, long seq, string crc, string md5, string sha1, bool? nodump, bool trim, bool single, string root, int maxDegreeOfParallelism, long sgt, long slt, long seq, string crc, string md5, string sha1, bool? nodump, bool trim, bool single, string root, int maxDegreeOfParallelism,
Logger logger) Logger logger)
@@ -2597,7 +2597,7 @@ namespace SabreTools.Helper
userData = new Dat userData = new Dat
{ {
OutputFormatFlag = (inputDat.OutputFormatFlag != 0 ? inputDat.OutputFormatFlag: 0), OutputFormat = (inputDat.OutputFormat != 0 ? inputDat.OutputFormat: 0),
Files = new Dictionary<string, List<Rom>>(), Files = new Dictionary<string, List<Rom>>(),
MergeRoms = inputDat.MergeRoms, MergeRoms = inputDat.MergeRoms,
}; };
@@ -2608,7 +2608,7 @@ namespace SabreTools.Helper
logger.User("Adding DAT: " + input.Split('¬')[0]); logger.User("Adding DAT: " + input.Split('¬')[0]);
datHeaders[i] = new Dat datHeaders[i] = new Dat
{ {
OutputFormatFlag = (inputDat.OutputFormatFlag != 0 ? inputDat.OutputFormatFlag: 0), OutputFormat = (inputDat.OutputFormat != 0 ? inputDat.OutputFormat: 0),
Files = new Dictionary<string, List<Rom>>(), Files = new Dictionary<string, List<Rom>>(),
MergeRoms = inputDat.MergeRoms, MergeRoms = inputDat.MergeRoms,
}; };
@@ -2684,9 +2684,9 @@ namespace SabreTools.Helper
} }
// If the DAT has no output format, default to XML // If the DAT has no output format, default to XML
if (datdata.OutputFormatFlag == 0) if (datdata.OutputFormat == 0)
{ {
datdata.OutputFormatFlag = OutputFormatFlag.Xml; datdata.OutputFormat = OutputFormat.Xml;
} }
// Make sure that the three essential fields are filled in // Make sure that the three essential fields are filled in
@@ -2733,20 +2733,20 @@ namespace SabreTools.Helper
SortedDictionary<string, List<Rom>> sortable = BucketByGame(datdata.Files, datdata.MergeRoms, norename, logger); SortedDictionary<string, List<Rom>> sortable = BucketByGame(datdata.Files, datdata.MergeRoms, norename, logger);
// Get the outfile name // Get the outfile name
Dictionary<OutputFormatFlag, string> outfiles = Style.CreateOutfileNames(outDir, datdata, overwrite); Dictionary<OutputFormat, string> outfiles = Style.CreateOutfileNames(outDir, datdata, overwrite);
try try
{ {
foreach (OutputFormatFlag outputFormatFlag in outfiles.Keys) foreach (OutputFormat outputFormat in outfiles.Keys)
{ {
string outfile = outfiles[outputFormatFlag]; string outfile = outfiles[outputFormat];
logger.User("Opening file for writing: " + outfile); logger.User("Opening file for writing: " + outfile);
FileStream fs = File.Create(outfile); FileStream fs = File.Create(outfile);
StreamWriter sw = new StreamWriter(fs, Encoding.UTF8); StreamWriter sw = new StreamWriter(fs, Encoding.UTF8);
// Write out the header // Write out the header
WriteHeader(sw, outputFormatFlag, datdata, logger); WriteHeader(sw, outputFormat, datdata, logger);
// Write out each of the machines and roms // Write out each of the machines and roms
int depth = 2, last = -1; int depth = 2, last = -1;
@@ -2769,13 +2769,13 @@ namespace SabreTools.Helper
// If we have a different game and we're not at the start of the list, output the end of last item // If we have a different game and we're not at the start of the list, output the end of last item
if (lastgame != null && lastgame.ToLowerInvariant() != rom.Machine.Name.ToLowerInvariant()) if (lastgame != null && lastgame.ToLowerInvariant() != rom.Machine.Name.ToLowerInvariant())
{ {
depth = WriteEndGame(sw, outputFormatFlag, rom, splitpath, newsplit, lastgame, depth, out last, logger); depth = WriteEndGame(sw, outputFormat, rom, splitpath, newsplit, lastgame, depth, out last, logger);
} }
// If we have a new game, output the beginning of the new item // If we have a new game, output the beginning of the new item
if (lastgame == null || lastgame.ToLowerInvariant() != rom.Machine.Name.ToLowerInvariant()) if (lastgame == null || lastgame.ToLowerInvariant() != rom.Machine.Name.ToLowerInvariant())
{ {
depth = WriteStartGame(sw, outputFormatFlag, rom, newsplit, lastgame, depth, last, logger); depth = WriteStartGame(sw, outputFormat, rom, newsplit, lastgame, depth, last, logger);
} }
// If we have a "null" game (created by DATFromDir or something similar), log it to file // If we have a "null" game (created by DATFromDir or something similar), log it to file
@@ -2784,7 +2784,7 @@ namespace SabreTools.Helper
logger.Log("Empty folder found: " + rom.Machine.Name); logger.Log("Empty folder found: " + rom.Machine.Name);
// If we're in a mode that doesn't allow for actual empty folders, add the blank info // If we're in a mode that doesn't allow for actual empty folders, add the blank info
if (outputFormatFlag != OutputFormatFlag.SabreDat && outputFormatFlag != OutputFormatFlag.MissFile) if (outputFormat != OutputFormat.SabreDat && outputFormat != OutputFormat.MissFile)
{ {
rom.Name = (rom.Name == "null" ? "-" : rom.Name); rom.Name = (rom.Name == "null" ? "-" : rom.Name);
rom.HashData.Size = Constants.SizeZero; rom.HashData.Size = Constants.SizeZero;
@@ -2803,7 +2803,7 @@ namespace SabreTools.Helper
} }
// Now, output the rom data // Now, output the rom data
WriteRomData(sw, outputFormatFlag, rom, lastgame, datdata, depth, logger, ignoreblanks); WriteRomData(sw, outputFormat, rom, lastgame, datdata, depth, logger, ignoreblanks);
// Set the new data to compare against // Set the new data to compare against
splitpath = newsplit; splitpath = newsplit;
@@ -2812,7 +2812,7 @@ namespace SabreTools.Helper
} }
// Write the file footer out // Write the file footer out
WriteFooter(sw, outputFormatFlag, datdata, depth, logger); WriteFooter(sw, outputFormat, datdata, depth, logger);
logger.Log("File written!" + Environment.NewLine); logger.Log("File written!" + Environment.NewLine);
sw.Close(); sw.Close();
@@ -2832,18 +2832,18 @@ namespace SabreTools.Helper
/// Write out DAT header using the supplied StreamWriter /// Write out DAT header using the supplied StreamWriter
/// </summary> /// </summary>
/// <param name="sw">StreamWriter to output to</param> /// <param name="sw">StreamWriter to output to</param>
/// <param name="outputFormatFlag">Output format to write to</param> /// <param name="outputFormat">Output format to write to</param>
/// <param name="datdata">DatData object representing DAT information</param> /// <param name="datdata">DatData object representing DAT information</param>
/// <param name="logger">Logger object for file and console output</param> /// <param name="logger">Logger object for file and console output</param>
/// <returns>True if the data was written, false on error</returns> /// <returns>True if the data was written, false on error</returns>
public static bool WriteHeader(StreamWriter sw, OutputFormatFlag outputFormatFlag, Dat datdata, Logger logger) public static bool WriteHeader(StreamWriter sw, OutputFormat outputFormat, Dat datdata, Logger logger)
{ {
try try
{ {
string header = ""; string header = "";
switch (outputFormatFlag) switch (outputFormat)
{ {
case OutputFormatFlag.ClrMamePro: case OutputFormat.ClrMamePro:
header = "clrmamepro (\n" + header = "clrmamepro (\n" +
"\tname \"" + datdata.Name + "\"\n" + "\tname \"" + datdata.Name + "\"\n" +
"\tdescription \"" + datdata.Description + "\"\n" + "\tdescription \"" + datdata.Description + "\"\n" +
@@ -2858,7 +2858,7 @@ namespace SabreTools.Helper
(datdata.ForcePacking == ForcePacking.Unzip ? "\tforcezipping no\n" : "") + (datdata.ForcePacking == ForcePacking.Unzip ? "\tforcezipping no\n" : "") +
")\n"; ")\n";
break; break;
case OutputFormatFlag.MissFile: case OutputFormat.MissFile:
if (datdata.XSV == true) if (datdata.XSV == true)
{ {
header = "\"File Name\"\t\"Internal Name\"\t\"Description\"\t\"Game Name\"\t\"Game Description\"\t\"Type\"\t\"" + header = "\"File Name\"\t\"Internal Name\"\t\"Description\"\t\"Game Name\"\t\"Game Description\"\t\"Type\"\t\"" +
@@ -2870,7 +2870,7 @@ namespace SabreTools.Helper
"Rom Name\",\"Disk Name\",\"Size\",\"CRC\",\"MD5\",\"SHA1\",\"Nodump\"\n"; "Rom Name\",\"Disk Name\",\"Size\",\"CRC\",\"MD5\",\"SHA1\",\"Nodump\"\n";
} }
break; break;
case OutputFormatFlag.RomCenter: case OutputFormat.RomCenter:
header = "[CREDITS]\n" + header = "[CREDITS]\n" +
"author=" + datdata.Author + "\n" + "author=" + datdata.Author + "\n" +
"version=" + datdata.Version + "\n" + "version=" + datdata.Version + "\n" +
@@ -2884,7 +2884,7 @@ namespace SabreTools.Helper
"version=" + datdata.Description + "\n" + "version=" + datdata.Description + "\n" +
"[GAMES]\n"; "[GAMES]\n";
break; break;
case OutputFormatFlag.SabreDat: case OutputFormat.SabreDat:
header = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" + 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 datafile PUBLIC \"-//Logiqx//DTD ROM Management Datafile//EN\" \"http://www.logiqx.com/Dats/datafile.dtd\">\n\n" +
"<datafile>\n" + "<datafile>\n" +
@@ -2905,7 +2905,7 @@ namespace SabreTools.Helper
"\t</header>\n" + "\t</header>\n" +
"\t<data>\n"; "\t<data>\n";
break; break;
case OutputFormatFlag.Xml: case OutputFormat.Xml:
header = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" + 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 datafile PUBLIC \"-//Logiqx//DTD ROM Management Datafile//EN\" \"http://www.logiqx.com/Dats/datafile.dtd\">\n\n" +
"<datafile>\n" + "<datafile>\n" +
@@ -2943,7 +2943,7 @@ namespace SabreTools.Helper
/// Write out Game start using the supplied StreamWriter /// Write out Game start using the supplied StreamWriter
/// </summary> /// </summary>
/// <param name="sw">StreamWriter to output to</param> /// <param name="sw">StreamWriter to output to</param>
/// <param name="outputFormatFlag">Output format to write to</param> /// <param name="outputFormat">Output format to write to</param>
/// <param name="rom">RomData object to be output</param> /// <param name="rom">RomData object to be output</param>
/// <param name="newsplit">Split path representing the parent game (SabreDAT only)</param> /// <param name="newsplit">Split path representing the parent game (SabreDAT only)</param>
/// <param name="lastgame">The name of the last game to be output</param> /// <param name="lastgame">The name of the last game to be output</param>
@@ -2951,7 +2951,7 @@ namespace SabreTools.Helper
/// <param name="last">Last known depth to cycle back from (SabreDAT only)</param> /// <param name="last">Last known depth to cycle back from (SabreDAT only)</param>
/// <param name="logger">Logger object for file and console output</param> /// <param name="logger">Logger object for file and console output</param>
/// <returns>The new depth of the tag</returns> /// <returns>The new depth of the tag</returns>
public static int WriteStartGame(StreamWriter sw, OutputFormatFlag outputFormatFlag, Rom rom, List<string> newsplit, string lastgame, int depth, int last, Logger logger) public static int WriteStartGame(StreamWriter sw, OutputFormat outputFormat, Rom rom, List<string> newsplit, string lastgame, int depth, int last, Logger logger)
{ {
try try
{ {
@@ -2962,13 +2962,13 @@ namespace SabreTools.Helper
} }
string state = ""; string state = "";
switch (outputFormatFlag) switch (outputFormat)
{ {
case OutputFormatFlag.ClrMamePro: case OutputFormat.ClrMamePro:
state += "game (\n\tname \"" + rom.Machine.Name + "\"\n" + state += "game (\n\tname \"" + rom.Machine.Name + "\"\n" +
"\tdescription \"" + (String.IsNullOrEmpty(rom.Machine.Description) ? rom.Machine.Name : rom.Machine.Description) + "\"\n"; "\tdescription \"" + (String.IsNullOrEmpty(rom.Machine.Description) ? rom.Machine.Name : rom.Machine.Description) + "\"\n";
break; break;
case OutputFormatFlag.SabreDat: case OutputFormat.SabreDat:
for (int i = (last == -1 ? 0 : last); i < newsplit.Count; i++) for (int i = (last == -1 ? 0 : last); i < newsplit.Count; i++)
{ {
for (int j = 0; j < depth - last + i - (lastgame == null ? 1 : 0); j++) for (int j = 0; j < depth - last + i - (lastgame == null ? 1 : 0); j++)
@@ -2980,7 +2980,7 @@ namespace SabreTools.Helper
} }
depth = depth - (last == -1 ? 0 : last) + newsplit.Count; depth = depth - (last == -1 ? 0 : last) + newsplit.Count;
break; break;
case OutputFormatFlag.Xml: case OutputFormat.Xml:
state += "\t<machine name=\"" + HttpUtility.HtmlEncode(rom.Machine.Name) + "\">\n" + state += "\t<machine name=\"" + HttpUtility.HtmlEncode(rom.Machine.Name) + "\">\n" +
"\t\t<description>" + HttpUtility.HtmlEncode((String.IsNullOrEmpty(rom.Machine.Description) ? rom.Machine.Name : rom.Machine.Description)) + "</description>\n"; "\t\t<description>" + HttpUtility.HtmlEncode((String.IsNullOrEmpty(rom.Machine.Description) ? rom.Machine.Name : rom.Machine.Description)) + "</description>\n";
break; break;
@@ -3001,7 +3001,7 @@ namespace SabreTools.Helper
/// Write out Game start using the supplied StreamWriter /// Write out Game start using the supplied StreamWriter
/// </summary> /// </summary>
/// <param name="sw">StreamWriter to output to</param> /// <param name="sw">StreamWriter to output to</param>
/// <param name="outputFormatFlag">Output format to write to</param> /// <param name="outputFormat">Output format to write to</param>
/// <param name="rom">RomData object to be output</param> /// <param name="rom">RomData object to be output</param>
/// <param name="splitpath">Split path representing last kwown parent game (SabreDAT only)</param> /// <param name="splitpath">Split path representing last kwown parent game (SabreDAT only)</param>
/// <param name="newsplit">Split path representing the parent game (SabreDAT only)</param> /// <param name="newsplit">Split path representing the parent game (SabreDAT only)</param>
@@ -3010,7 +3010,7 @@ namespace SabreTools.Helper
/// <param name="last">Last known depth to cycle back from (SabreDAT only)</param> /// <param name="last">Last known depth to cycle back from (SabreDAT only)</param>
/// <param name="logger">Logger object for file and console output</param> /// <param name="logger">Logger object for file and console output</param>
/// <returns>The new depth of the tag</returns> /// <returns>The new depth of the tag</returns>
public static int WriteEndGame(StreamWriter sw, OutputFormatFlag outputFormatFlag, Rom rom, List<string> splitpath, List<string> newsplit, string lastgame, int depth, out int last, Logger logger) public static int WriteEndGame(StreamWriter sw, OutputFormat outputFormat, Rom rom, List<string> splitpath, List<string> newsplit, string lastgame, int depth, out int last, Logger logger)
{ {
last = 0; last = 0;
@@ -3018,12 +3018,12 @@ namespace SabreTools.Helper
{ {
string state = ""; string state = "";
switch (outputFormatFlag) switch (outputFormat)
{ {
case OutputFormatFlag.ClrMamePro: case OutputFormat.ClrMamePro:
state += ")\n"; state += ")\n";
break; break;
case OutputFormatFlag.SabreDat: case OutputFormat.SabreDat:
if (splitpath != null) if (splitpath != null)
{ {
for (int i = 0; i < newsplit.Count && i < splitpath.Count; i++) for (int i = 0; i < newsplit.Count && i < splitpath.Count; i++)
@@ -3053,7 +3053,7 @@ namespace SabreTools.Helper
depth = 2 + last; depth = 2 + last;
} }
break; break;
case OutputFormatFlag.Xml: case OutputFormat.Xml:
state += "\t</machine>\n"; state += "\t</machine>\n";
break; break;
} }
@@ -3073,7 +3073,7 @@ namespace SabreTools.Helper
/// Write out RomData using the supplied StreamWriter /// Write out RomData using the supplied StreamWriter
/// </summary> /// </summary>
/// <param name="sw">StreamWriter to output to</param> /// <param name="sw">StreamWriter to output to</param>
/// <param name="outputFormatFlag">Output format to write to</param> /// <param name="outputFormat">Output format to write to</param>
/// <param name="rom">RomData object to be output</param> /// <param name="rom">RomData object to be output</param>
/// <param name="lastgame">The name of the last game to be output</param> /// <param name="lastgame">The name of the last game to be output</param>
/// <param name="datdata">DatData object representing DAT information</param> /// <param name="datdata">DatData object representing DAT information</param>
@@ -3081,7 +3081,7 @@ namespace SabreTools.Helper
/// <param name="logger">Logger object for file and console output</param> /// <param name="logger">Logger object for file and console output</param>
/// <param name="ignoreblanks">True if blank roms should be skipped on output, false otherwise (default)</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> /// <returns>True if the data was written, false on error</returns>
public static bool WriteRomData(StreamWriter sw, OutputFormatFlag outputFormatFlag, Rom rom, string lastgame, Dat datdata, int depth, Logger logger, bool ignoreblanks = false) public static bool WriteRomData(StreamWriter sw, OutputFormat outputFormat, Rom rom, string lastgame, Dat datdata, int depth, Logger logger, bool ignoreblanks = false)
{ {
// If we are in ignore blanks mode AND we have a blank (0-size) rom, skip // If we are in ignore blanks mode AND we have a blank (0-size) rom, skip
if (ignoreblanks && (rom.HashData.Size == 0 || rom.HashData.Size == -1)) if (ignoreblanks && (rom.HashData.Size == 0 || rom.HashData.Size == -1))
@@ -3092,9 +3092,9 @@ namespace SabreTools.Helper
try try
{ {
string state = ""; string state = "";
switch (outputFormatFlag) switch (outputFormat)
{ {
case OutputFormatFlag.ClrMamePro: case OutputFormat.ClrMamePro:
state += "\t" + rom.Type.ToString().ToLowerInvariant() + " ( name \"" + rom.Name + "\"" + state += "\t" + rom.Type.ToString().ToLowerInvariant() + " ( name \"" + rom.Name + "\"" +
(rom.HashData.Size != -1 ? " size " + rom.HashData.Size : "") + (rom.HashData.Size != -1 ? " size " + rom.HashData.Size : "") +
(!String.IsNullOrEmpty(rom.HashData.CRC) ? " crc " + rom.HashData.CRC.ToLowerInvariant() : "") + (!String.IsNullOrEmpty(rom.HashData.CRC) ? " crc " + rom.HashData.CRC.ToLowerInvariant() : "") +
@@ -3104,7 +3104,7 @@ namespace SabreTools.Helper
(rom.Nodump ? " flags nodump" : "") + (rom.Nodump ? " flags nodump" : "") +
" )\n"; " )\n";
break; break;
case OutputFormatFlag.MissFile: case OutputFormat.MissFile:
string pre = datdata.Prefix + (datdata.Quotes ? "\"" : ""); string pre = datdata.Prefix + (datdata.Quotes ? "\"" : "");
string post = (datdata.Quotes ? "\"" : "") + datdata.Postfix; string post = (datdata.Quotes ? "\"" : "") + datdata.Postfix;
@@ -3169,23 +3169,23 @@ namespace SabreTools.Helper
} }
} }
break; break;
case OutputFormatFlag.RedumpMD5: case OutputFormat.RedumpMD5:
state += rom.HashData.MD5 + " *" + rom.Name + "\n"; state += rom.HashData.MD5 + " *" + rom.Name + "\n";
break; break;
case OutputFormatFlag.RedumpSFV: case OutputFormat.RedumpSFV:
state += rom.Name + " " + rom.HashData.CRC + "\n"; state += rom.Name + " " + rom.HashData.CRC + "\n";
break; break;
case OutputFormatFlag.RedumpSHA1: case OutputFormat.RedumpSHA1:
state += rom.HashData.SHA1 + " *" + rom.Name + "\n"; state += rom.HashData.SHA1 + " *" + rom.Name + "\n";
break; break;
case OutputFormatFlag.RomCenter: case OutputFormat.RomCenter:
state += "¬¬¬" + HttpUtility.HtmlEncode(rom.Machine) + state += "¬¬¬" + HttpUtility.HtmlEncode(rom.Machine) +
"¬" + HttpUtility.HtmlEncode((String.IsNullOrEmpty(rom.Machine.Description) ? rom.Machine.Name : rom.Machine.Description)) + "¬" + HttpUtility.HtmlEncode((String.IsNullOrEmpty(rom.Machine.Description) ? rom.Machine.Name : rom.Machine.Description)) +
"¬" + HttpUtility.HtmlEncode(rom.Name) + "¬" + HttpUtility.HtmlEncode(rom.Name) +
"¬" + rom.HashData.CRC.ToLowerInvariant() + "¬" + rom.HashData.CRC.ToLowerInvariant() +
"¬" + (rom.HashData.Size != -1 ? rom.HashData.Size.ToString() : "") + "¬¬¬\n"; "¬" + (rom.HashData.Size != -1 ? rom.HashData.Size.ToString() : "") + "¬¬¬\n";
break; break;
case OutputFormatFlag.SabreDat: case OutputFormat.SabreDat:
string prefix = ""; string prefix = "";
for (int i = 0; i < depth; i++) for (int i = 0; i < depth; i++)
{ {
@@ -3205,7 +3205,7 @@ namespace SabreTools.Helper
prefix + "</file>\n" : prefix + "</file>\n" :
"/>\n"); "/>\n");
break; break;
case OutputFormatFlag.Xml: case OutputFormat.Xml:
state += "\t\t<" + rom.Type.ToString().ToLowerInvariant() + " name=\"" + HttpUtility.HtmlEncode(rom.Name) + "\"" + state += "\t\t<" + rom.Type.ToString().ToLowerInvariant() + " name=\"" + HttpUtility.HtmlEncode(rom.Name) + "\"" +
(rom.HashData.Size != -1 ? " size=\"" + rom.HashData.Size + "\"" : "") + (rom.HashData.Size != -1 ? " size=\"" + rom.HashData.Size + "\"" : "") +
(!String.IsNullOrEmpty(rom.HashData.CRC) ? " crc=\"" + rom.HashData.CRC.ToLowerInvariant() + "\"" : "") + (!String.IsNullOrEmpty(rom.HashData.CRC) ? " crc=\"" + rom.HashData.CRC.ToLowerInvariant() + "\"" : "") +
@@ -3236,7 +3236,7 @@ namespace SabreTools.Helper
/// <param name="depth">Current depth to output file at (SabreDAT only)</param> /// <param name="depth">Current depth to output file at (SabreDAT only)</param>
/// <param name="logger">Logger object for file and console output</param> /// <param name="logger">Logger object for file and console output</param>
/// <returns>True if the data was written, false on error</returns> /// <returns>True if the data was written, false on error</returns>
public static bool WriteFooter(StreamWriter sw, OutputFormatFlag outputFormatFlag, Dat datdata, int depth, Logger logger) public static bool WriteFooter(StreamWriter sw, OutputFormat outputFormat, Dat datdata, int depth, Logger logger)
{ {
try try
{ {
@@ -3245,12 +3245,12 @@ namespace SabreTools.Helper
// If we have roms, output the full footer // If we have roms, output the full footer
if (datdata.Files != null && datdata.Files.Count > 0) if (datdata.Files != null && datdata.Files.Count > 0)
{ {
switch (outputFormatFlag) switch (outputFormat)
{ {
case OutputFormatFlag.ClrMamePro: case OutputFormat.ClrMamePro:
footer = ")"; footer = ")";
break; break;
case OutputFormatFlag.SabreDat: case OutputFormat.SabreDat:
for (int i = depth - 1; i >= 2; i--) for (int i = depth - 1; i >= 2; i--)
{ {
// Print out the number of tabs and the end folder // Print out the number of tabs and the end folder
@@ -3262,7 +3262,7 @@ namespace SabreTools.Helper
} }
footer += "\t</data>\n</datafile>"; footer += "\t</data>\n</datafile>";
break; break;
case OutputFormatFlag.Xml: case OutputFormat.Xml:
footer = "\t</machine>\n</datafile>"; footer = "\t</machine>\n</datafile>";
break; break;
} }
@@ -3271,10 +3271,10 @@ namespace SabreTools.Helper
// Otherwise, output the abbreviated form // Otherwise, output the abbreviated form
else else
{ {
switch (outputFormatFlag) switch (outputFormat)
{ {
case OutputFormatFlag.SabreDat: case OutputFormat.SabreDat:
case OutputFormatFlag.Xml: case OutputFormat.Xml:
footer = "</datafile>"; footer = "</datafile>";
break; break;
} }
@@ -3324,8 +3324,8 @@ namespace SabreTools.Helper
string newExtBString = string.Join(",", newExtB); string newExtBString = string.Join(",", newExtB);
// Get the file format // Get the file format
OutputFormatFlag outputFormatFlag = GetOutputFormat(filename, logger); OutputFormat outputFormat = GetOutputFormat(filename, logger);
if (outputFormatFlag == 0) if (outputFormat == 0)
{ {
return true; return true;
} }
@@ -3349,7 +3349,7 @@ namespace SabreTools.Helper
Url = datdata.Url, Url = datdata.Url,
Comment = datdata.Comment, Comment = datdata.Comment,
Files = new Dictionary<string, List<Rom>>(), Files = new Dictionary<string, List<Rom>>(),
OutputFormatFlag = outputFormatFlag, OutputFormat = outputFormat,
}; };
Dat datdataB = new Dat Dat datdataB = new Dat
{ {
@@ -3365,7 +3365,7 @@ namespace SabreTools.Helper
Url = datdata.Url, Url = datdata.Url,
Comment = datdata.Comment, Comment = datdata.Comment,
Files = new Dictionary<string, List<Rom>>(), Files = new Dictionary<string, List<Rom>>(),
OutputFormatFlag = outputFormatFlag, OutputFormat = outputFormat,
}; };
// If roms is empty, return false // If roms is empty, return false
@@ -3462,8 +3462,8 @@ namespace SabreTools.Helper
basepath = (basepath.EndsWith(Path.DirectorySeparatorChar.ToString()) ? basepath : basepath + Path.DirectorySeparatorChar); basepath = (basepath.EndsWith(Path.DirectorySeparatorChar.ToString()) ? basepath : basepath + Path.DirectorySeparatorChar);
// Get the file format // Get the file format
OutputFormatFlag outputFormatFlag = GetOutputFormat(filename, logger); OutputFormat outputFormat = GetOutputFormat(filename, logger);
if (outputFormatFlag == 0) if (outputFormat == 0)
{ {
return true; return true;
} }
@@ -3492,7 +3492,7 @@ namespace SabreTools.Helper
ForceMerging = datdata.ForceMerging, ForceMerging = datdata.ForceMerging,
ForceNodump = datdata.ForceNodump, ForceNodump = datdata.ForceNodump,
ForcePacking = datdata.ForcePacking, ForcePacking = datdata.ForcePacking,
OutputFormatFlag = outputFormatFlag, OutputFormat = outputFormat,
MergeRoms = datdata.MergeRoms, MergeRoms = datdata.MergeRoms,
Files = new Dictionary<string, List<Rom>>(), Files = new Dictionary<string, List<Rom>>(),
}; };
@@ -3514,7 +3514,7 @@ namespace SabreTools.Helper
ForceMerging = datdata.ForceMerging, ForceMerging = datdata.ForceMerging,
ForceNodump = datdata.ForceNodump, ForceNodump = datdata.ForceNodump,
ForcePacking = datdata.ForcePacking, ForcePacking = datdata.ForcePacking,
OutputFormatFlag = outputFormatFlag, OutputFormat = outputFormat,
MergeRoms = datdata.MergeRoms, MergeRoms = datdata.MergeRoms,
Files = new Dictionary<string, List<Rom>>(), Files = new Dictionary<string, List<Rom>>(),
}; };
@@ -3536,7 +3536,7 @@ namespace SabreTools.Helper
ForceMerging = datdata.ForceMerging, ForceMerging = datdata.ForceMerging,
ForceNodump = datdata.ForceNodump, ForceNodump = datdata.ForceNodump,
ForcePacking = datdata.ForcePacking, ForcePacking = datdata.ForcePacking,
OutputFormatFlag = outputFormatFlag, OutputFormat = outputFormat,
MergeRoms = datdata.MergeRoms, MergeRoms = datdata.MergeRoms,
Files = new Dictionary<string, List<Rom>>(), Files = new Dictionary<string, List<Rom>>(),
}; };
@@ -3558,7 +3558,7 @@ namespace SabreTools.Helper
ForceMerging = datdata.ForceMerging, ForceMerging = datdata.ForceMerging,
ForceNodump = datdata.ForceNodump, ForceNodump = datdata.ForceNodump,
ForcePacking = datdata.ForcePacking, ForcePacking = datdata.ForcePacking,
OutputFormatFlag = outputFormatFlag, OutputFormat = outputFormat,
MergeRoms = datdata.MergeRoms, MergeRoms = datdata.MergeRoms,
Files = new Dictionary<string, List<Rom>>(), Files = new Dictionary<string, List<Rom>>(),
}; };
@@ -3676,8 +3676,8 @@ namespace SabreTools.Helper
basepath = (basepath.EndsWith(Path.DirectorySeparatorChar.ToString()) ? basepath : basepath + Path.DirectorySeparatorChar); basepath = (basepath.EndsWith(Path.DirectorySeparatorChar.ToString()) ? basepath : basepath + Path.DirectorySeparatorChar);
// Get the file format // Get the file format
OutputFormatFlag outputFormatFlag = GetOutputFormat(filename, logger); OutputFormat outputFormat = GetOutputFormat(filename, logger);
if (outputFormatFlag == 0) if (outputFormat == 0)
{ {
return true; return true;
} }
@@ -3706,7 +3706,7 @@ namespace SabreTools.Helper
ForceMerging = datdata.ForceMerging, ForceMerging = datdata.ForceMerging,
ForceNodump = datdata.ForceNodump, ForceNodump = datdata.ForceNodump,
ForcePacking = datdata.ForcePacking, ForcePacking = datdata.ForcePacking,
OutputFormatFlag = outputFormatFlag, OutputFormat = outputFormat,
MergeRoms = datdata.MergeRoms, MergeRoms = datdata.MergeRoms,
Files = new Dictionary<string, List<Rom>>(), Files = new Dictionary<string, List<Rom>>(),
}; };
@@ -3728,7 +3728,7 @@ namespace SabreTools.Helper
ForceMerging = datdata.ForceMerging, ForceMerging = datdata.ForceMerging,
ForceNodump = datdata.ForceNodump, ForceNodump = datdata.ForceNodump,
ForcePacking = datdata.ForcePacking, ForcePacking = datdata.ForcePacking,
OutputFormatFlag = outputFormatFlag, OutputFormat = outputFormat,
MergeRoms = datdata.MergeRoms, MergeRoms = datdata.MergeRoms,
Files = new Dictionary<string, List<Rom>>(), Files = new Dictionary<string, List<Rom>>(),
}; };