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

Unify ContainsWritable implementations

Browse Source
This commit is contained in:
Matt Nadareski
2025-01-09 10:16:39 -05:00
parent 62a7f28334
commit 0685085a85
5 changed files with 3 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
SabreTools.DatFiles.Test/DatFileTests.cs
View File

@@ -244,12 +244,6 @@ namespace SabreTools.DatFiles.Test
#endregion #endregion
#region ContainsWritableDB
// TODO: Write ContainsWritableDB tests
#endregion
#region ResolveNames #region ResolveNames
// TODO: Write ResolveNames tests // TODO: Write ResolveNames tests

22
SabreTools.DatFiles/DatFile.cs
View File

@@ -469,28 +469,6 @@ namespace SabreTools.DatFiles
return false; return false;
} }
/// <summary>
/// Get if a machine contains any writable items
/// </summary>
/// <param name="datItems">DatItems to check</param>
/// <returns>True if the machine contains at least one writable item, false otherwise</returns>
/// <remarks>Empty machines are kept with this</remarks>
protected bool ContainsWritableDB(Dictionary<long, DatItem>? datItems)
{
// Empty machines are considered writable
if (datItems == null || datItems.Count == 0)
return true;
foreach (var datItem in datItems)
{
ItemType itemType = datItem.Value.GetStringFieldValue(Models.Metadata.DatItem.TypeKey).AsEnumValue<ItemType>();
if (Array.Exists(SupportedTypes, t => t == itemType))
return true;
}
return false;
}
/// <summary> /// <summary>
/// Resolve name duplicates in an arbitrary set of DatItems based on the supplied information /// Resolve name duplicates in an arbitrary set of DatItems based on the supplied information
/// </summary> /// </summary>

2
SabreTools.DatFiles/Formats/Missfile.cs
View File

@@ -123,7 +123,7 @@ namespace SabreTools.DatFiles.Formats
{ {
// If this machine doesn't contain any writable items, skip // If this machine doesn't contain any writable items, skip
var itemsDict = ItemsDB.GetItemsForBucket(key, filter: true); var itemsDict = ItemsDB.GetItemsForBucket(key, filter: true);
if (itemsDict == null || !ContainsWritableDB(itemsDict)) if (itemsDict == null || !ContainsWritable([.. itemsDict.Values]))
continue; continue;
// Resolve the names in the block // Resolve the names in the block

2
SabreTools.DatFiles/Formats/SabreJSON.cs
View File

@@ -479,7 +479,7 @@ namespace SabreTools.DatFiles.Formats
{ {
// If this machine doesn't contain any writable items, skip // If this machine doesn't contain any writable items, skip
var itemsDict = ItemsDB.GetItemsForBucket(key, filter: true); var itemsDict = ItemsDB.GetItemsForBucket(key, filter: true);
if (itemsDict == null || !ContainsWritableDB(itemsDict)) if (itemsDict == null || !ContainsWritable([.. itemsDict.Values]))
continue; continue;
// Resolve the names in the block // Resolve the names in the block

2
SabreTools.DatFiles/Formats/SabreXML.cs
View File

@@ -308,7 +308,7 @@ namespace SabreTools.DatFiles.Formats
{ {
// If this machine doesn't contain any writable items, skip // If this machine doesn't contain any writable items, skip
var itemsDict = ItemsDB.GetItemsForBucket(key, filter: true); var itemsDict = ItemsDB.GetItemsForBucket(key, filter: true);
if (itemsDict == null || !ContainsWritableDB(itemsDict)) if (itemsDict == null || !ContainsWritable([.. itemsDict.Values]))
continue; continue;
// Resolve the names in the block // Resolve the names in the block