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] Part 2 of using ref

Browse Source
This commit is contained in:
Matt Nadareski
2016-09-18 21:11:35 -07:00
parent 22e60c26e0
commit 2753542a1f
1 changed files with 26 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -133,7 +133,7 @@ namespace SabreTools.Helper
/// <param name="clean">True if game names are sanitized, false otherwise (default)</param> /// <param name="clean">True if game names are sanitized, false otherwise (default)</param>
/// <param name="softlist">True if SL XML names should be kept, false otherwise (default)</param> /// <param name="softlist">True if SL XML names should be kept, false otherwise (default)</param>
/// <param name="keepext">True if original extension should be kept, false otherwise (default)</param> /// <param name="keepext">True if original extension should be kept, false otherwise (default)</param>
public static Dat Parse( public static void Parse(
// Standard Dat parsing // Standard Dat parsing
string filename, string filename,
int sysid, int sysid,
@@ -168,7 +168,7 @@ namespace SabreTools.Helper
string ext = Path.GetExtension(filename).ToLowerInvariant(); string ext = Path.GetExtension(filename).ToLowerInvariant();
if (ext != ".txt" && ext != ".dat" && ext != ".xml") if (ext != ".txt" && ext != ".dat" && ext != ".xml")
{ {
return datdata; return;
} }
// If the output filename isn't set already, get the internal filename // If the output filename isn't set already, get the internal filename
@@ -187,14 +187,17 @@ namespace SabreTools.Helper
switch (GetOutputFormat(filename, logger)) switch (GetOutputFormat(filename, logger))
{ {
case OutputFormat.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); ParseCMP(filename, sysid, srcid, ref datdata, gamename, romname, romtype, sgt, slt, seq, crc, md5, sha1, nodump, trim, single, root, logger, keep, clean);
break;
case OutputFormat.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); ParseRC(filename, sysid, srcid, ref datdata, gamename, romname, romtype, sgt, slt, seq, crc, md5, sha1, nodump, trim, single, root, logger, clean);
break;
case OutputFormat.SabreDat: case OutputFormat.SabreDat:
case OutputFormat.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); ParseXML(filename, sysid, srcid, ref datdata, gamename, romname, romtype, sgt, slt, seq, crc, md5, sha1, nodump, trim, single, root, logger, keep, clean, softlist);
break;
default: default:
return datdata; return;
} }
} }
@@ -221,13 +224,12 @@ namespace SabreTools.Helper
/// <param name="logger">Logger object for console and/or file output</param> /// <param name="logger">Logger object for console and/or file output</param>
/// <param name="keep">True if full pathnames are to be kept, false otherwise (default)</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="clean">True if game names are sanitized, false otherwise (default)</param>
/// <returns>DatData object representing the read-in data</returns> private static void ParseCMP(
private static Dat ParseCMP(
// Standard Dat parsing // Standard Dat parsing
string filename, string filename,
int sysid, int sysid,
int srcid, int srcid,
Dat datdata, ref Dat datdata,
// Rom filtering // Rom filtering
string gamename, string gamename,
@@ -455,7 +457,7 @@ namespace SabreTools.Helper
// Now process and add the rom // Now process and add the rom
string key = ""; string key = "";
datdata = ParseAddHelper(rom, datdata, gamename, romname, romtype, sgt, slt, seq, crc, md5, sha1, nodump, trim, single, root, clean, logger, out key); ParseAddHelper(rom, ref datdata, gamename, romname, romtype, sgt, slt, seq, crc, md5, sha1, nodump, trim, single, root, clean, logger, out key);
} }
// If the line is anything but a rom or disk and we're in a block // If the line is anything but a rom or disk and we're in a block
else if (Regex.IsMatch(line, Constants.ItemPatternCMP) && block) else if (Regex.IsMatch(line, Constants.ItemPatternCMP) && block)
@@ -587,8 +589,6 @@ namespace SabreTools.Helper
sr.Close(); sr.Close();
sr.Dispose(); sr.Dispose();
return datdata;
} }
/// <summary> /// <summary>
@@ -613,13 +613,12 @@ 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="logger">Logger object for console and/or file output</param> /// <param name="logger">Logger object for console and/or file output</param>
/// <param name="clean">True if game names are sanitized, false otherwise (default)</param> /// <param name="clean">True if game names are sanitized, false otherwise (default)</param>
/// <returns>DatData object representing the read-in data</returns> private static void ParseRC(
private static Dat ParseRC(
// Standard Dat parsing // Standard Dat parsing
string filename, string filename,
int sysid, int sysid,
int srcid, int srcid,
Dat datdata, ref Dat datdata,
// Rom filtering // Rom filtering
string gamename, string gamename,
@@ -762,15 +761,13 @@ namespace SabreTools.Helper
// Now process and add the rom // Now process and add the rom
string key = ""; string key = "";
datdata = ParseAddHelper(rom, datdata, gamename, romname, romtype, sgt, slt, seq, crc, md5, sha1, nodump, trim, single, root, clean, logger, out key); ParseAddHelper(rom, ref datdata, gamename, romname, romtype, sgt, slt, seq, crc, md5, sha1, nodump, trim, single, root, clean, logger, out key);
} }
} }
} }
sr.Close(); sr.Close();
sr.Dispose(); sr.Dispose();
return datdata;
} }
/// <summary> /// <summary>
@@ -797,13 +794,12 @@ namespace SabreTools.Helper
/// <param name="keep">True if full pathnames are to be kept, false otherwise (default)</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="clean">True if game names are sanitized, false otherwise (default)</param>
/// <param name="softlist">True if SL XML names should be kept, false otherwise (default)</param> /// <param name="softlist">True if SL XML names should be kept, false otherwise (default)</param>
/// <returns>DatData object representing the read-in data</returns> private static void ParseXML(
private static Dat ParseXML(
// Standard Dat parsing // Standard Dat parsing
string filename, string filename,
int sysid, int sysid,
int srcid, int srcid,
Dat datdata, ref Dat datdata,
// Rom filtering // Rom filtering
string gamename, string gamename,
@@ -868,7 +864,7 @@ namespace SabreTools.Helper
}; };
// Now process and add the rom // Now process and add the rom
datdata = ParseAddHelper(rom, datdata, gamename, romname, romtype, sgt, slt, seq, crc, md5, sha1, nodump, trim, single, root, clean, logger, out key); ParseAddHelper(rom, ref datdata, gamename, romname, romtype, sgt, slt, seq, crc, md5, sha1, nodump, trim, single, root, clean, logger, out key);
} }
// Regardless, end the current folder // Regardless, end the current folder
@@ -1261,7 +1257,7 @@ namespace SabreTools.Helper
}; };
// Now process and add the rom // Now process and add the rom
datdata = ParseAddHelper(relrom, datdata, gamename, romname, romtype, sgt, slt, seq, crc, md5, sha1, nodump, trim, single, root, clean, logger, out key); ParseAddHelper(relrom, ref datdata, gamename, romname, romtype, sgt, slt, seq, crc, md5, sha1, nodump, trim, single, root, clean, logger, out key);
subreader.Read(); subreader.Read();
break; break;
@@ -1297,7 +1293,7 @@ namespace SabreTools.Helper
}; };
// Now process and add the rom // Now process and add the rom
datdata = ParseAddHelper(biosrom, datdata, gamename, romname, romtype, sgt, slt, seq, crc, md5, sha1, nodump, trim, single, root, clean, logger, out key); ParseAddHelper(biosrom, ref datdata, gamename, romname, romtype, sgt, slt, seq, crc, md5, sha1, nodump, trim, single, root, clean, logger, out key);
subreader.Read(); subreader.Read();
break; break;
@@ -1319,7 +1315,7 @@ namespace SabreTools.Helper
}; };
// Now process and add the rom // Now process and add the rom
datdata = ParseAddHelper(samplerom, datdata, gamename, romname, romtype, sgt, slt, seq, crc, md5, sha1, nodump, trim, single, root, clean, logger, out key); ParseAddHelper(samplerom, ref datdata, gamename, romname, romtype, sgt, slt, seq, crc, md5, sha1, nodump, trim, single, root, clean, logger, out key);
subreader.Read(); subreader.Read();
break; break;
@@ -1405,7 +1401,7 @@ namespace SabreTools.Helper
}; };
// Now process and add the rom // Now process and add the rom
datdata = ParseAddHelper(inrom, datdata, gamename, romname, romtype, sgt, slt, seq, crc, md5, sha1, nodump, trim, single, root, clean, logger, out key); ParseAddHelper(inrom, ref datdata, gamename, romname, romtype, sgt, slt, seq, crc, md5, sha1, nodump, trim, single, root, clean, logger, out key);
subreader.Read(); subreader.Read();
break; break;
@@ -1440,7 +1436,7 @@ namespace SabreTools.Helper
}; };
// Now process and add the rom // Now process and add the rom
datdata = ParseAddHelper(inrom, datdata, gamename, romname, romtype, sgt, slt, seq, crc, md5, sha1, nodump, trim, single, root, clean, logger, out key); ParseAddHelper(inrom, ref datdata, gamename, romname, romtype, sgt, slt, seq, crc, md5, sha1, nodump, trim, single, root, clean, logger, out key);
// Regardless, end the current folder // Regardless, end the current folder
if (parent.Count == 0) if (parent.Count == 0)
@@ -1570,7 +1566,7 @@ namespace SabreTools.Helper
}; };
// Now process and add the rom // Now process and add the rom
datdata = ParseAddHelper(rom, datdata, gamename, romname, romtype, sgt, slt, seq, crc, md5, sha1, nodump, trim, single, root, clean, logger, out key); ParseAddHelper(rom, ref datdata, gamename, romname, romtype, sgt, slt, seq, crc, md5, sha1, nodump, trim, single, root, clean, logger, out key);
xtr.Read(); xtr.Read();
break; break;
@@ -1583,8 +1579,6 @@ namespace SabreTools.Helper
xtr.Close(); xtr.Close();
xtr.Dispose(); xtr.Dispose();
} }
return datdata;
} }
/// <summary> /// <summary>
@@ -1606,7 +1600,7 @@ namespace SabreTools.Helper
/// <param name="single">True if all games should be replaced by '!', false otherwise</param> /// <param name="single">True if all games should be replaced by '!', false otherwise</param>
/// <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="logger">Logger object for console and/or file output</param> /// <param name="logger">Logger object for console and/or file output</param>
private static Dat ParseAddHelper(Rom rom, Dat datdata, string gamename, string romname, string romtype, long sgt, long slt, private static void ParseAddHelper(Rom rom, ref Dat datdata, 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, bool clean, Logger logger, out string key) long seq, string crc, string md5, string sha1, bool? nodump, bool trim, bool single, string root, bool clean, Logger logger, out string key)
{ {
key = ""; key = "";
@@ -1615,7 +1609,7 @@ namespace SabreTools.Helper
if (String.IsNullOrEmpty(rom.Name)) if (String.IsNullOrEmpty(rom.Name))
{ {
logger.Warning("Rom with no name found! Skipping..."); logger.Warning("Rom with no name found! Skipping...");
return datdata; return;
} }
// If we're in cleaning mode, sanitize the game name // If we're in cleaning mode, sanitize the game name
@@ -1698,8 +1692,6 @@ namespace SabreTools.Helper
datdata.NodumpCount += (rom.Nodump ? 1 : 0); datdata.NodumpCount += (rom.Nodump ? 1 : 0);
} }
} }
return datdata;
} }
#endregion #endregion