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

Simplify ProcessItemName use

Browse Source
This commit is contained in:
Matt Nadareski
2025-01-09 10:13:47 -05:00
parent b27d73da13
commit 62a7f28334
4 changed files with 25 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
SabreTools.DatFiles/DatFile.cs
View File

@@ -195,55 +195,17 @@ namespace SabreTools.DatFiles
/// </summary>
/// <param name="item">DatItem to update</param>
/// <param name="forceRemoveQuotes">True if the Quotes flag should be ignored, false otherwise</param>
/// <param name="forceRomName">True if the UseRomName should be always on (default), false otherwise</param>
protected void ProcessItemName(DatItem item, bool forceRemoveQuotes, bool forceRomName = true)
/// <param name="forceRomName">True if the UseRomName should be always on, false otherwise</param>
protected void ProcessItemName(DatItem item, Machine? machine, bool forceRemoveQuotes, bool forceRomName)
{
// Get the relevant processing values
bool quotes = forceRemoveQuotes ? false : Header.GetBoolFieldValue(DatHeader.QuotesKey) ?? false;
bool useRomName = forceRomName ? true : Header.GetBoolFieldValue(DatHeader.UseRomNameKey) ?? false;
// Get the machine
var machine = item.GetFieldValue<Machine>(DatItem.MachineKey);
if (machine == null)
return;
// Process the item name with common rules
ProcessItemNameImpl(item, machine, quotes, useRomName);
}
/// <summary>
/// Process an item and correctly set the item name
/// </summary>
/// <param name="item">DatItem to update</param>
/// <param name="forceRemoveQuotes">True if the Quotes flag should be ignored, false otherwise</param>
/// <param name="forceRomName">True if the UseRomName should be always on (default), false otherwise</param>
protected void ProcessItemNameDB(KeyValuePair<long, DatItem> item, bool forceRemoveQuotes, bool forceRomName = true)
{
// Get the relevant processing values
bool quotes = forceRemoveQuotes ? false : Header.GetBoolFieldValue(DatHeader.QuotesKey) ?? false;
bool useRomName = forceRomName ? true : Header.GetBoolFieldValue(DatHeader.UseRomNameKey) ?? false;
// Get machine for the item
var machine = ItemsDB.GetMachineForItem(item.Key);
if (machine.Value == null)
return;
// Process the item name with common rules
ProcessItemNameImpl(item.Value, machine.Value, quotes, useRomName);
}
/// <summary>
/// Process an item and correctly set the item name
/// </summary>
/// <param name="item">DatItem to update</param>
/// <param name="forceRemoveQuotes">True if the Quotes flag should be ignored, false otherwise</param>
/// <param name="forceRomName">True if the UseRomName should be always on (default), false otherwise</param>
private void ProcessItemNameImpl(DatItem item, Machine machine, bool quotes, bool useRomName)
{
// Get the name to update
string? name = (useRomName == true
? item.GetName()
: machine.GetStringFieldValue(Models.Metadata.Machine.NameKey)) ?? string.Empty;
: machine?.GetStringFieldValue(Models.Metadata.Machine.NameKey)) ?? string.Empty;
// Create the proper Prefix and Postfix
string pre = CreatePrefix(item, machine, quotes);
@@ -307,7 +269,7 @@ namespace SabreTools.DatFiles
name += addExtension;
if (useRomName && Header.GetBoolFieldValue(DatHeader.GameNameKey) == true)
name = Path.Combine(machine.GetStringFieldValue(Models.Metadata.Machine.NameKey) ?? string.Empty, name);
name = Path.Combine(machine?.GetStringFieldValue(Models.Metadata.Machine.NameKey) ?? string.Empty, name);
// Now assign back the formatted name
name = $"{pre}{name}{post}";

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

@@ -170,8 +170,11 @@ namespace SabreTools.DatFiles.Formats
/// <param name="lastgame">The name of the last game to be output</param>
private void WriteDatItem(StreamWriter sw, DatItem datItem, string? lastgame)
{
// Get the machine for the item
var machine = datItem.GetFieldValue<Machine>(DatItem.MachineKey);
// Process the item name
ProcessItemName(datItem, false, forceRomName: false);
ProcessItemName(datItem, machine, false, forceRomName: false);
// Romba mode automatically uses item name
if (Header.GetFieldValue<DepotInformation?>(DatHeader.OutputDepotKey)?.IsActive == true || Header.GetBoolFieldValue(DatHeader.UseRomNameKey) == true)
@@ -194,7 +197,7 @@ namespace SabreTools.DatFiles.Formats
var machine = ItemsDB.GetMachineForItem(datItem.Key);
// Process the item name
ProcessItemNameDB(datItem, false, forceRomName: false);
ProcessItemName(datItem.Value, machine.Value, forceRemoveQuotes: false, forceRomName: false);
// Romba mode automatically uses item name
if (Header.GetFieldValue<DepotInformation?>(DatHeader.OutputDepotKey)?.IsActive == true

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

@@ -592,8 +592,11 @@ namespace SabreTools.DatFiles.Formats
/// <param name="datItem">DatItem object to be output</param>
private void WriteDatItem(JsonTextWriter jtw, DatItem datItem)
{
// Get the machine for the item
var machine = datItem.GetFieldValue<Machine>(DatItem.MachineKey);
// Pre-process the item name
ProcessItemName(datItem, true);
ProcessItemName(datItem, machine, forceRemoveQuotes: true, forceRomName: false);
// Build the state
jtw.WriteStartObject();
@@ -616,8 +619,11 @@ namespace SabreTools.DatFiles.Formats
/// <param name="datItem">DatItem object to be output</param>
private void WriteDatItemDB(JsonTextWriter jtw, KeyValuePair<long, DatItem> datItem)
{
// Get the machine for the item
var machine = ItemsDB.GetMachineForItem(datItem.Key);
// Pre-process the item name
ProcessItemNameDB(datItem, true);
ProcessItemName(datItem.Value, machine.Value, forceRemoveQuotes: true, forceRomName: false);
// Build the state
jtw.WriteStartObject();

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

@@ -421,8 +421,11 @@ namespace SabreTools.DatFiles.Formats
/// <param name="datItem">DatItem object to be output</param>
private void WriteDatItem(XmlTextWriter xtw, DatItem datItem)
{
// Get the machine for the item
var machine = datItem.GetFieldValue<Machine>(DatItem.MachineKey);
// Pre-process the item name
ProcessItemName(datItem, true);
ProcessItemName(datItem, machine, forceRemoveQuotes: true, forceRomName: false);
// Write the DatItem
XmlSerializer xs = new(typeof(DatItem));
@@ -440,8 +443,11 @@ namespace SabreTools.DatFiles.Formats
/// <param name="datItem">DatItem object to be output</param>
private void WriteDatItemDB(XmlTextWriter xtw, KeyValuePair<long, DatItem> datItem)
{
// Get the machine for the item
var machine = ItemsDB.GetMachineForItem(datItem.Key);
// Pre-process the item name
ProcessItemNameDB(datItem, true);
ProcessItemName(datItem.Value, machine.Value, forceRemoveQuotes: true, forceRomName: false);
// Write the DatItem
XmlSerializer xs = new(typeof(DatItem));