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

Move modifiers out of DatHeader

Browse Source
This commit is contained in:
Matt Nadareski
2025-01-29 22:51:30 -05:00
parent 5ee52d93b7
commit 14bb6fd87d
16 changed files with 345 additions and 318 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
SabreTools.DatFiles/DatFile.cs
View File

@@ -25,6 +25,13 @@ namespace SabreTools.DatFiles
[JsonProperty("header"), XmlElement("header")]
public DatHeader Header { get; private set; } = new DatHeader();
/// <summary>
/// Modifier values
/// </summary>
/// TODO: Make this private set
[JsonProperty("modifiers"), XmlElement("modifiers")]
public DatModifiers Modifiers { get; set; } = new DatModifiers();
/// <summary>
/// DatItems and related statistics
/// </summary>
@@ -73,6 +80,7 @@ namespace SabreTools.DatFiles
if (datFile != null)
{
Header = (DatHeader)datFile.Header.Clone();
Modifiers = (DatModifiers)datFile.Modifiers.Clone();
Items = datFile.Items;
ItemsDB = datFile.ItemsDB;
}
@@ -147,6 +155,15 @@ namespace SabreTools.DatFiles
Header = datHeader;
}
/// <summary>
/// Set the internal header
/// </summary>
/// <param name="datHeader">Replacement header to be used</param>
public void SetModifiers(DatModifiers datModifers)
{
Modifiers = (DatModifiers)datModifers.Clone();
}
/// <summary>
/// Remove any keys that have null or empty values
/// </summary>
@@ -431,18 +448,28 @@ namespace SabreTools.DatFiles
/// <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, false otherwise</param>
/// <remarks>
/// There are some unique interactions that can occur because of the large number of effective
/// inputs into this method.
/// - If both a replacement extension is set and the remove extension flag is enabled,
/// the replacement extension will be overridden by the remove extension flag.
/// - Extension addition, removal, and replacement are not done at all if the output
/// depot is specified. Only prefix and postfix logic is applied.
/// - Both methods of using the item name are overridden if the output depot is specified.
/// Instead, the name is always set based on the SHA-1 hash.
/// </remarks>
protected internal 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;
bool quotes = forceRemoveQuotes ? false : Modifiers.Quotes;
bool useRomName = forceRomName ? true : Modifiers.UseRomName;
// Create the full Prefix
string pre = Header.GetStringFieldValue(DatHeader.PrefixKey) + (quotes ? "\"" : string.Empty);
string pre = Modifiers.Prefix + (quotes ? "\"" : string.Empty);
pre = FormatPrefixPostfix(item, machine, pre);
// Create the full Postfix
string post = (quotes ? "\"" : string.Empty) + Header.GetStringFieldValue(DatHeader.PostfixKey);
string post = (quotes ? "\"" : string.Empty) + Modifiers.Postfix;
post = FormatPrefixPostfix(item, machine, post);
// Get the name to update
@@ -451,8 +478,7 @@ namespace SabreTools.DatFiles
: machine?.GetStringFieldValue(Models.Metadata.Machine.NameKey)) ?? string.Empty;
// If we're in Depot mode, take care of that instead
var outputDepot = Header.GetFieldValue<DepotInformation?>(DatHeader.OutputDepotKey);
if (outputDepot?.IsActive == true)
if (Modifiers.OutputDepot?.IsActive == true)
{
if (item is Disk disk)
{
@@ -460,7 +486,7 @@ namespace SabreTools.DatFiles
string? sha1 = disk.GetStringFieldValue(Models.Metadata.Disk.SHA1Key);
if (!string.IsNullOrEmpty(sha1))
{
name = Utilities.GetDepotPath(sha1, outputDepot.Depth)?.Replace('\\', '/');
name = Utilities.GetDepotPath(sha1, Modifiers.OutputDepot.Depth)?.Replace('\\', '/');
item.SetName($"{pre}{name}{post}");
}
}
@@ -470,7 +496,7 @@ namespace SabreTools.DatFiles
string? sha1 = file.SHA1;
if (!string.IsNullOrEmpty(sha1))
{
name = Utilities.GetDepotPath(sha1, outputDepot.Depth)?.Replace('\\', '/');
name = Utilities.GetDepotPath(sha1, Modifiers.OutputDepot.Depth)?.Replace('\\', '/');
item.SetName($"{pre}{name}{post}");
}
}
@@ -480,7 +506,7 @@ namespace SabreTools.DatFiles
string? sha1 = media.GetStringFieldValue(Models.Metadata.Media.SHA1Key);
if (!string.IsNullOrEmpty(sha1))
{
name = Utilities.GetDepotPath(sha1, outputDepot.Depth)?.Replace('\\', '/');
name = Utilities.GetDepotPath(sha1, Modifiers.OutputDepot.Depth)?.Replace('\\', '/');
item.SetName($"{pre}{name}{post}");
}
}
@@ -490,7 +516,7 @@ namespace SabreTools.DatFiles
string? sha1 = rom.GetStringFieldValue(Models.Metadata.Rom.SHA1Key);
if (!string.IsNullOrEmpty(sha1))
{
name = Utilities.GetDepotPath(sha1, outputDepot.Depth)?.Replace('\\', '/');
name = Utilities.GetDepotPath(sha1, Modifiers.OutputDepot.Depth)?.Replace('\\', '/');
item.SetName($"{pre}{name}{post}");
}
}
@@ -498,34 +524,31 @@ namespace SabreTools.DatFiles
return;
}
string? replaceExtension = Header.GetStringFieldValue(DatHeader.ReplaceExtensionKey);
bool? removeExtension = Header.GetBoolFieldValue(DatHeader.RemoveExtensionKey);
if (!string.IsNullOrEmpty(replaceExtension) || removeExtension == true)
if (!string.IsNullOrEmpty(Modifiers.ReplaceExtension) || Modifiers.RemoveExtension)
{
if (removeExtension == true)
Header.SetFieldValue<string?>(DatHeader.ReplaceExtensionKey, string.Empty);
if (Modifiers.RemoveExtension)
Modifiers.ReplaceExtension = string.Empty;
string? dir = Path.GetDirectoryName(name);
if (dir != null)
{
dir = dir.TrimStart(Path.DirectorySeparatorChar);
name = Path.Combine(dir, Path.GetFileNameWithoutExtension(name) + replaceExtension);
name = Path.Combine(dir, Path.GetFileNameWithoutExtension(name) + Modifiers.ReplaceExtension);
}
}
string? addExtension = Header.GetStringFieldValue(DatHeader.AddExtensionKey);
if (!string.IsNullOrEmpty(addExtension))
name += addExtension;
if (!string.IsNullOrEmpty(Modifiers.AddExtension))
name += Modifiers.AddExtension;
if (useRomName && Header.GetBoolFieldValue(DatHeader.GameNameKey) == true)
if (useRomName && Modifiers.GameName)
name = Path.Combine(machine?.GetStringFieldValue(Models.Metadata.Machine.NameKey) ?? string.Empty, name);
// Now assign back the formatted name
name = $"{pre}{name}{post}";
if (useRomName)
item.SetName(name);
else if (machine != null)
machine.SetFieldValue<string?>(Models.Metadata.Machine.NameKey, name);
else
machine?.SetFieldValue<string?>(Models.Metadata.Machine.NameKey, name);
}
/// <summary>

