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

[ExtSplit] Prepare for multiple extensions per DAT

Browse Source
This commit is contained in:
Matt Nadareski
2016-06-10 16:58:45 -07:00
parent db409922d7
commit 91980cd610
3 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
DATabase/ExtSplit.cs
View File

@@ -9,8 +9,8 @@ namespace SabreTools
public class ExtSplit public class ExtSplit
{ {
// Instance variables // Instance variables
private string _extA; private List<string> _extA;
private string _extB; private List<string> _extB;
private string _filename; private string _filename;
private string _outdir; private string _outdir;
private static Logger _logger; private static Logger _logger;
@@ -19,14 +19,22 @@ namespace SabreTools
/// Create a new DatSplit object /// Create a new DatSplit object
/// </summary> /// </summary>
/// <param name="filename">Filename of the DAT to split</param> /// <param name="filename">Filename of the DAT to split</param>
/// <param name="extA">First extension to split on</param> /// <param name="extA">List of extensions to split on (first DAT)</param>
/// <param name="extB">Second extension to split on</param> /// <param name="extB">List of extensions to split on (second DAT)</param>
/// <param name="logger">Logger object for console and file writing</param> /// <param name="logger">Logger object for console and file writing</param>
public ExtSplit(string filename, string extA, string extB, string outdir, Logger logger) public ExtSplit(string filename, List<string> extA, List<string> extB, string outdir, Logger logger)
{ {
_filename = filename.Replace("\"", ""); _filename = filename.Replace("\"", "");
_extA = (extA.StartsWith(".") ? extA : "." + extA).ToUpperInvariant(); _extA = new List<string>();
_extB = (extB.StartsWith(".") ? extB : "." + extB).ToUpperInvariant(); foreach (string s in extA)
{
_extA.Add((s.StartsWith(".") ? s : "." + s).ToUpperInvariant());
}
_extB = new List<string>();
foreach (string s in extB)
{
_extB.Add((s.StartsWith(".") ? s : "." + s).ToUpperInvariant());
}
_outdir = outdir.Replace("\"", ""); _outdir = outdir.Replace("\"", "");
_logger = logger; _logger = logger;
} }
@@ -106,7 +114,7 @@ namespace SabreTools
{ {
foreach (RomData rom in datdata.Roms[key]) foreach (RomData rom in datdata.Roms[key])
{ {
if (rom.Name.ToUpperInvariant().EndsWith(_extA)) if (rom.Name.ToUpperInvariant().EndsWith(_extA[0]))
{ {
if (datdataA.Roms.ContainsKey(key)) if (datdataA.Roms.ContainsKey(key))
{ {
@@ -119,7 +127,7 @@ namespace SabreTools
datdataA.Roms.Add(key, temp); datdataA.Roms.Add(key, temp);
} }
} }
else if (rom.Name.ToUpperInvariant().EndsWith(_extB)) else if (rom.Name.ToUpperInvariant().EndsWith(_extB[0]))
{ {
if (datdataB.Roms.ContainsKey(key)) if (datdataB.Roms.ContainsKey(key))
{ {

7
DATabase/Partials/DATabase_Inits.cs
View File

@@ -416,6 +416,11 @@ namespace SabreTools
extb = extb.Replace("\"", ""); extb = extb.Replace("\"", "");
outdir = outdir.Replace("\"", ""); outdir = outdir.Replace("\"", "");
List<string> extaList = new List<string>();
extaList.Add(exta);
List<string> extbList = new List<string>();
extbList.Add(extb);
if (input != "" && File.Exists(input)) if (input != "" && File.Exists(input))
{ {
if (exta == "" || extb == "") if (exta == "" || extb == "")
@@ -423,7 +428,7 @@ namespace SabreTools
_logger.Warning("Two extensions are needed to split a DAT!"); _logger.Warning("Two extensions are needed to split a DAT!");
return; return;
} }
ExtSplit es = new ExtSplit(input, exta, extb, outdir, _logger); ExtSplit es = new ExtSplit(input, extaList, extbList, outdir, _logger);
es.Split(); es.Split();
return; return;
} }

BIN
SabreHelper/sqlite3.dll
View File

Binary file not shown.