SabreTools/SabreTools.Serialization
1
0
Fork 0
mirror of https://github.com/SabreTools/SabreTools.Serialization.git synced 2026-07-08 18:06:41 +00:00
Code Issues 56 Packages Projects Releases 20 Wiki Activity

Reduce use of SetName

Browse Source
This commit is contained in:
Matt Nadareski
2026-04-02 13:35:11 -04:00
parent c74942362c
commit 7df083c0b2
17 changed files with 180 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
SabreTools.Metadata.DatFiles/DatFile.Filtering.cs
View File

@@ -540,7 +540,7 @@ namespace SabreTools.Metadata.DatFiles
if (itemName.StartsWith("Default"))
itemName = itemName.Substring("Default".Length + 1);
machine.SetName(itemName);
machine.Name = itemName;
datItem.SetName(Path.GetFileName(datItem.GetName()));
}
@@ -618,7 +618,7 @@ namespace SabreTools.Metadata.DatFiles
if (itemName.StartsWith("Default"))
itemName = itemName.Substring("Default".Length + 1);
machine.Value.SetName(itemName);
machine.Value.Name = itemName;
datItem.Value.SetName(Path.GetFileName(datItem.Value.GetName()));
}
@@ -655,7 +655,7 @@ namespace SabreTools.Metadata.DatFiles
string? machineDesc = machine.Description;
if (machineName is not null && Regex.IsMatch(machineName, SceneNamePattern))
item.GetMachine()!.SetName(Regex.Replace(machineName, SceneNamePattern, "$2"));
item.GetMachine()!.Name = Regex.Replace(machineName, SceneNamePattern, "$2");
if (machineDesc is not null && Regex.IsMatch(machineDesc, SceneNamePattern))
item.GetMachine()!.Description = Regex.Replace(machineDesc, SceneNamePattern, "$2");
@@ -693,7 +693,7 @@ namespace SabreTools.Metadata.DatFiles
string? machineDesc = machine.Value.Description;
if (machineName is not null && Regex.IsMatch(machineName, SceneNamePattern))
machine.Value.SetName(Regex.Replace(machineName, SceneNamePattern, "$2"));
machine.Value.Name = Regex.Replace(machineName, SceneNamePattern, "$2");
if (machineDesc is not null && Regex.IsMatch(machineDesc, SceneNamePattern))
machine.Value.Description = Regex.Replace(machineDesc, SceneNamePattern, "$2");
@@ -739,7 +739,7 @@ namespace SabreTools.Metadata.DatFiles
// Update machine name
if (machineName is not null && mapping.TryGetValue(machineName, out string? mappedMachineName))
machine.SetName(mappedMachineName);
machine.Name = mappedMachineName;
// Update cloneof
if (cloneOf is not null && mapping.TryGetValue(cloneOf, out string? mappedCloneOf))
@@ -780,7 +780,7 @@ namespace SabreTools.Metadata.DatFiles
// Update machine name
if (machineName is not null && mapping.TryGetValue(machineName, out string? mappedMachineName))
machine.Value.SetName(mappedMachineName);
machine.Value.Name = mappedMachineName;
// Update cloneof
if (cloneOf is not null && mapping.TryGetValue(cloneOf, out string? mappedCloneOf))

14
SabreTools.Metadata.DatFiles/DatFile.Splitting.cs
View File