20
SabreTools.DatFiles/DatFileTool.cs
View File

@@ -79,11 +79,13 @@ namespace SabreTools.DatFiles
/// Create a new DatFile from an existing DatHeader
/// </summary>
/// <param name="datHeader">DatHeader to get the values from</param>
public static DatFile CreateDatFile(DatHeader datHeader)
/// <param name="datModifiers">DatModifiers to get the values from</param>
public static DatFile CreateDatFile(DatHeader datHeader, DatModifiers datModifiers)
{
DatFormat format = datHeader.GetFieldValue<DatFormat>(DatHeader.DatFormatKey);
DatFile datFile = CreateDatFile(format);
datFile.SetHeader(datHeader);
datFile.SetModifiers(datModifiers);
return datFile;
}
@@ -796,7 +798,7 @@ namespace SabreTools.DatFiles
for (int j = 0; j < datHeaders.Count; j++)
#endif
{
DatFile diffData = CreateDatFile(datHeaders[j]);
DatFile diffData = CreateDatFile(datHeaders[j], new DatModifiers());
diffData.ResetDictionary();
FillWithSourceIndex(datFile, diffData, j);
FillWithSourceIndexDB(datFile, diffData, j);
@@ -845,7 +847,7 @@ namespace SabreTools.DatFiles
datFile.Header.SetFieldValue<string?>(Models.Metadata.Header.DescriptionKey, "datFile.All DATs");
string post = " (Duplicates)";
DatFile dupeData = CreateDatFile(datFile.Header);
DatFile dupeData = CreateDatFile(datFile.Header, datFile.Modifiers);
dupeData.Header.SetFieldValue<string?>(DatHeader.FileNameKey, dupeData.Header.GetStringFieldValue(DatHeader.FileNameKey) + post);
dupeData.Header.SetFieldValue<string?>(Models.Metadata.Header.NameKey, dupeData.Header.GetStringFieldValue(Models.Metadata.Header.NameKey) + post);
dupeData.Header.SetFieldValue<string?>(Models.Metadata.Header.DescriptionKey, dupeData.Header.GetStringFieldValue(Models.Metadata.Header.DescriptionKey) + post);
@@ -923,7 +925,7 @@ namespace SabreTools.DatFiles
datFile.Header.SetFieldValue<string?>(Models.Metadata.Header.DescriptionKey, "datFile.All DATs");
string post = " (Duplicates)";
DatFile dupeData = CreateDatFile(datFile.Header);
DatFile dupeData = CreateDatFile(datFile.Header, datFile.Modifiers);
dupeData.Header.SetFieldValue<string?>(DatHeader.FileNameKey, dupeData.Header.GetStringFieldValue(DatHeader.FileNameKey) + post);
dupeData.Header.SetFieldValue<string?>(Models.Metadata.Header.NameKey, dupeData.Header.GetStringFieldValue(Models.Metadata.Header.NameKey) + post);
dupeData.Header.SetFieldValue<string?>(Models.Metadata.Header.DescriptionKey, dupeData.Header.GetStringFieldValue(Models.Metadata.Header.DescriptionKey) + post);
@@ -1059,7 +1061,7 @@ namespace SabreTools.DatFiles
#endif
{
string innerpost = $" ({j} - {inputs[j].GetNormalizedFileName(true)} Only)";
DatFile diffData = CreateDatFile(datFile.Header);
DatFile diffData = CreateDatFile(datFile.Header, datFile.Modifiers);
diffData.Header.SetFieldValue<string?>(DatHeader.FileNameKey, diffData.Header.GetStringFieldValue(DatHeader.FileNameKey) + innerpost);
diffData.Header.SetFieldValue<string?>(Models.Metadata.Header.NameKey, diffData.Header.GetStringFieldValue(Models.Metadata.Header.NameKey) + innerpost);
diffData.Header.SetFieldValue<string?>(Models.Metadata.Header.DescriptionKey, diffData.Header.GetStringFieldValue(Models.Metadata.Header.DescriptionKey) + innerpost);
@@ -1152,7 +1154,7 @@ namespace SabreTools.DatFiles
#endif
{
string innerpost = $" ({j} - {inputs[j].GetNormalizedFileName(true)} Only)";
DatFile diffData = CreateDatFile(datFile.Header);
DatFile diffData = CreateDatFile(datFile.Header, datFile.Modifiers);
diffData.Header.SetFieldValue<string?>(DatHeader.FileNameKey, diffData.Header.GetStringFieldValue(DatHeader.FileNameKey) + innerpost);
diffData.Header.SetFieldValue<string?>(Models.Metadata.Header.NameKey, diffData.Header.GetStringFieldValue(Models.Metadata.Header.NameKey) + innerpost);
diffData.Header.SetFieldValue<string?>(Models.Metadata.Header.DescriptionKey, diffData.Header.GetStringFieldValue(Models.Metadata.Header.DescriptionKey) + innerpost);
@@ -1276,7 +1278,7 @@ namespace SabreTools.DatFiles
datFile.Header.SetFieldValue<string?>(Models.Metadata.Header.DescriptionKey, "All DATs");
string post = " (No Duplicates)";
DatFile outerDiffData = CreateDatFile(datFile.Header);
DatFile outerDiffData = CreateDatFile(datFile.Header, datFile.Modifiers);
outerDiffData.Header.SetFieldValue<string?>(DatHeader.FileNameKey, outerDiffData.Header.GetStringFieldValue(DatHeader.FileNameKey) + post);
outerDiffData.Header.SetFieldValue<string?>(Models.Metadata.Header.NameKey, outerDiffData.Header.GetStringFieldValue(Models.Metadata.Header.NameKey) + post);
outerDiffData.Header.SetFieldValue<string?>(Models.Metadata.Header.DescriptionKey, outerDiffData.Header.GetStringFieldValue(Models.Metadata.Header.DescriptionKey) + post);
@@ -1352,7 +1354,7 @@ namespace SabreTools.DatFiles
datFile.Header.SetFieldValue<string?>(Models.Metadata.Header.DescriptionKey, "All DATs");
string post = " (No Duplicates)";
DatFile outerDiffData = CreateDatFile(datFile.Header);
DatFile outerDiffData = CreateDatFile(datFile.Header, datFile.Modifiers);
outerDiffData.Header.SetFieldValue<string?>(DatHeader.FileNameKey, outerDiffData.Header.GetStringFieldValue(DatHeader.FileNameKey) + post);
outerDiffData.Header.SetFieldValue<string?>(Models.Metadata.Header.NameKey, outerDiffData.Header.GetStringFieldValue(Models.Metadata.Header.NameKey) + post);
outerDiffData.Header.SetFieldValue<string?>(Models.Metadata.Header.DescriptionKey, outerDiffData.Header.GetStringFieldValue(Models.Metadata.Header.DescriptionKey) + post);
@@ -1483,7 +1485,7 @@ namespace SabreTools.DatFiles
{
var input = inputs[i];
_staticLogger.User($"Adding DAT: {input.CurrentPath}");
datFiles[i] = CreateDatFile(datFile.Header.CloneFiltering());
datFiles[i] = CreateDatFile(datFile.Header.CloneFiltering(), datFile.Modifiers);
Parser.ParseInto(datFiles[i], input, i, keep: true);
#if NET40_OR_GREATER || NETCOREAPP
});

99
SabreTools.DatFiles/DatHeader.cs
View File

@@ -15,11 +15,6 @@ namespace SabreTools.DatFiles
{
#region Constants
/// <summary>
/// Add a new extension to all items
/// </summary>
public const string AddExtensionKey = "ADDEXTENSION";
/// <summary>
/// Read or write format
/// </summary>
@@ -30,51 +25,6 @@ namespace SabreTools.DatFiles
/// </summary>
public const string FileNameKey = "FILENAME";
/// <summary>
/// Output the machine name
/// </summary>
public const string GameNameKey = "GAMENAME";
/// <summary>
/// Input depot information
/// </summary>
public const string InputDepotKey = "INPUTDEPOT";
/// <summary>
/// Output depot information
/// </summary>
public const string OutputDepotKey = "OUTPUTDEPOT";
/// <summary>
/// Text to append to all outputted lines
/// </summary>
public const string PostfixKey = "POSTFIX";
/// <summary>
/// Text to prepend to all outputted lines
/// </summary>
public const string PrefixKey = "PREFIX";
/// <summary>
/// Wrap quotes around the entire line, sans prefix and postfix
/// </summary>
public const string QuotesKey = "QUOTES";
/// <summary>
/// Remove all item extensions
/// </summary>
public const string RemoveExtensionKey = "REMOVEEXTENSION";
/// <summary>
/// Replace all item extensions
/// </summary>
public const string ReplaceExtensionKey = "REPLACEEXTENSION";
/// <summary>
/// Output the item name
/// </summary>
public const string UseRomNameKey = "USEROMNAME";
#endregion
#region Fields
@@ -220,28 +170,8 @@ namespace SabreTools.DatFiles
public DatHeader CloneFiltering()
{
var header = new DatHeader();
header.SetFieldValue<string?>(DatHeader.AddExtensionKey,
GetStringFieldValue(DatHeader.AddExtensionKey));
header.SetFieldValue<DatFormat>(DatHeader.DatFormatKey,
GetFieldValue<DatFormat>(DatHeader.DatFormatKey));
header.SetFieldValue<bool?>(DatHeader.GameNameKey,
GetBoolFieldValue(DatHeader.GameNameKey));
header.SetFieldValue<DepotInformation?>(DatHeader.InputDepotKey,
GetFieldValue<DepotInformation?>(DatHeader.InputDepotKey)?.Clone() as DepotInformation);
header.SetFieldValue<DepotInformation?>(DatHeader.OutputDepotKey,
GetFieldValue<DepotInformation?>(DatHeader.OutputDepotKey)?.Clone() as DepotInformation);
header.SetFieldValue<string?>(DatHeader.PostfixKey,
GetStringFieldValue(DatHeader.PostfixKey));
header.SetFieldValue<string?>(DatHeader.PrefixKey,
GetStringFieldValue(DatHeader.PrefixKey));
header.SetFieldValue<bool?>(DatHeader.RemoveExtensionKey,
GetBoolFieldValue(DatHeader.RemoveExtensionKey));
header.SetFieldValue<string?>(DatHeader.ReplaceExtensionKey,
GetStringFieldValue(DatHeader.ReplaceExtensionKey));
header.SetFieldValue<bool?>(DatHeader.QuotesKey,
GetBoolFieldValue(DatHeader.QuotesKey));
header.SetFieldValue<bool?>(DatHeader.UseRomNameKey,
GetBoolFieldValue(DatHeader.UseRomNameKey));
return header;
}
@@ -356,35 +286,6 @@ namespace SabreTools.DatFiles
if (datHeader.GetFieldValue<DatFormat>(DatHeader.DatFormatKey) != 0x00)
SetFieldValue<DatFormat>(DatHeader.DatFormatKey,
datHeader.GetFieldValue<DatFormat>(DatHeader.DatFormatKey));
if (!string.IsNullOrEmpty(datHeader.GetStringFieldValue(DatHeader.PrefixKey)))
SetFieldValue<string?>(DatHeader.PrefixKey,
datHeader.GetStringFieldValue(DatHeader.PrefixKey));
if (!string.IsNullOrEmpty(datHeader.GetStringFieldValue(DatHeader.PostfixKey)))
SetFieldValue<string?>(DatHeader.PostfixKey,
datHeader.GetStringFieldValue(DatHeader.PostfixKey));
if (!string.IsNullOrEmpty(datHeader.GetStringFieldValue(DatHeader.AddExtensionKey)))
SetFieldValue<string?>(DatHeader.AddExtensionKey,
datHeader.GetStringFieldValue(DatHeader.AddExtensionKey));
if (!string.IsNullOrEmpty(datHeader.GetStringFieldValue(DatHeader.ReplaceExtensionKey)))
SetFieldValue<string?>(DatHeader.ReplaceExtensionKey,
datHeader.GetStringFieldValue(DatHeader.ReplaceExtensionKey));
SetFieldValue<DepotInformation?>(DatHeader.InputDepotKey,
datHeader.GetFieldValue<DepotInformation?>(DatHeader.InputDepotKey)?.Clone() as DepotInformation);
SetFieldValue<DepotInformation?>(DatHeader.OutputDepotKey,
datHeader.GetFieldValue<DepotInformation?>(DatHeader.OutputDepotKey)?.Clone() as DepotInformation);
SetFieldValue<bool?>(DatHeader.GameNameKey,
datHeader.GetBoolFieldValue(DatHeader.GameNameKey));
SetFieldValue<bool?>(DatHeader.QuotesKey,
datHeader.GetBoolFieldValue(DatHeader.QuotesKey));
SetFieldValue<bool?>(DatHeader.RemoveExtensionKey,
datHeader.GetBoolFieldValue(DatHeader.RemoveExtensionKey));
SetFieldValue<bool?>(DatHeader.UseRomNameKey,
datHeader.GetBoolFieldValue(DatHeader.UseRomNameKey));
}
#endregion

88
SabreTools.DatFiles/DatModifiers.cs Normal file
View File

@@ -0,0 +1,88 @@
using System;
namespace SabreTools.DatFiles
{
/// <summary>
/// Represents various modifiers that can be applied to a DAT
/// </summary>
public sealed class DatModifiers : ICloneable
{
#region Fields
/// <summary>
/// Text to prepend to all outputted lines
/// </summary>
public string? Prefix { get; set; } = null;
/// <summary>
/// Text to append to all outputted lines
/// </summary>
public string? Postfix { get; set; } = null;
/// <summary>
/// Add a new extension to all items
/// </summary>
public string? AddExtension { get; set; } = null;
/// <summary>
/// Remove all item extensions
/// </summary>
public bool RemoveExtension { get; set; } = false;
/// <summary>
/// Replace all item extensions
/// </summary>
public string? ReplaceExtension { get; set; } = null;
/// <summary>
/// Output the machine name before the item name
/// </summary>
public bool GameName { get; set; } = false;
/// <summary>
/// Wrap quotes around the entire line, sans prefix and postfix
/// </summary>
public bool Quotes { get; set; } = false;
/// <summary>
/// Use the item name instead of machine name on output
/// </summary>
public bool UseRomName { get; set; } = false;
/// <summary>
/// Input depot information
/// </summary>
public DepotInformation? InputDepot { get; set; } = null;
/// <summary>
/// Output depot information
/// </summary>
public DepotInformation? OutputDepot { get; set; } = null;
#endregion
#region Cloning Methods
/// <summary>
/// Clone the current modifiers
/// </summary>
public object Clone()
{
return new DatModifiers
{
Prefix = this.Prefix,
Postfix = this.Postfix,
AddExtension = this.AddExtension,
RemoveExtension = this.RemoveExtension,
ReplaceExtension = this.ReplaceExtension,
GameName = this.GameName,
Quotes = this.Quotes,
UseRomName = this.UseRomName,
InputDepot = (DepotInformation?)this.InputDepot?.Clone(),
OutputDepot = (DepotInformation?)this.OutputDepot?.Clone(),
};
}
#endregion
}
}

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

@@ -77,7 +77,7 @@ namespace SabreTools.DatFiles.Formats
datItem = ProcessNullifiedItem(datItem);
// Write out the item if we're using machine names or we're not ignoring
if (!Header.GetBoolFieldValue(DatHeader.UseRomNameKey) == true || !ShouldIgnore(datItem, ignoreblanks))
if (!Modifiers.UseRomName || !ShouldIgnore(datItem, ignoreblanks))
WriteDatItem(sw, datItem, lastgame);
// Set the new data to compare against
@@ -138,11 +138,8 @@ namespace SabreTools.DatFiles.Formats
var machine = ItemsDB.GetMachineForItem(datItem.Key);
// Write out the item if we're using machine names or we're not ignoring
if (!Header.GetBoolFieldValue(DatHeader.UseRomNameKey) == true
|| !ShouldIgnore(datItem.Value, ignoreblanks))
{
if (!Modifiers.UseRomName || !ShouldIgnore(datItem.Value, ignoreblanks))
WriteDatItemDB(sw, datItem, lastgame);
}
// Set the new data to compare against
lastgame = machine.Value!.GetStringFieldValue(Models.Metadata.Machine.NameKey);
@@ -177,9 +174,9 @@ namespace SabreTools.DatFiles.Formats
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)
if (Modifiers.OutputDepot?.IsActive == true || Modifiers.UseRomName)
sw.Write($"{datItem.GetName() ?? string.Empty}\n");
else if (!Header.GetBoolFieldValue(DatHeader.UseRomNameKey) == true && datItem.GetFieldValue<Machine>(DatItem.MachineKey)!.GetStringFieldValue(Models.Metadata.Machine.NameKey) != lastgame)
else if (!Modifiers.UseRomName && datItem.GetFieldValue<Machine>(DatItem.MachineKey)!.GetStringFieldValue(Models.Metadata.Machine.NameKey) != lastgame)
sw.Write($"{datItem.GetFieldValue<Machine>(DatItem.MachineKey)!.GetStringFieldValue(Models.Metadata.Machine.NameKey) ?? string.Empty}\n");
sw.Flush();
@@ -200,12 +197,11 @@ namespace SabreTools.DatFiles.Formats
ProcessItemName(datItem.Value, machine.Value, forceRemoveQuotes: false, forceRomName: false);
// Romba mode automatically uses item name
if (Header.GetFieldValue<DepotInformation?>(DatHeader.OutputDepotKey)?.IsActive == true
|| Header.GetBoolFieldValue(DatHeader.UseRomNameKey) == true)
if (Modifiers.OutputDepot?.IsActive == true || Modifiers.UseRomName)
{
sw.Write($"{datItem.Value.GetName() ?? string.Empty}\n");
}
else if (!Header.GetBoolFieldValue(DatHeader.UseRomNameKey) == true
else if (!Modifiers.UseRomName
&& machine.Value!.GetStringFieldValue(Models.Metadata.Machine.NameKey) != lastgame)
{
sw.Write($"{machine.Value!.GetStringFieldValue(Models.Metadata.Machine.NameKey) ?? string.Empty}\n");