diff --git a/DATabase/ImportExport/Generate.cs b/DATabase/ImportExport/Generate.cs index cd8f8102..387cf3c8 100644 --- a/DATabase/ImportExport/Generate.cs +++ b/DATabase/ImportExport/Generate.cs @@ -284,7 +284,7 @@ JOIN checksums { foreach (string key in roms.Keys) { - roms[key] = RomManipulation.Merge(roms[key], _logger); + roms[key] = DatTools.Merge(roms[key], _logger); } } // END COMMENT diff --git a/DATabase/ImportExport/GenerateTwo.cs b/DATabase/ImportExport/GenerateTwo.cs index 74a142f1..8f4eacac 100644 --- a/DATabase/ImportExport/GenerateTwo.cs +++ b/DATabase/ImportExport/GenerateTwo.cs @@ -174,7 +174,7 @@ namespace SabreTools { Int32.TryParse(sourcemap[hash], out tempSrcId); } - datdata = RomManipulation.Parse(file, 0, tempSrcId, datdata, _logger); + datdata = DatTools.Parse(file, 0, tempSrcId, datdata, _logger); } // If the dictionary is empty for any reason, tell the user and exit diff --git a/DATabase/ImportExport/Import.cs b/DATabase/ImportExport/Import.cs index 97f20d01..4494d9fa 100644 --- a/DATabase/ImportExport/Import.cs +++ b/DATabase/ImportExport/Import.cs @@ -368,7 +368,7 @@ namespace SabreTools // Get all roms that are found in the DAT to see what needs to be added DatData datdata = new DatData(); - datdata = RomManipulation.Parse(_filepath, sysid, srcid, datdata, _logger); + datdata = DatTools.Parse(_filepath, sysid, srcid, datdata, _logger); // Sort inputted roms into games SortedDictionary> sortable = new SortedDictionary>(); @@ -378,7 +378,7 @@ namespace SabreTools List newroms = roms; if (datdata.MergeRoms) { - newroms = RomManipulation.Merge(newroms, _logger); + newroms = DatTools.Merge(newroms, _logger); } foreach (RomData rom in newroms) @@ -402,7 +402,7 @@ namespace SabreTools foreach (string key in sortable.Keys) { List roms = sortable[key]; - RomManipulation.Sort(roms, true); + DatTools.Sort(roms, true); long gameid = -1; using (SqliteConnection dbc = new SqliteConnection(_connectionString)) diff --git a/DATabase/MergeDiff.cs b/DATabase/MergeDiff.cs index aa340e0b..1db2ee89 100644 --- a/DATabase/MergeDiff.cs +++ b/DATabase/MergeDiff.cs @@ -155,7 +155,7 @@ namespace SabreTools foreach (string input in _inputs) { _logger.User("Adding DAT: " + input.Split('¬')[0]); - userData = RomManipulation.Parse(input.Split('¬')[0], i, 0, userData, _logger, true, _clean); + userData = DatTools.Parse(input.Split('¬')[0], i, 0, userData, _logger, true, _clean); i++; // If we are in inplace mode or redirecting output, save the DAT data @@ -231,7 +231,7 @@ namespace SabreTools foreach (string key in userData.Roms.Keys) { List temp = userData.Roms[key]; - temp = RomManipulation.Merge(temp, _logger); + temp = DatTools.Merge(temp, _logger); foreach (RomData rom in temp) { @@ -319,7 +319,7 @@ namespace SabreTools foreach (string key in userData.Roms.Keys) { List temp = userData.Roms[key]; - temp = RomManipulation.Merge(temp, _logger); + temp = DatTools.Merge(temp, _logger); foreach (RomData rom in temp) { @@ -387,7 +387,7 @@ namespace SabreTools List keys = userData.Roms.Keys.ToList(); foreach (string key in keys) { - List oldroms = RomManipulation.Merge(userData.Roms[key], _logger); + List oldroms = DatTools.Merge(userData.Roms[key], _logger); List newroms = new List(); foreach (RomData rom in oldroms) diff --git a/DATabase/Partials/DATabase_Inits.cs b/DATabase/Partials/DATabase_Inits.cs index ec3273d0..c3f18d39 100644 --- a/DATabase/Partials/DATabase_Inits.cs +++ b/DATabase/Partials/DATabase_Inits.cs @@ -259,31 +259,31 @@ namespace SabreTools if (outputCMP) { userInputDat.OutputFormat = OutputFormat.ClrMamePro; - RomManipulation.Update(input, userInputDat, outdir, clean, gamename, romname, romtype, sgt, slt, seq, crc, md5, sha1, nodump, _logger); + DatTools.Update(input, userInputDat, outdir, clean, gamename, romname, romtype, sgt, slt, seq, crc, md5, sha1, nodump, _logger); } if (outputMiss || romba) { userInputDat.OutputFormat = OutputFormat.MissFile; - RomManipulation.Update(input, userInputDat, outdir, clean, gamename, romname, romtype, sgt, slt, seq, crc, md5, sha1, nodump, _logger); + DatTools.Update(input, userInputDat, outdir, clean, gamename, romname, romtype, sgt, slt, seq, crc, md5, sha1, nodump, _logger); } if (outputRC) { userInputDat.OutputFormat = OutputFormat.RomCenter; - RomManipulation.Update(input, userInputDat, outdir, clean, gamename, romname, romtype, sgt, slt, seq, crc, md5, sha1, nodump, _logger); + DatTools.Update(input, userInputDat, outdir, clean, gamename, romname, romtype, sgt, slt, seq, crc, md5, sha1, nodump, _logger); } if (outputSD) { userInputDat.OutputFormat = OutputFormat.SabreDat; - RomManipulation.Update(input, userInputDat, outdir, clean, gamename, romname, romtype, sgt, slt, seq, crc, md5, sha1, nodump, _logger); + DatTools.Update(input, userInputDat, outdir, clean, gamename, romname, romtype, sgt, slt, seq, crc, md5, sha1, nodump, _logger); } if (outputXML) { userInputDat.OutputFormat = OutputFormat.Xml; - RomManipulation.Update(input, userInputDat, outdir, clean, gamename, romname, romtype, sgt, slt, seq, crc, md5, sha1, nodump, _logger); + DatTools.Update(input, userInputDat, outdir, clean, gamename, romname, romtype, sgt, slt, seq, crc, md5, sha1, nodump, _logger); } if (!outputCMP && !(outputMiss || romba) && !outputRC && !outputSD && !outputXML) { - RomManipulation.Update(input, userInputDat, outdir, clean, gamename, romname, romtype, sgt, slt, seq, crc, md5, sha1, nodump, _logger); + DatTools.Update(input, userInputDat, outdir, clean, gamename, romname, romtype, sgt, slt, seq, crc, md5, sha1, nodump, _logger); } } @@ -576,7 +576,7 @@ namespace SabreTools OutputFormat = outputFormat, MergeRoms = false, }; - datdata = RomManipulation.Parse(filename, 0, 0, datdata, _logger, true, clean); + datdata = DatTools.Parse(filename, 0, 0, datdata, _logger, true, clean); // If the extension matches, append ".new" to the filename string extension = (datdata.OutputFormat == OutputFormat.Xml || datdata.OutputFormat == OutputFormat.SabreDat ? ".xml" : ".dat"); @@ -599,7 +599,7 @@ namespace SabreTools OutputFormat = outputFormat, MergeRoms = false, }; - datdata = RomManipulation.Parse(file, 0, 0, datdata, _logger, true, clean); + datdata = DatTools.Parse(file, 0, 0, datdata, _logger, true, clean); // If the extension matches, append ".new" to the filename string extension = (datdata.OutputFormat == OutputFormat.Xml || datdata.OutputFormat == OutputFormat.SabreDat ? ".xml" : ".dat"); @@ -661,7 +661,7 @@ namespace SabreTools Romba = romba, TSV = tsv, }; - datdata = RomManipulation.Parse(input, 0, 0, datdata, _logger); + datdata = DatTools.Parse(input, 0, 0, datdata, _logger); datdata.FileName += "-miss"; datdata.Name += "-miss"; datdata.Description += "-miss"; diff --git a/DATabase/Split.cs b/DATabase/Split.cs index 17f604de..d9970620 100644 --- a/DATabase/Split.cs +++ b/DATabase/Split.cs @@ -138,9 +138,9 @@ namespace SabreTools basepath = (basepath.EndsWith(Path.DirectorySeparatorChar.ToString()) ? basepath : basepath + Path.DirectorySeparatorChar); // Get the file data to be split - OutputFormat outputFormat = RomManipulation.GetOutputFormat(filename); + OutputFormat outputFormat = DatTools.GetOutputFormat(filename); DatData datdata = new DatData(); - datdata = RomManipulation.Parse(filename, 0, 0, datdata, _logger, true); + datdata = DatTools.Parse(filename, 0, 0, datdata, _logger, true); // Create each of the respective output DATs _logger.User("Creating and populating new DATs"); @@ -343,10 +343,10 @@ namespace SabreTools { // Load the current DAT to be processed DatData datdata = new DatData(); - datdata = RomManipulation.Parse(filename, 0, 0, datdata, _logger); + datdata = DatTools.Parse(filename, 0, 0, datdata, _logger); // Set all of the appropriate outputs for each of the subsets - OutputFormat outputFormat = RomManipulation.GetOutputFormat(filename); + OutputFormat outputFormat = DatTools.GetOutputFormat(filename); DatData datdataA = new DatData { FileName = datdata.FileName + " (" + String.Join(",", _extA) + ")", diff --git a/DATabase/TrimMerge.cs b/DATabase/TrimMerge.cs index 63bd6c55..2b7204a8 100644 --- a/DATabase/TrimMerge.cs +++ b/DATabase/TrimMerge.cs @@ -86,9 +86,9 @@ namespace SabreTools DatData datdata = new DatData { ForcePacking = (_forceunpack ? ForcePacking.Unzip : ForcePacking.None), - OutputFormat = RomManipulation.GetOutputFormat(filename), + OutputFormat = DatTools.GetOutputFormat(filename), }; - datdata = RomManipulation.Parse(filename, 0, 0, datdata, _logger); + datdata = DatTools.Parse(filename, 0, 0, datdata, _logger); // Trim all file names according to the path that's set List keys = datdata.Roms.Keys.ToList(); diff --git a/OfflineMerge/OfflineMerge.cs b/OfflineMerge/OfflineMerge.cs index c862d2bd..76abd3f6 100644 --- a/OfflineMerge/OfflineMerge.cs +++ b/OfflineMerge/OfflineMerge.cs @@ -148,15 +148,15 @@ namespace SabreTools // First get the combination Dictionary of currentAllMerged and currentNewMerged _logger.User("Adding Current and New Merged DATs to the dictionary"); DatData completeDats = new DatData(); - completeDats = RomManipulation.Parse(_currentAllMerged, 0, 0, completeDats, _logger); - completeDats = RomManipulation.Parse(_currentNewMerged, 0, 0, completeDats, _logger); + completeDats = DatTools.Parse(_currentAllMerged, 0, 0, completeDats, _logger); + completeDats = DatTools.Parse(_currentNewMerged, 0, 0, completeDats, _logger); // Now get Net New output dictionary [(currentNewMerged)-(currentAllMerged)] _logger.User("Creating and populating Net New dictionary"); Dictionary> netNew = new Dictionary>(); foreach (string key in completeDats.Roms.Keys) { - List templist = RomManipulation.Merge(completeDats.Roms[key], _logger); + List templist = DatTools.Merge(completeDats.Roms[key], _logger); foreach (RomData rom in templist) { if (rom.Dupe == DupeType.None && rom.System == _currentNewMerged) @@ -180,7 +180,7 @@ namespace SabreTools Dictionary> unneeded = new Dictionary>(); foreach (string key in completeDats.Roms.Keys) { - List templist = RomManipulation.Merge(completeDats.Roms[key], _logger); + List templist = DatTools.Merge(completeDats.Roms[key], _logger); foreach (RomData rom in templist) { if (rom.Dupe == DupeType.None && rom.System == _currentAllMerged) @@ -202,7 +202,7 @@ namespace SabreTools // Now create the New Missing dictionary [(Net New)+(currentMissingMerged-(Unneeded))] _logger.User("Creating and populating New Missing dictionary"); DatData midMissing = new DatData(); - midMissing = RomManipulation.Parse(_currentMissingMerged, 0, 0, midMissing, _logger); + midMissing = DatTools.Parse(_currentMissingMerged, 0, 0, midMissing, _logger); foreach (string key in unneeded.Keys) { if (midMissing.Roms.ContainsKey(key)) @@ -217,7 +217,7 @@ namespace SabreTools Dictionary> newMissing = new Dictionary>(); foreach (string key in midMissing.Roms.Keys) { - List templist = RomManipulation.Merge(midMissing.Roms[key], _logger); + List templist = DatTools.Merge(midMissing.Roms[key], _logger); foreach (RomData rom in templist) { if (rom.Dupe == DupeType.None && rom.System == _currentMissingMerged) @@ -289,7 +289,7 @@ namespace SabreTools Dictionary> have = new Dictionary>(); foreach (string key in midHave.Keys) { - List templist = RomManipulation.Merge(midHave[key], _logger); + List templist = DatTools.Merge(midHave[key], _logger); foreach (RomData rom in templist) { if (rom.Dupe == DupeType.None && rom.System == _currentNewMerged) @@ -452,12 +452,12 @@ namespace SabreTools // Now create the Have dictionary [(currentAllMerged)-(currentMissingMerged)] _logger.User("Creating and populating Have dictionary"); DatData midHave = new DatData(); - midHave = RomManipulation.Parse(_currentMissingMerged, 0, 0, midHave, _logger); - midHave = RomManipulation.Parse(_currentAllMerged, 0, 0, midHave, _logger); + midHave = DatTools.Parse(_currentMissingMerged, 0, 0, midHave, _logger); + midHave = DatTools.Parse(_currentAllMerged, 0, 0, midHave, _logger); Dictionary> have = new Dictionary>(); foreach (string key in midHave.Roms.Keys) { - List templist = RomManipulation.Merge(midHave.Roms[key], _logger); + List templist = DatTools.Merge(midHave.Roms[key], _logger); foreach (RomData rom in templist) { if (rom.Dupe == DupeType.None && rom.System == _currentAllMerged) @@ -522,12 +522,12 @@ namespace SabreTools // Now create the Have dictionary [(currentNewMerged)-(currentMissingMerged)] _logger.User("Creating and populating Have dictionary"); DatData midHave = new DatData(); - midHave = RomManipulation.Parse(_currentMissingMerged, 0, 0, midHave, _logger); - midHave = RomManipulation.Parse(_currentNewMerged, 0, 0, midHave, _logger); + midHave = DatTools.Parse(_currentMissingMerged, 0, 0, midHave, _logger); + midHave = DatTools.Parse(_currentNewMerged, 0, 0, midHave, _logger); Dictionary> have = new Dictionary>(); foreach (string key in midHave.Roms.Keys) { - List templist = RomManipulation.Merge(midHave.Roms[key], _logger); + List templist = DatTools.Merge(midHave.Roms[key], _logger); foreach (RomData rom in templist) { if (rom.Dupe == DupeType.None && rom.System == _currentNewMerged) diff --git a/SabreHelper/DatTools/Output.cs b/SabreHelper/DatTools/Output.cs index 6c891052..cb1fb290 100644 --- a/SabreHelper/DatTools/Output.cs +++ b/SabreHelper/DatTools/Output.cs @@ -32,7 +32,7 @@ namespace SabreTools.Helper } // Bucket roms by game name and optionally dedupe - SortedDictionary> sortable = RomManipulation.BucketByGame(datdata.Roms, datdata.MergeRoms, norename, logger); + SortedDictionary> sortable = DatTools.BucketByGame(datdata.Roms, datdata.MergeRoms, norename, logger); // Now write out to file // If it's empty, use the current folder diff --git a/SabreHelper/DatTools/RomManipulation.cs b/SabreHelper/DatTools/RomManipulation.cs index 1eb77479..d9dd6ac2 100644 --- a/SabreHelper/DatTools/RomManipulation.cs +++ b/SabreHelper/DatTools/RomManipulation.cs @@ -7,7 +7,7 @@ using System.Xml; namespace SabreTools.Helper { - public class RomManipulation + public class DatTools { /// /// Get what type of DAT the input file is @@ -1720,7 +1720,7 @@ namespace SabreTools.Helper if (File.Exists(inputFileName)) { logger.User("Processing \"" + Path.GetFileName(inputFileName) + "\""); - datdata = RomManipulation.Parse(inputFileName, 0, 0, datdata, logger, true, clean); + datdata = DatTools.Parse(inputFileName, 0, 0, datdata, logger, true, clean); datdata = Filter(datdata, gamename, romname, romtype, sgt, slt, seq, crc, md5, sha1, nodump, logger); // If the extension matches, append ".new" to the filename @@ -1741,7 +1741,7 @@ namespace SabreTools.Helper logger.User("Processing \"" + Path.GetFullPath(file).Remove(0, inputFileName.Length) + "\""); DatData innerDatdata = (DatData)datdata.Clone(); innerDatdata.Roms = null; - innerDatdata = RomManipulation.Parse(file, 0, 0, innerDatdata, logger, true, clean); + innerDatdata = DatTools.Parse(file, 0, 0, innerDatdata, logger, true, clean); innerDatdata = Filter(innerDatdata, gamename, romname, romtype, sgt, slt, seq, crc, md5, sha1, nodump, logger); // If the extension matches, append ".new" to the filename diff --git a/SabreHelper/DatTools/Stats.cs b/SabreHelper/DatTools/Stats.cs index 2afdb402..afbb45b3 100644 --- a/SabreHelper/DatTools/Stats.cs +++ b/SabreHelper/DatTools/Stats.cs @@ -50,8 +50,8 @@ namespace SabreTools _logger.User("Beginning stat collection for '" + filename + "'"); List games = new List(); DatData datdata = new DatData(); - datdata = RomManipulation.Parse(filename, 0, 0, datdata, _logger); - SortedDictionary> newroms = RomManipulation.BucketByGame(datdata.Roms, false, true, _logger); + datdata = DatTools.Parse(filename, 0, 0, datdata, _logger); + SortedDictionary> newroms = DatTools.BucketByGame(datdata.Roms, false, true, _logger); // Output single DAT stats (if asked) if (_single) @@ -132,7 +132,7 @@ Please check the log folder if the stats scrolled offscreen"); } } - SortedDictionary> newroms = RomManipulation.BucketByGame(datdata.Roms, false, true, logger); + SortedDictionary> newroms = DatTools.BucketByGame(datdata.Roms, false, true, logger); logger.User(@" Uncompressed size: " + Style.GetBytesReadable(datdata.TotalSize) + @" Games found: " + newroms.Count + @" Roms found: " + datdata.RomCount + @"