@@ -283,7 +283,7 @@ namespace SabreTools.Metadata.DatFiles
if (parentItems.Count == 0)
{
copyFrom = new Rom();
copyFrom.GetMachine()!.SetName(cloneOf);
copyFrom.GetMachine()!.Name = cloneOf;
copyFrom.GetMachine()!.Description = cloneOf;
}
else
@@ -350,7 +350,7 @@ namespace SabreTools.Metadata.DatFiles
.Contains(mergeTag))
{
if (subfolder)
rom.SetName($"{rom.GetMachine()!.Name}\\{rom.Name}");
rom.Name = $"{rom.GetMachine()!.Name}\\{rom.Name}";
rom.CopyMachineInformation(copyFrom);
AddItem(rom, statsOnly: false);
@@ -360,7 +360,7 @@ namespace SabreTools.Metadata.DatFiles
else if (!GetItemsForBucket(cloneOf).Exists(i => i.Equals(item)) || skipDedup)
{
if (subfolder)
rom.SetName($"{item.GetMachine()!.Name}\\{rom.Name}");
rom.Name = $"{item.GetMachine()!.Name}\\{rom.Name}";
rom.CopyMachineInformation(copyFrom);
AddItem(rom, statsOnly: false);
@@ -486,7 +486,7 @@ namespace SabreTools.Metadata.DatFiles
.Contains(mergeTag))
{
if (subfolder)
rom.SetName($"{machineName}\\{rom.Name}");
rom.Name = $"{machineName}\\{rom.Name}";
ItemsDB.RemapDatItemToMachine(item.Key, machineIndex: cloneOfMachine.Key);
ItemsDB.AddItem(item.Value, cloneOfMachine.Key, source.Key);
@@ -496,7 +496,7 @@ namespace SabreTools.Metadata.DatFiles
else if (!GetItemsForBucketDB(cloneOf).ContainsValue(item.Value) || skipDedup)
{
if (subfolder)
rom.SetName($"{machineName}\\{rom.Name}");
rom.Name = $"{machineName}\\{rom.Name}";
ItemsDB.RemapDatItemToMachine(item.Key, cloneOfMachine.Key);
ItemsDB.AddItem(item.Value, cloneOfMachine.Key, source.Key);
@@ -723,7 +723,7 @@ namespace SabreTools.Metadata.DatFiles
deviceReferences.Add(deviceReference);
var deviceRef = new DeviceRef();
deviceRef.SetName(deviceReference);
deviceRef.Name = deviceReference;
deviceRef.CopyMachineInformation(copyFrom);
Items.AddItem(deviceRef, statsOnly: false);
}
@@ -888,7 +888,7 @@ namespace SabreTools.Metadata.DatFiles
if (!deviceReferences.Contains(deviceReference))
{
var deviceRef = new DeviceRef();
deviceRef.SetName(deviceReference);
deviceRef.Name = deviceReference;
ItemsDB.AddItem(deviceRef, machine.Key, source.Key);
}
}

4
SabreTools.Metadata.DatFiles/DatFile.cs
View File

@@ -568,7 +568,7 @@ namespace SabreTools.Metadata.DatFiles
if (useRomName)
item.SetName(name);
else
machine?.SetName(name);
machine?.Name = name;
}
/// <summary>
@@ -689,7 +689,7 @@ namespace SabreTools.Metadata.DatFiles
return rom;
// If the Rom has "null" characteristics, ensure all fields
rom.SetName(rom.Name == "null" ? "-" : rom.Name);
rom.Name = rom.Name == "null" ? "-" : rom.Name;
rom.Write<string?>(Data.Models.Metadata.Rom.SizeKey, "0");
rom.Write<string?>(Data.Models.Metadata.Rom.CRC16Key,
rom.ReadString(Data.Models.Metadata.Rom.CRC16Key) == "null" ? HashType.CRC16.ZeroString : null);

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

@@ -602,7 +602,7 @@ namespace SabreTools.Metadata.DatFiles.Formats
{
// No game should start with a path separator
if (!string.IsNullOrEmpty(datItem.GetMachine()!.Name))
datItem.GetMachine()!.SetName(datItem.GetMachine()!.Name!.TrimStart(Path.DirectorySeparatorChar));
datItem.GetMachine()!.Name = datItem.GetMachine()!.Name!.TrimStart(Path.DirectorySeparatorChar);
// Build the state
jtw.WriteStartObject();

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

@@ -429,7 +429,7 @@ namespace SabreTools.Metadata.DatFiles.Formats
private static void WriteStartGame(XmlTextWriter xtw, DatItem datItem)
{
// No game should start with a path separator
datItem.GetMachine()!.SetName(datItem.GetMachine()!.Name?.TrimStart(Path.DirectorySeparatorChar) ?? string.Empty);
datItem.GetMachine()!.Name = datItem.GetMachine()!.Name?.TrimStart(Path.DirectorySeparatorChar) ?? string.Empty;
// Write the machine
xtw.WriteStartElement("directory");