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

Better naming

Browse Source
This commit is contained in:
Matt Nadareski
2016-05-11 14:32:06 -07:00
parent c2b1cebe37
commit 11632ca111
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
DATabase/MergeDiff.cs
View File

@@ -78,11 +78,11 @@ namespace SabreTools
// Get the values that will be used // Get the values that will be used
if (_name == "") if (_name == "")
{ {
_name = (_diff ? "diffdat" : "mergedat") + (_dedup ? "-deduped" : ""); _name = (_diff ? "DiffDAT" : "") + (_dedup ? "-deduped" : "");
} }
if (_desc == "") if (_desc == "")
{ {
_desc = (_diff ? "diffdat" : "mergedat") + (_dedup ? "-deduped" : ""); _desc = (_diff ? "DiffDAT" : "MergeDAT") + (_dedup ? " - deduped" : "");
if (!_bare) if (!_bare)
{ {
_desc += " (" + _date + ")"; _desc += " (" + _date + ")";
@@ -110,6 +110,8 @@ namespace SabreTools
// Modify the Dictionary if necessary and output the results // Modify the Dictionary if necessary and output the results
if (_diff) if (_diff)
{ {
string post = "";
// Get all entries that don't have External dupes // Get all entries that don't have External dupes
Dictionary<string, List<RomData>> diffed = new Dictionary<string, List<RomData>>(); Dictionary<string, List<RomData>> diffed = new Dictionary<string, List<RomData>>();
foreach (string key in dict.Keys) foreach (string key in dict.Keys)
@@ -135,12 +137,13 @@ namespace SabreTools
} }
} }
post = " (No Duplicates)";
// Output the difflist (a-b)+(b-a) diff // Output the difflist (a-b)+(b-a) diff
Output.WriteToDatFromDict(_name, _desc, _version, _date, _cat, _author, _forceunpack, _old, _dedup, "", diffed, _logger); Output.WriteToDatFromDict(_name + post, _desc + post, _version, _date, _cat, _author, _forceunpack, _old, _dedup, "", diffed, _logger);
// For the AB mode-style diffs, get all required dictionaries and output with a new name // For the AB mode-style diffs, get all required dictionaries and output with a new name
// Loop through _inputs first and filter from all diffed roms to find the ones that have the same "System" // Loop through _inputs first and filter from all diffed roms to find the ones that have the same "System"
string post = "";
for (int j = 0; j < _inputs.Count; j++) for (int j = 0; j < _inputs.Count; j++)
{ {
Dictionary<string, List<RomData>> sysDict = new Dictionary<string, List<RomData>>(); Dictionary<string, List<RomData>> sysDict = new Dictionary<string, List<RomData>>();
@@ -164,13 +167,13 @@ namespace SabreTools
} }
} }
post = " (" + Path.GetFileNameWithoutExtension(_inputs[j]) + ")"; post = " (" + Path.GetFileNameWithoutExtension(_inputs[j]) + " Only)";
Output.WriteToDatFromDict(_name + post, _desc + post, _version, _date, _cat, _author, _forceunpack, _old, _dedup, "", sysDict, _logger); Output.WriteToDatFromDict(_name + post, _desc + post, _version, _date, _cat, _author, _forceunpack, _old, _dedup, "", sysDict, _logger);
} }
// Get all entries that have External dupes // Get all entries that have External dupes
Dictionary<string, List<RomData>> duplicates = new Dictionary<string, List<RomData>>(); Dictionary<string, List<RomData>> duplicates = new Dictionary<string, List<RomData>>();
post = " (dupes)"; post = " (Duplicates)";
foreach (string key in dict.Keys) foreach (string key in dict.Keys)
{ {
List<RomData> temp = dict[key]; List<RomData> temp = dict[key];