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 equality code

Browse Source
This commit is contained in:
Matt Nadareski
2020-08-17 14:57:54 -07:00
parent af7633fea2
commit fafac31ea8
5 changed files with 175 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
SabreTools.Library/Filtering/Filter.cs
View File

@@ -821,23 +821,6 @@ namespace SabreTools.Library.Filtering
// Run internal splitting
ProcessSplitType(datFile, this.InternalSplit);
// We remove any blanks, if we aren't supposed to have any
if (!datFile.Header.KeepEmptyGames)
{
List<string> possiblyEmptyKeys = datFile.Items.Keys.ToList();
foreach (string key in possiblyEmptyKeys)
{
List<DatItem> items = datFile.Items[key];
if (items == null)
continue;
List<DatItem> newitems = items.Where(i => i.ItemType != ItemType.Blank).ToList();
datFile.Items.Remove(key);
datFile.Items.AddRange(key, newitems);
}
}
// Loop over every key in the dictionary
List<string> keys = datFile.Items.Keys.ToList();
foreach (string key in keys)
@@ -906,6 +889,26 @@ namespace SabreTools.Library.Filtering
// If we are removing fields, do that now
if (RemoveFields)
RemoveFieldsFromItems(datFile);
// We remove any blanks, if we aren't supposed to have any
if (!datFile.Header.KeepEmptyGames)
{
List<string> possiblyEmptyKeys = datFile.Items.Keys.ToList();
foreach (string key in possiblyEmptyKeys)
{
List<DatItem> items = datFile.Items[key];
if (items == null || items.Count == 0)
{
datFile.Items.Remove(key);
continue;
}
List<DatItem> newitems = items.Where(i => i.ItemType != ItemType.Blank).ToList();
datFile.Items.Remove(key);
datFile.Items.AddRange(key, newitems);
}
}
}
catch (Exception ex)
{