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

Perform mass cleanup

Browse Source 
This is cleanup based on both new .NET functionality (in 6 and 7) as well as a ton of simplifications and things that were missed that were caught due to the cleanup.
This commit is contained in:
Matt Nadareski
2023-04-19 16:39:58 -04:00
parent fd5fd79b95
commit 728b5d6b27
95 changed files with 1353 additions and 1572 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
SabreTools.DatFiles/ItemDictionary.cs
View File

@@ -44,7 +44,7 @@ namespace SabreTools.DatFiles
/// <summary>
/// Lock for statistics calculation
/// </summary>
private readonly object statsLock = new object();
private readonly object statsLock = new();
/// <summary>
/// Logging object
@@ -981,7 +981,7 @@ namespace SabreTools.DatFiles
public void BucketBy(ItemKey bucketBy, DedupeType dedupeType, bool lower = true, bool norename = true)
{
// If we have a situation where there's no dictionary or no keys at all, we skip
if (items == null || items.Count == 0)
if (items == null || items.IsEmpty)
return;
// If the sorted type isn't the same, we want to sort the dictionary accordingly
@@ -1084,7 +1084,7 @@ namespace SabreTools.DatFiles
items.TryRemove(key, out _);
// If there are no non-blank items, remove
else if (items[key].Count(i => i != null && i.ItemType != ItemType.Blank) == 0)
else if (!items[key].Any(i => i != null && i.ItemType != ItemType.Blank))
items.TryRemove(key, out _);
}
}
@@ -1113,7 +1113,7 @@ namespace SabreTools.DatFiles
/// <returns>List of matched DatItem objects</returns>
public ConcurrentList<DatItem> GetDuplicates(DatItem datItem, bool sorted = false)
{
ConcurrentList<DatItem> output = new ConcurrentList<DatItem>();
ConcurrentList<DatItem> output = new();
// Check for an empty rom list first
if (TotalCount == 0)
@@ -1128,7 +1128,7 @@ namespace SabreTools.DatFiles
// Try to find duplicates
ConcurrentList<DatItem> roms = this[key];
ConcurrentList<DatItem> left = new ConcurrentList<DatItem>();
ConcurrentList<DatItem> left = new();
for (int i = 0; i < roms.Count; i++)
{
DatItem other = roms[i];