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

Add more code for dictionary based merging

Browse Source
This commit is contained in:
Matt Nadareski
2016-04-28 11:31:35 -07:00
parent a202dc3dbb
commit ae2b8fd44d
2 changed files with 55 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
DATabase/MergeDiff.cs
View File

@@ -100,6 +100,7 @@ namespace SabreTools
_author = "SabreTools";
}
/*
// Create the database of ROMs from the input DATs
SqliteConnection dbc = DBTools.InMemoryDb();
foreach (string input in _inputs)
@@ -111,30 +112,72 @@ namespace SabreTools
// Output all DATs specified by user inputs
Output.WriteToDatFromDb(_name, _desc, _version, _date, _cat, _author, _forceunpack, _old, _diff, _ad, "", dbc, _logger);
dbc.Close();
*/
// Create a dictionary of all ROMs from the input DATs
Dictionary<string, List<RomData>> dict = new Dictionary<string, List<RomData>>();
foreach (string input in _inputs)
{
_logger.Log("Adding DAT: " + input);
RomManipulation.ParseDict(input, 0, 0, dict, _logger);
dict = RomManipulation.ParseDict(input, 0, 0, dict, _logger);
}
// Modify the Dictionary if necessary and output the results
if (_diff)
if (_diff || _ad)
{
// Get all entries that have only one item in their list
}
else
Dictionary<string, List<RomData>> diffed = new Dictionary<string, List<RomData>>();
foreach (string key in dict.Keys)
{
// Output all entries with user-defined merge
if (dict[key].Count == 1)
{
diffed.Add(key, dict[key]);
}
}
// Output the difflist only if we're in diff mode and not AB
if (_diff)
{
Output.WriteToDatFromDict(_name, _desc, _version, _date, _cat, _author, _forceunpack, _old, _dedup, "", diffed, _logger);
}
// For the AB mode, get all required dictionaries and output with a new name
if (_ad)
{
// Loop through _inputs first and filter from all diffed roms to find the ones that have the same "System"
string post = "";
foreach (string filename in _inputs)
{
Dictionary<string, List<RomData>> sysDict = new Dictionary<string, List<RomData>>();
foreach (string key in diffed.Keys)
{
if (diffed[key][0].System == filename)
{
sysDict.Add(key, diffed[key]);
}
}
post = " (" + Path.GetFileNameWithoutExtension(filename) + ")";
Output.WriteToDatFromDict(_name + post, _desc + post, _version, _date, _cat, _author, _forceunpack, _old, _dedup, "", sysDict, _logger);
}
// Then loop through all that have a count > 1 for the AB merged DAT
Dictionary<string, List<RomData>> duplicates = new Dictionary<string, List<RomData>>();
post = " (dupes)";
foreach (string key in dict.Keys)
{
if (dict[key].Count > 1)
{
duplicates.Add(key, diffed[key]);
}
}
Output.WriteToDatFromDict(_name + post, _desc + post, _version, _date, _cat, _author, _forceunpack, _old, true, "", duplicates, _logger);
}
}
// Output all entries with user-defined merge
else
{
Output.WriteToDatFromDict(_name, _desc, _version, _date, _cat, _author, _forceunpack, _old, _dedup, "", dict, _logger);
}
return true;

4
SabreHelper/RomManipulation.cs
View File

@@ -559,7 +559,7 @@ VALUES ('" + tempname.Replace("'", "''") + "', '" +
/// <param name="dict">The dictionary to add found roms to</param>
/// <param name="logger">Logger object for console and/or file output</param>
/// <returns>Dictionary with "crc-sha1-size" key and List of RomData objects value representing the found data</returns>
public static bool ParseDict(string filename, int sysid, int srcid, Dictionary<string, List<RomData>> dict, Logger logger)
public static Dictionary<string, List<RomData>> ParseDict(string filename, int sysid, int srcid, Dictionary<string, List<RomData>> dict, Logger logger)
{
XmlTextReader xtr = GetXmlTextReader(filename, logger);
xtr.WhitespaceHandling = WhitespaceHandling.None;
@@ -701,7 +701,7 @@ VALUES ('" + tempname.Replace("'", "''") + "', '" +
}
}
return true;
return dict;
}
/// <summary>