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

Remove unnecessary logging and params

Browse Source
This commit is contained in:
Matt Nadareski
2025-01-09 09:21:16 -05:00
parent 2277d979bc
commit 1fc979c42a
1 changed files with 31 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
SabreTools.DatFiles/DatFile.cs
View File

@@ -537,13 +537,8 @@ namespace SabreTools.DatFiles
if (item is not Rom rom) if (item is not Rom rom)
return item; return item;
// Get machine for the item
var machine = item.GetFieldValue<Machine>(DatItem.MachineKey);
if (machine == null)
return item;
// Process the possibly nullified item // Process the possibly nullified item
return ProcessNullifiedItemImpl(rom, machine); return ProcessNullifiedItemImpl(rom);
} }
/// <summary> /// <summary>
@@ -557,51 +552,46 @@ namespace SabreTools.DatFiles
if (item.Value is not Rom rom) if (item.Value is not Rom rom)
return item; return item;
// Get machine for the item
var machine = ItemsDB.GetMachineForItem(item.Key);
if (machine.Value == null)
return item;
// Process the possibly nullified item // Process the possibly nullified item
return new KeyValuePair<long, DatItem>(item.Key, ProcessNullifiedItemImpl(rom, machine.Value)); return new KeyValuePair<long, DatItem>(item.Key, ProcessNullifiedItemImpl(rom));
} }
/// <summary> /// <summary>
/// Process any DatItems that are "null", usually created from directory population /// Process any DatItems that are "null", usually created from directory population
/// </summary> /// </summary>
/// <param name="rom">Rom to check for "null" status</param> /// <param name="rom">Rom to check for "null" status</param>
/// <param name="machine">Machine for logging</param>
/// <returns>Cleaned DatItem</returns> /// <returns>Cleaned DatItem</returns>
/// TODO: Investigate what the machine name is really being used for private DatItem ProcessNullifiedItemImpl(Rom rom)
private DatItem ProcessNullifiedItemImpl(Rom rom, Machine machine)
{ {
// If the Rom has "null" characteristics, ensure all fields // If the item has a size
if (rom.GetInt64FieldValue(Models.Metadata.Rom.SizeKey) == null if (rom.GetInt64FieldValue(Models.Metadata.Rom.SizeKey) != null)
&& rom.GetStringFieldValue(Models.Metadata.Rom.CRCKey) == "null") return rom;
{
_logger.Verbose($"Empty folder found: {machine.GetStringFieldValue(Models.Metadata.Machine.NameKey)}");
rom.SetName(rom.GetName() == "null" ? "-" : rom.GetName()); // If the item CRC isn't "null"
rom.SetFieldValue<string?>(Models.Metadata.Rom.SizeKey, Constants.SizeZero.ToString()); if (rom.GetStringFieldValue(Models.Metadata.Rom.CRCKey) != "null")
rom.SetFieldValue<string?>(Models.Metadata.Rom.CRCKey, return rom;
rom.GetStringFieldValue(Models.Metadata.Rom.CRCKey) == "null" ? ZeroHash.CRC32Str : null);
rom.SetFieldValue<string?>(Models.Metadata.Rom.MD2Key, // If the Rom has "null" characteristics, ensure all fields
rom.GetStringFieldValue(Models.Metadata.Rom.MD2Key) == "null" ? ZeroHash.GetString(HashType.MD2) : null); rom.SetName(rom.GetName() == "null" ? "-" : rom.GetName());
rom.SetFieldValue<string?>(Models.Metadata.Rom.MD4Key, rom.SetFieldValue<string?>(Models.Metadata.Rom.SizeKey, Constants.SizeZero.ToString());
rom.GetStringFieldValue(Models.Metadata.Rom.MD4Key) == "null" ? ZeroHash.GetString(HashType.MD4) : null); rom.SetFieldValue<string?>(Models.Metadata.Rom.CRCKey,
rom.SetFieldValue<string?>(Models.Metadata.Rom.MD5Key, rom.GetStringFieldValue(Models.Metadata.Rom.CRCKey) == "null" ? ZeroHash.CRC32Str : null);
rom.GetStringFieldValue(Models.Metadata.Rom.MD5Key) == "null" ? ZeroHash.MD5Str : null); rom.SetFieldValue<string?>(Models.Metadata.Rom.MD2Key,
rom.SetFieldValue<string?>(Models.Metadata.Rom.SHA1Key, rom.GetStringFieldValue(Models.Metadata.Rom.MD2Key) == "null" ? ZeroHash.GetString(HashType.MD2) : null);
rom.GetStringFieldValue(Models.Metadata.Rom.SHA1Key) == "null" ? ZeroHash.SHA1Str : null); rom.SetFieldValue<string?>(Models.Metadata.Rom.MD4Key,
rom.SetFieldValue<string?>(Models.Metadata.Rom.SHA256Key, rom.GetStringFieldValue(Models.Metadata.Rom.MD4Key) == "null" ? ZeroHash.GetString(HashType.MD4) : null);
rom.GetStringFieldValue(Models.Metadata.Rom.SHA256Key) == "null" ? ZeroHash.SHA256Str : null); rom.SetFieldValue<string?>(Models.Metadata.Rom.MD5Key,
rom.SetFieldValue<string?>(Models.Metadata.Rom.SHA384Key, rom.GetStringFieldValue(Models.Metadata.Rom.MD5Key) == "null" ? ZeroHash.MD5Str : null);
rom.GetStringFieldValue(Models.Metadata.Rom.SHA384Key) == "null" ? ZeroHash.SHA384Str : null); rom.SetFieldValue<string?>(Models.Metadata.Rom.SHA1Key,
rom.SetFieldValue<string?>(Models.Metadata.Rom.SHA512Key, rom.GetStringFieldValue(Models.Metadata.Rom.SHA1Key) == "null" ? ZeroHash.SHA1Str : null);
rom.GetStringFieldValue(Models.Metadata.Rom.SHA512Key) == "null" ? ZeroHash.SHA512Str : null); rom.SetFieldValue<string?>(Models.Metadata.Rom.SHA256Key,
rom.SetFieldValue<string?>(Models.Metadata.Rom.SpamSumKey, rom.GetStringFieldValue(Models.Metadata.Rom.SHA256Key) == "null" ? ZeroHash.SHA256Str : null);
rom.GetStringFieldValue(Models.Metadata.Rom.SpamSumKey) == "null" ? ZeroHash.SpamSumStr : null); rom.SetFieldValue<string?>(Models.Metadata.Rom.SHA384Key,
} rom.GetStringFieldValue(Models.Metadata.Rom.SHA384Key) == "null" ? ZeroHash.SHA384Str : null);
rom.SetFieldValue<string?>(Models.Metadata.Rom.SHA512Key,
rom.GetStringFieldValue(Models.Metadata.Rom.SHA512Key) == "null" ? ZeroHash.SHA512Str : null);
rom.SetFieldValue<string?>(Models.Metadata.Rom.SpamSumKey,
rom.GetStringFieldValue(Models.Metadata.Rom.SpamSumKey) == "null" ? ZeroHash.SpamSumStr : null);
return rom; return rom;
} }