Move some static functionality linked with TreatAsFile

This commit is contained in:
Matt Nadareski
2025-01-05 22:16:44 -05:00
parent c67fe8a4d5
commit 5d25a09785
11 changed files with 508 additions and 499 deletions

View File

@@ -577,7 +577,7 @@ namespace SabreTools.DatTools
foreach (var key in datFile.Items.Keys)
#endif
{
List<DatItem> items = DatItem.Merge(datFile.Items[key]);
List<DatItem> items = DatItemTool.Merge(datFile.Items[key]);
// If the rom list is empty or null, just skip it
if (items == null || items.Count == 0)
@@ -802,7 +802,7 @@ namespace SabreTools.DatTools
foreach (var key in datFile.Items.Keys)
#endif
{
List<DatItem> items = DatItem.Merge(datFile.Items[key]);
List<DatItem> items = DatItemTool.Merge(datFile.Items[key]);
// If the rom list is empty or null, just skip it
if (items == null || items.Count == 0)
@@ -1012,7 +1012,7 @@ namespace SabreTools.DatTools
foreach (var key in datFile.Items.Keys)
#endif
{
List<DatItem> items = DatItem.Merge(datFile.Items[key]);
List<DatItem> items = DatItemTool.Merge(datFile.Items[key]);
// If the rom list is empty or null, just skip it
if (items == null || items.Count == 0)
@@ -1326,7 +1326,7 @@ namespace SabreTools.DatTools
foreach (var key in datFile.Items.Keys)
#endif
{
List<DatItem> items = DatItem.Merge(datFile.Items[key]);
List<DatItem> items = DatItemTool.Merge(datFile.Items[key]);
// If the rom list is empty or null, just skip it
if (items == null || items.Count == 0)

View File

@@ -263,7 +263,7 @@ namespace SabreTools.DatTools
foreach (var baseFile in extracted)
#endif
{
DatItem? datItem = DatItem.Create(baseFile);
DatItem? datItem = DatItemTool.CreateDatItem(baseFile);
if (datItem == null)
#if NET40_OR_GREATER || NETCOREAPP
return;
@@ -407,7 +407,7 @@ namespace SabreTools.DatTools
logger.Verbose($"'{Path.GetFileName(item)}' treated like a file");
var header = datFile.Header.GetStringFieldValue(Models.Metadata.Header.HeaderKey);
BaseFile? baseFile = FileTypeTool.GetInfo(item, header, _hashes);
DatItem? datItem = DatItem.Create(baseFile, asFile);
DatItem? datItem = DatItemTool.CreateDatItem(baseFile, asFile);
if (datItem != null)
ProcessFileHelper(datFile, item, datItem, basePath, string.Empty);
}

View File

@@ -353,7 +353,7 @@ namespace SabreTools.DatTools
{
foreach (BaseFile entry in entries)
{
DatItem? internalDatItem = DatItem.Create(entry);
DatItem? internalDatItem = DatItemTool.CreateDatItem(entry);
if (internalDatItem == null)
continue;

View File

@@ -904,7 +904,7 @@ namespace SabreTools.DatTools
foreach (var key in datFile.Items.Keys)
#endif
{
List<DatItem> items = DatItem.Merge(datFile.Items[key]);
List<DatItem> items = DatItemTool.Merge(datFile.Items[key]);
// If the rom list is empty or null, just skip it
if (items == null || items.Count == 0)