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

More code cleanup

Browse Source 
This change comprises of multiple smaller changes:
- Convert all WriteToDat to WriteToDatFromDict, including MissFile
- Change obsolete Import to use updated ParseDict
- Remove all references to Parse
- Rename all references to "Dict" specific code to shorter names
- Remove more unused methods rendered obsolete by other changes
This commit is contained in:
Matt Nadareski
2016-05-16 21:52:49 -07:00
parent fc67d62fe5
commit e3595ea384
13 changed files with 266 additions and 593 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
OfflineMerge/OfflineMerge.cs
View File

@@ -148,8 +148,8 @@ namespace SabreTools
{
Roms = new Dictionary<string, List<RomData>>(),
};
completeDats = RomManipulation.ParseDict(_currentAllMerged, 0, 0, completeDats, _logger);
completeDats = RomManipulation.ParseDict(_currentNewMerged, 0, 0, completeDats, _logger);
completeDats = RomManipulation.Parse(_currentAllMerged, 0, 0, completeDats, _logger);
completeDats = RomManipulation.Parse(_currentNewMerged, 0, 0, completeDats, _logger);
// Now get Net New output dictionary [(currentNewMerged)-(currentAllMerged)]
_logger.User("Creating and populating Net New dictionary");
@@ -205,7 +205,7 @@ namespace SabreTools
{
Roms = new Dictionary<string, List<RomData>>(),
};
midMissing = RomManipulation.ParseDict(_currentMissingMerged, 0, 0, midMissing, _logger);
midMissing = RomManipulation.Parse(_currentMissingMerged, 0, 0, midMissing, _logger);
foreach (string key in unneeded.Keys)
{
if (midMissing.Roms.ContainsKey(key))
@@ -441,10 +441,10 @@ namespace SabreTools
Roms = have,
};
Output.WriteToDatFromDict(netNewData, "", _logger);
Output.WriteToDatFromDict(unneededData, "", _logger);
Output.WriteToDatFromDict(newMissingData, "", _logger);
Output.WriteToDatFromDict(haveData, "", _logger);
Output.WriteDatfile(netNewData, "", _logger);
Output.WriteDatfile(unneededData, "", _logger);
Output.WriteDatfile(newMissingData, "", _logger);
Output.WriteDatfile(haveData, "", _logger);
return true;
}
@@ -458,8 +458,8 @@ namespace SabreTools
{
Roms = new Dictionary<string, List<RomData>>(),
};
midHave = RomManipulation.ParseDict(_currentMissingMerged, 0, 0, midHave, _logger);
midHave = RomManipulation.ParseDict(_currentAllMerged, 0, 0, midHave, _logger);
midHave = RomManipulation.Parse(_currentMissingMerged, 0, 0, midHave, _logger);
midHave = RomManipulation.Parse(_currentAllMerged, 0, 0, midHave, _logger);
Dictionary<string, List<RomData>> have = new Dictionary<string, List<RomData>>();
foreach (string key in midHave.Roms.Keys)
{
@@ -517,7 +517,7 @@ namespace SabreTools
MergeRoms = true,
Roms = have,
};
Output.WriteToDatFromDict(haveData, "", _logger);
Output.WriteDatfile(haveData, "", _logger);
return true;
}
@@ -531,8 +531,8 @@ namespace SabreTools
{
Roms = new Dictionary<string, List<RomData>>(),
};
midHave = RomManipulation.ParseDict(_currentMissingMerged, 0, 0, midHave, _logger);
midHave = RomManipulation.ParseDict(_currentNewMerged, 0, 0, midHave, _logger);
midHave = RomManipulation.Parse(_currentMissingMerged, 0, 0, midHave, _logger);
midHave = RomManipulation.Parse(_currentNewMerged, 0, 0, midHave, _logger);
Dictionary<string, List<RomData>> have = new Dictionary<string, List<RomData>>();
foreach (string key in midHave.Roms.Keys)
{
@@ -590,7 +590,7 @@ namespace SabreTools
MergeRoms = true,
Roms = have,
};
Output.WriteToDatFromDict(haveData, "", _logger);
Output.WriteDatfile(haveData, "", _logger);
return true;
}