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

Deal with strings that aren't strings

Browse Source
This commit is contained in:
Matt Nadareski
2024-03-11 16:26:28 -04:00
parent eb9075e47e
commit 482746995f
27 changed files with 192 additions and 537 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
SabreTools.DatFiles/DatFile.FromMetadata.cs
View File

@@ -802,6 +802,13 @@ namespace SabreTools.DatFiles
var datItem = new DatItems.Formats.Disk(item); var datItem = new DatItems.Formats.Disk(item);
datItem.SetFieldValue<DatItems.Source?>(DatItems.DatItem.SourceKey, new DatItems.Source { Index = indexId, Name = filename }); datItem.SetFieldValue<DatItems.Source?>(DatItems.DatItem.SourceKey, new DatItems.Source { Index = indexId, Name = filename });
datItem.CopyMachineInformation(machine); datItem.CopyMachineInformation(machine);
// Process hash values
if (datItem.GetStringFieldValue(Models.Metadata.Disk.MD5Key) != null)
datItem.SetFieldValue<string?>(Models.Metadata.Disk.MD5Key, TextHelper.NormalizeMD5(datItem.GetStringFieldValue(Models.Metadata.Disk.MD5Key)));
if (datItem.GetStringFieldValue(Models.Metadata.Disk.SHA1Key) != null)
datItem.SetFieldValue<string?>(Models.Metadata.Disk.SHA1Key, TextHelper.NormalizeSHA1(datItem.GetStringFieldValue(Models.Metadata.Disk.SHA1Key)));
ParseAddHelper(datItem, statsOnly); ParseAddHelper(datItem, statsOnly);
} }
} }
@@ -917,6 +924,23 @@ namespace SabreTools.DatFiles
} }
item.CopyMachineInformation(machine); item.CopyMachineInformation(machine);
// Process hash values
if (item.GetInt64FieldValue(Models.Metadata.Rom.SizeKey) != null)
item.SetFieldValue<string?>(Models.Metadata.Rom.SizeKey, item.GetInt64FieldValue(Models.Metadata.Rom.SizeKey).ToString());
if (item.GetStringFieldValue(Models.Metadata.Rom.CRCKey) != null)
item.SetFieldValue<string?>(Models.Metadata.Rom.CRCKey, TextHelper.NormalizeCRC32(item.GetStringFieldValue(Models.Metadata.Rom.CRCKey)));
if (item.GetStringFieldValue(Models.Metadata.Rom.MD5Key) != null)
item.SetFieldValue<string?>(Models.Metadata.Rom.MD5Key, TextHelper.NormalizeMD5(item.GetStringFieldValue(Models.Metadata.Rom.MD5Key)));
if (item.GetStringFieldValue(Models.Metadata.Rom.SHA1Key) != null)
item.SetFieldValue<string?>(Models.Metadata.Rom.SHA1Key, TextHelper.NormalizeSHA1(item.GetStringFieldValue(Models.Metadata.Rom.SHA1Key)));
if (item.GetStringFieldValue(Models.Metadata.Rom.SHA256Key) != null)
item.SetFieldValue<string?>(Models.Metadata.Rom.SHA256Key, TextHelper.NormalizeSHA256(item.GetStringFieldValue(Models.Metadata.Rom.SHA256Key)));
if (item.GetStringFieldValue(Models.Metadata.Rom.SHA384Key) != null)
item.SetFieldValue<string?>(Models.Metadata.Rom.SHA384Key, TextHelper.NormalizeSHA384(item.GetStringFieldValue(Models.Metadata.Rom.SHA384Key)));
if (item.GetStringFieldValue(Models.Metadata.Rom.SHA512Key) != null)
item.SetFieldValue<string?>(Models.Metadata.Rom.SHA512Key, TextHelper.NormalizeSHA512(item.GetStringFieldValue(Models.Metadata.Rom.SHA512Key)));
ParseAddHelper(item, statsOnly); ParseAddHelper(item, statsOnly);
} }
} }
@@ -1028,6 +1052,15 @@ namespace SabreTools.DatFiles
var datItem = new DatItems.Formats.Media(item); var datItem = new DatItems.Formats.Media(item);
datItem.SetFieldValue<DatItems.Source?>(DatItems.DatItem.SourceKey, new DatItems.Source { Index = indexId, Name = filename }); datItem.SetFieldValue<DatItems.Source?>(DatItems.DatItem.SourceKey, new DatItems.Source { Index = indexId, Name = filename });
datItem.CopyMachineInformation(machine); datItem.CopyMachineInformation(machine);
// Process hash values
if (datItem.GetStringFieldValue(Models.Metadata.Media.MD5Key) != null)
datItem.SetFieldValue<string?>(Models.Metadata.Media.MD5Key, TextHelper.NormalizeMD5(datItem.GetStringFieldValue(Models.Metadata.Media.MD5Key)));
if (datItem.GetStringFieldValue(Models.Metadata.Media.SHA1Key) != null)
datItem.SetFieldValue<string?>(Models.Metadata.Media.SHA1Key, TextHelper.NormalizeSHA1(datItem.GetStringFieldValue(Models.Metadata.Media.SHA1Key)));
if (datItem.GetStringFieldValue(Models.Metadata.Media.SHA256Key) != null)
datItem.SetFieldValue<string?>(Models.Metadata.Media.SHA256Key, TextHelper.NormalizeSHA256(datItem.GetStringFieldValue(Models.Metadata.Media.SHA256Key)));
ParseAddHelper(datItem, statsOnly); ParseAddHelper(datItem, statsOnly);
} }
} }
@@ -1069,6 +1102,23 @@ namespace SabreTools.DatFiles
romItem.SetFieldValue<DatItems.Formats.Part?>(DatItems.Formats.Rom.PartKey, partItem); romItem.SetFieldValue<DatItems.Formats.Part?>(DatItems.Formats.Rom.PartKey, partItem);
romItem.SetFieldValue<DatItems.Source?>(DatItems.DatItem.SourceKey, new DatItems.Source { Index = indexId, Name = filename }); romItem.SetFieldValue<DatItems.Source?>(DatItems.DatItem.SourceKey, new DatItems.Source { Index = indexId, Name = filename });
romItem.CopyMachineInformation(machine); romItem.CopyMachineInformation(machine);
// Process hash values
if (romItem.GetInt64FieldValue(Models.Metadata.Rom.SizeKey) != null)
romItem.SetFieldValue<string?>(Models.Metadata.Rom.SizeKey, romItem.GetInt64FieldValue(Models.Metadata.Rom.SizeKey).ToString());
if (romItem.GetStringFieldValue(Models.Metadata.Rom.CRCKey) != null)
romItem.SetFieldValue<string?>(Models.Metadata.Rom.CRCKey, TextHelper.NormalizeCRC32(romItem.GetStringFieldValue(Models.Metadata.Rom.CRCKey)));
if (romItem.GetStringFieldValue(Models.Metadata.Rom.MD5Key) != null)
romItem.SetFieldValue<string?>(Models.Metadata.Rom.MD5Key, TextHelper.NormalizeMD5(romItem.GetStringFieldValue(Models.Metadata.Rom.MD5Key)));
if (romItem.GetStringFieldValue(Models.Metadata.Rom.SHA1Key) != null)
romItem.SetFieldValue<string?>(Models.Metadata.Rom.SHA1Key, TextHelper.NormalizeSHA1(romItem.GetStringFieldValue(Models.Metadata.Rom.SHA1Key)));
if (romItem.GetStringFieldValue(Models.Metadata.Rom.SHA256Key) != null)
romItem.SetFieldValue<string?>(Models.Metadata.Rom.SHA256Key, TextHelper.NormalizeSHA256(romItem.GetStringFieldValue(Models.Metadata.Rom.SHA256Key)));
if (romItem.GetStringFieldValue(Models.Metadata.Rom.SHA384Key) != null)
romItem.SetFieldValue<string?>(Models.Metadata.Rom.SHA384Key, TextHelper.NormalizeSHA384(romItem.GetStringFieldValue(Models.Metadata.Rom.SHA384Key)));
if (romItem.GetStringFieldValue(Models.Metadata.Rom.SHA512Key) != null)
romItem.SetFieldValue<string?>(Models.Metadata.Rom.SHA512Key, TextHelper.NormalizeSHA512(romItem.GetStringFieldValue(Models.Metadata.Rom.SHA512Key)));
ParseAddHelper(romItem, statsOnly); ParseAddHelper(romItem, statsOnly);
} }
} }
@@ -1091,6 +1141,13 @@ namespace SabreTools.DatFiles
diskItem.SetFieldValue<DatItems.Formats.Part?>(DatItems.Formats.Disk.PartKey, partItem); diskItem.SetFieldValue<DatItems.Formats.Part?>(DatItems.Formats.Disk.PartKey, partItem);
diskItem.SetFieldValue<DatItems.Source?>(DatItems.DatItem.SourceKey, new DatItems.Source { Index = indexId, Name = filename }); diskItem.SetFieldValue<DatItems.Source?>(DatItems.DatItem.SourceKey, new DatItems.Source { Index = indexId, Name = filename });
diskItem.CopyMachineInformation(machine); diskItem.CopyMachineInformation(machine);
// Process hash values
if (diskItem.GetStringFieldValue(Models.Metadata.Disk.MD5Key) != null)
diskItem.SetFieldValue<string?>(Models.Metadata.Disk.MD5Key, TextHelper.NormalizeMD5(diskItem.GetStringFieldValue(Models.Metadata.Disk.MD5Key)));
if (diskItem.GetStringFieldValue(Models.Metadata.Disk.SHA1Key) != null)
diskItem.SetFieldValue<string?>(Models.Metadata.Disk.SHA1Key, TextHelper.NormalizeSHA1(diskItem.GetStringFieldValue(Models.Metadata.Disk.SHA1Key)));
ParseAddHelper(diskItem, statsOnly); ParseAddHelper(diskItem, statsOnly);
} }
} }
@@ -1231,6 +1288,23 @@ namespace SabreTools.DatFiles
var datItem = new DatItems.Formats.Rom(item); var datItem = new DatItems.Formats.Rom(item);
datItem.SetFieldValue<DatItems.Source?>(DatItems.DatItem.SourceKey, new DatItems.Source { Index = indexId, Name = filename }); datItem.SetFieldValue<DatItems.Source?>(DatItems.DatItem.SourceKey, new DatItems.Source { Index = indexId, Name = filename });
datItem.CopyMachineInformation(machine); datItem.CopyMachineInformation(machine);
// Process hash values
if (datItem.GetInt64FieldValue(Models.Metadata.Rom.SizeKey) != null)
datItem.SetFieldValue<string?>(Models.Metadata.Rom.SizeKey, datItem.GetInt64FieldValue(Models.Metadata.Rom.SizeKey).ToString());
if (datItem.GetStringFieldValue(Models.Metadata.Rom.CRCKey) != null)
datItem.SetFieldValue<string?>(Models.Metadata.Rom.CRCKey, TextHelper.NormalizeCRC32(datItem.GetStringFieldValue(Models.Metadata.Rom.CRCKey)));
if (datItem.GetStringFieldValue(Models.Metadata.Rom.MD5Key) != null)
datItem.SetFieldValue<string?>(Models.Metadata.Rom.MD5Key, TextHelper.NormalizeMD5(datItem.GetStringFieldValue(Models.Metadata.Rom.MD5Key)));
if (datItem.GetStringFieldValue(Models.Metadata.Rom.SHA1Key) != null)
datItem.SetFieldValue<string?>(Models.Metadata.Rom.SHA1Key, TextHelper.NormalizeSHA1(datItem.GetStringFieldValue(Models.Metadata.Rom.SHA1Key)));
if (datItem.GetStringFieldValue(Models.Metadata.Rom.SHA256Key) != null)
datItem.SetFieldValue<string?>(Models.Metadata.Rom.SHA256Key, TextHelper.NormalizeSHA256(datItem.GetStringFieldValue(Models.Metadata.Rom.SHA256Key)));
if (datItem.GetStringFieldValue(Models.Metadata.Rom.SHA384Key) != null)
datItem.SetFieldValue<string?>(Models.Metadata.Rom.SHA384Key, TextHelper.NormalizeSHA384(datItem.GetStringFieldValue(Models.Metadata.Rom.SHA384Key)));
if (datItem.GetStringFieldValue(Models.Metadata.Rom.SHA512Key) != null)
datItem.SetFieldValue<string?>(Models.Metadata.Rom.SHA512Key, TextHelper.NormalizeSHA512(datItem.GetStringFieldValue(Models.Metadata.Rom.SHA512Key)));
ParseAddHelper(datItem, statsOnly); ParseAddHelper(datItem, statsOnly);
} }
} }

16
SabreTools.DatFiles/DatFile.cs
View File

@@ -221,12 +221,12 @@ namespace SabreTools.DatFiles
if (item is Disk disk) if (item is Disk disk)
{ {
// If the file has aboslutely no hashes, skip and log // If the file has aboslutely no hashes, skip and log
if (disk.GetFieldValue<ItemStatus>(Models.Metadata.Disk.StatusKey) != ItemStatus.Nodump if (disk.GetStringFieldValue(Models.Metadata.Disk.StatusKey).AsEnumValue<ItemStatus>() != ItemStatus.Nodump
&& string.IsNullOrEmpty(disk.GetStringFieldValue(Models.Metadata.Disk.MD5Key)) && string.IsNullOrEmpty(disk.GetStringFieldValue(Models.Metadata.Disk.MD5Key))
&& string.IsNullOrEmpty(disk.GetStringFieldValue(Models.Metadata.Disk.SHA1Key))) && string.IsNullOrEmpty(disk.GetStringFieldValue(Models.Metadata.Disk.SHA1Key)))
{ {
logger.Verbose($"Incomplete entry for '{disk.GetName()}' will be output as nodump"); logger.Verbose($"Incomplete entry for '{disk.GetName()}' will be output as nodump");
disk.SetFieldValue<ItemStatus>(Models.Metadata.Disk.StatusKey, ItemStatus.Nodump); disk.SetFieldValue<string?>(Models.Metadata.Disk.StatusKey, ItemStatus.Nodump.AsStringValue());
} }
item = disk; item = disk;
@@ -271,14 +271,14 @@ namespace SabreTools.DatFiles
} }
// If the file has no size and it's not the above case, skip and log // If the file has no size and it's not the above case, skip and log
else if (rom.GetFieldValue<ItemStatus>(Models.Metadata.Rom.StatusKey) != ItemStatus.Nodump && (size == 0 || size == null)) else if (rom.GetStringFieldValue(Models.Metadata.Rom.StatusKey).AsEnumValue<ItemStatus>() != ItemStatus.Nodump && (size == 0 || size == null))
{ {
logger.Verbose($"{Header.GetStringFieldValue(DatHeader.FileNameKey)}: Incomplete entry for '{rom.GetName()}' will be output as nodump"); logger.Verbose($"{Header.GetStringFieldValue(DatHeader.FileNameKey)}: Incomplete entry for '{rom.GetName()}' will be output as nodump");
rom.SetFieldValue<ItemStatus>(Models.Metadata.Rom.StatusKey, ItemStatus.Nodump); rom.SetFieldValue<string?>(Models.Metadata.Rom.StatusKey, ItemStatus.Nodump.AsStringValue());
} }
// If the file has a size but aboslutely no hashes, skip and log // If the file has a size but aboslutely no hashes, skip and log
else if (rom.GetFieldValue<ItemStatus>(Models.Metadata.Rom.StatusKey) != ItemStatus.Nodump else if (rom.GetStringFieldValue(Models.Metadata.Rom.StatusKey).AsEnumValue<ItemStatus>() != ItemStatus.Nodump
&& size != null && size > 0 && size != null && size > 0
&& !rom.HasHashes()) && !rom.HasHashes())
{ {
@@ -369,7 +369,7 @@ namespace SabreTools.DatFiles
// Initialize strings // Initialize strings
string fix, string fix,
game = item.GetFieldValue<Machine>(DatItem.MachineKey)!.GetStringFieldValue(Models.Metadata.Machine.NameKey) ?? string.Empty, game = item.GetFieldValue<Machine>(DatItem.MachineKey)!.GetStringFieldValue(Models.Metadata.Machine.NameKey) ?? string.Empty,
name = item.GetName() ?? item.GetFieldValue<ItemType>(Models.Metadata.DatItem.TypeKey).ToString(), name = item.GetName() ?? item.GetStringFieldValue(Models.Metadata.DatItem.TypeKey).AsEnumValue<ItemType>().AsStringValue() ?? string.Empty,
crc = string.Empty, crc = string.Empty,
md5 = string.Empty, md5 = string.Empty,
sha1 = string.Empty, sha1 = string.Empty,
@@ -584,7 +584,7 @@ namespace SabreTools.DatFiles
foreach (DatItem datItem in datItems) foreach (DatItem datItem in datItems)
{ {
if (GetSupportedTypes().Contains(datItem.GetFieldValue<ItemType>(Models.Metadata.DatItem.TypeKey))) if (GetSupportedTypes().Contains(datItem.GetStringFieldValue(Models.Metadata.DatItem.TypeKey).AsEnumValue<ItemType>()))
return true; return true;
} }
@@ -636,7 +636,7 @@ namespace SabreTools.DatFiles
} }
// If we have an item type not in the list of supported values // If we have an item type not in the list of supported values
if (!GetSupportedTypes().Contains(datItem.GetFieldValue<ItemType>(Models.Metadata.DatItem.TypeKey))) if (!GetSupportedTypes().Contains(datItem.GetStringFieldValue(Models.Metadata.DatItem.TypeKey).AsEnumValue<ItemType>()))
{ {
string itemString = JsonConvert.SerializeObject(datItem, Formatting.None); string itemString = JsonConvert.SerializeObject(datItem, Formatting.None);
logger?.Verbose($"Item '{itemString}' was skipped because it was not supported in {Header?.GetFieldValue<DatFormat>(DatHeader.DatFormatKey)}"); logger?.Verbose($"Item '{itemString}' was skipped because it was not supported in {Header?.GetFieldValue<DatFormat>(DatHeader.DatFormatKey)}");

425
SabreTools.DatFiles/Formats/ClrMamePro.Writer.cs
View File

@@ -1,8 +1,6 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq;
using SabreTools.Core; using SabreTools.Core;
using SabreTools.Core.Tools;
using SabreTools.DatItems; using SabreTools.DatItems;
using SabreTools.DatItems.Formats; using SabreTools.DatItems.Formats;
@@ -140,8 +138,6 @@ namespace SabreTools.DatFiles.Formats
{ {
logger.User($"Writing to '{outfile}'..."); logger.User($"Writing to '{outfile}'...");
//var metadataFile = CreateMetadataFile(ignoreblanks);
// Serialize the input file // Serialize the input file
var metadata = ConvertMetadata(ignoreblanks); var metadata = ConvertMetadata(ignoreblanks);
var metadataFile = new Serialization.CrossModel.ClrMamePro().Deserialize(metadata); var metadataFile = new Serialization.CrossModel.ClrMamePro().Deserialize(metadata);
@@ -160,426 +156,5 @@ namespace SabreTools.DatFiles.Formats
logger.User($"'{outfile}' written!{Environment.NewLine}"); logger.User($"'{outfile}' written!{Environment.NewLine}");
return true; return true;
} }
#region Converters
/// <summary>
/// Create a MetadataFile from the current internal information
/// <summary>
/// <param name="ignoreblanks">True if blank roms should be skipped on output, false otherwise</param>
private Models.ClrMamePro.MetadataFile CreateMetadataFile(bool ignoreblanks)
{
var metadataFile = new Models.ClrMamePro.MetadataFile
{
ClrMamePro = CreateClrMamePro(),
Game = CreateGames(ignoreblanks)
};
return metadataFile;
}
/// <summary>
/// Create a ClrMamePro from the current internal information
/// <summary>
private Models.ClrMamePro.ClrMamePro? CreateClrMamePro()
{
// If we don't have a header, we can't do anything
if (this.Header == null)
return null;
var clrMamePro = new Models.ClrMamePro.ClrMamePro
{
Name = Header.GetStringFieldValue(Models.Metadata.Header.NameKey),
Description = Header.GetStringFieldValue(Models.Metadata.Header.DescriptionKey),
RootDir = Header.GetStringFieldValue(Models.Metadata.Header.RootDirKey),
Category = Header.GetStringFieldValue(Models.Metadata.Header.CategoryKey),
Version = Header.GetStringFieldValue(Models.Metadata.Header.VersionKey),
Date = Header.GetStringFieldValue(Models.Metadata.Header.DateKey),
Author = Header.GetStringFieldValue(Models.Metadata.Header.AuthorKey),
Homepage = Header.GetStringFieldValue(Models.Metadata.Header.HomepageKey),
Url = Header.GetStringFieldValue(Models.Metadata.Header.UrlKey),
Comment = Header.GetStringFieldValue(Models.Metadata.Header.CommentKey),
Header = Header.GetStringFieldValue(Models.Metadata.Header.HeaderKey),
Type = Header.GetStringFieldValue(Models.Metadata.Header.TypeKey),
};
if (Header.GetFieldValue<MergingFlag>(Models.Metadata.Header.ForceMergingKey) != MergingFlag.None)
clrMamePro.ForceMerging = Header.GetFieldValue<MergingFlag>(Models.Metadata.Header.ForceMergingKey).AsStringValue<MergingFlag>(useSecond: false);
if (Header.GetFieldValue<PackingFlag>(Models.Metadata.Header.ForcePackingKey) != PackingFlag.None)
clrMamePro.ForcePacking = Header.GetFieldValue<PackingFlag>(Models.Metadata.Header.ForcePackingKey).AsStringValue<PackingFlag>(useSecond: false);
return clrMamePro;
}
/// <summary>
/// Create an array of GameBase from the current internal information
/// <summary>
/// <param name="ignoreblanks">True if blank roms should be skipped on output, false otherwise</param>
private Models.ClrMamePro.GameBase[]? CreateGames(bool ignoreblanks)
{
// If we don't have items, we can't do anything
if (this.Items == null || !this.Items.Any())
return null;
// Create a list of hold the games
var games = new List<Models.ClrMamePro.GameBase>();
// Loop through the sorted items and create games for them
foreach (string key in Items.SortedKeys)
{
var items = Items.FilteredItems(key);
if (items == null || !items.Any())
continue;
// Get the first item for game information
var machine = items[0].GetFieldValue<Machine>(DatItem.MachineKey);
// We normalize to all "game"
var game = new Models.ClrMamePro.Game
{
Name = machine?.GetStringFieldValue(Models.Metadata.Machine.NameKey),
Description = machine?.GetStringFieldValue(Models.Metadata.Machine.DescriptionKey),
Year = machine?.GetStringFieldValue(Models.Metadata.Machine.YearKey),
Manufacturer = machine?.GetStringFieldValue(Models.Metadata.Machine.ManufacturerKey),
Category = machine?.GetStringFieldValue(Models.Metadata.Machine.CategoryKey),
CloneOf = machine?.GetStringFieldValue(Models.Metadata.Machine.CloneOfKey),
RomOf = machine?.GetStringFieldValue(Models.Metadata.Machine.RomOfKey),
SampleOf = machine?.GetStringFieldValue(Models.Metadata.Machine.SampleOfKey),
};
// Create holders for all item types
var releases = new List<Models.ClrMamePro.Release>();
var biossets = new List<Models.ClrMamePro.BiosSet>();
var roms = new List<Models.ClrMamePro.Rom>();
var disks = new List<Models.ClrMamePro.Disk>();
var medias = new List<Models.ClrMamePro.Media>();
var samples = new List<Models.ClrMamePro.Sample>();
var archives = new List<Models.ClrMamePro.Archive>();
var chips = new List<Models.ClrMamePro.Chip>();
var videos = new List<Models.ClrMamePro.Video>();
var dipswitches = new List<Models.ClrMamePro.DipSwitch>();
// Loop through and convert the items to respective lists
for (int index = 0; index < items.Count; index++)
{
// Get the item
var item = items[index];
// Check for a "null" item
item = ProcessNullifiedItem(item);
// Skip if we're ignoring the item
if (ShouldIgnore(item, ignoreblanks))
continue;
switch (item)
{
case Release release:
releases.Add(CreateRelease(release));
break;
case BiosSet biosset:
biossets.Add(CreateBiosSet(biosset));
break;
case Rom rom:
roms.Add(CreateRom(rom));
break;
case Disk disk:
disks.Add(CreateDisk(disk));
break;
case Media media:
medias.Add(CreateMedia(media));
break;
case Sample sample:
samples.Add(CreateSample(sample));
break;
case Archive archive:
archives.Add(CreateArchive(archive));
break;
case Chip chip:
chips.Add(CreateChip(chip));
break;
case Display display:
videos.Add(CreateVideo(display));
break;
case Sound sound:
game.Sound = CreateSound(sound);
break;
case Input input:
game.Input = CreateInput(input);
break;
case DipSwitch dipswitch:
dipswitches.Add(CreateDipSwitch(dipswitch));
break;
case Driver driver:
game.Driver = CreateDriver(driver);
break;
}
}
// Assign the values to the game
game.Release = [.. releases];
game.BiosSet = [.. biossets];
game.Rom = [.. roms];
game.Disk = [.. disks];
game.Media = [.. medias];
game.Sample = [.. samples];
game.Archive = [.. archives];
game.Chip = [.. chips];
game.Video = [.. videos];
game.DipSwitch = [.. dipswitches];
// Add the game to the list
games.Add(game);
}
return [.. games];
}
/// <summary>
/// Create a Release from the current Release DatItem
/// <summary>
private static Models.ClrMamePro.Release CreateRelease(Release item)
{
var release = new Models.ClrMamePro.Release
{
Name = item.GetName(),
Region = item.GetStringFieldValue(Models.Metadata.Release.RegionKey),
Language = item.GetStringFieldValue(Models.Metadata.Release.LanguageKey),
Date = item.GetStringFieldValue(Models.Metadata.Release.DateKey),
Default = item.GetBoolFieldValue(Models.Metadata.Release.DefaultKey).FromYesNo(),
};
return release;
}
/// <summary>
/// Create a BiosSet from the current BiosSet DatItem
/// <summary>
private static Models.ClrMamePro.BiosSet CreateBiosSet(BiosSet item)
{
var biosset = new Models.ClrMamePro.BiosSet
{
Name = item.GetName(),
Default = item.GetBoolFieldValue(Models.Metadata.BiosSet.DefaultKey).FromYesNo(),
Description = item.GetStringFieldValue(Models.Metadata.BiosSet.DescriptionKey),
};
return biosset;
}
/// <summary>
/// Create a Rom from the current Rom DatItem
/// <summary>
private static Models.ClrMamePro.Rom CreateRom(Rom item)
{
var rom = new Models.ClrMamePro.Rom
{
Name = item.GetName(),
Size = item.GetStringFieldValue(Models.Metadata.Rom.SizeKey),
CRC = item.GetStringFieldValue(Models.Metadata.Rom.CRCKey),
MD5 = item.GetStringFieldValue(Models.Metadata.Rom.MD5Key),
SHA1 = item.GetStringFieldValue(Models.Metadata.Rom.SHA1Key),
SHA256 = item.GetStringFieldValue(Models.Metadata.Rom.SHA256Key),
SHA384 = item.GetStringFieldValue(Models.Metadata.Rom.SHA384Key),
SHA512 = item.GetStringFieldValue(Models.Metadata.Rom.SHA512Key),
SpamSum = item.GetStringFieldValue(Models.Metadata.Rom.SpamSumKey),
xxHash364 = item.GetStringFieldValue(Models.Metadata.Rom.xxHash364Key),
xxHash3128 = item.GetStringFieldValue(Models.Metadata.Rom.xxHash3128Key),
Merge = item.GetStringFieldValue(Models.Metadata.Rom.MergeKey),
Region = item.GetStringFieldValue(Models.Metadata.Rom.RegionKey),
Flags = item.GetStringFieldValue(Models.Metadata.Rom.FlagsKey),
Date = item.GetStringFieldValue(Models.Metadata.Rom.DateKey),
Offs = item.GetStringFieldValue(Models.Metadata.Rom.OffsetKey),
Serial = item.GetStringFieldValue(Models.Metadata.Rom.SerialKey),
Header = item.GetStringFieldValue(Models.Metadata.Rom.HeaderKey),
Inverted = item.GetBoolFieldValue(Models.Metadata.Rom.InvertedKey).FromYesNo(),
MIA = item.GetBoolFieldValue(Models.Metadata.Rom.MIAKey).FromYesNo(),
};
if (item.ItemStatusSpecified)
rom.Status = item.GetFieldValue<ItemStatus>(Models.Metadata.Rom.StatusKey).AsStringValue<ItemStatus>(useSecond: false);
return rom;
}
/// <summary>
/// Create a Disk from the current Disk DatItem
/// <summary>
private static Models.ClrMamePro.Disk CreateDisk(Disk item)
{
var disk = new Models.ClrMamePro.Disk
{
Name = item.GetName(),
MD5 = item.GetStringFieldValue(Models.Metadata.Disk.MD5Key),
SHA1 = item.GetStringFieldValue(Models.Metadata.Disk.SHA1Key),
Merge = item.GetStringFieldValue(Models.Metadata.Disk.MergeKey),
Flags = item.GetStringFieldValue(Models.Metadata.Disk.FlagsKey),
};
if (item.GetFieldValue<ItemStatus>(Models.Metadata.Disk.StatusKey) != ItemStatus.NULL)
disk.Status = item.GetFieldValue<ItemStatus>(Models.Metadata.Disk.StatusKey).AsStringValue<ItemStatus>(useSecond: false);
return disk;
}
/// <summary>
/// Create a Media from the current Media DatItem
/// <summary>
private static Models.ClrMamePro.Media CreateMedia(Media item)
{
var media = new Models.ClrMamePro.Media
{
Name = item.GetName(),
MD5 = item.GetStringFieldValue(Models.Metadata.Media.MD5Key),
SHA1 = item.GetStringFieldValue(Models.Metadata.Media.SHA1Key),
SHA256 = item.GetStringFieldValue(Models.Metadata.Media.SHA256Key),
SpamSum = item.GetStringFieldValue(Models.Metadata.Media.SpamSumKey),
};
return media;
}
/// <summary>
/// Create a Sample from the current Sample DatItem
/// <summary>
private static Models.ClrMamePro.Sample CreateSample(Sample item)
{
var sample = new Models.ClrMamePro.Sample
{
Name = item.GetName(),
};
return sample;
}
/// <summary>
/// Create a Archive from the current Archive DatItem
/// <summary>
private static Models.ClrMamePro.Archive CreateArchive(Archive item)
{
var archive = new Models.ClrMamePro.Archive
{
Name = item.GetName(),
};
return archive;
}
/// <summary>
/// Create a Chip from the current Chip DatItem
/// <summary>
private static Models.ClrMamePro.Chip CreateChip(Chip item)
{
var chip = new Models.ClrMamePro.Chip
{
Type = item.GetFieldValue<ChipType>(Models.Metadata.Chip.ChipTypeKey).AsStringValue<ChipType>(),
Name = item.GetName(),
Flags = item.GetStringFieldValue(Models.Metadata.Chip.FlagsKey),
Clock = item.GetInt64FieldValue(Models.Metadata.Chip.ClockKey)?.ToString(),
};
return chip;
}
/// <summary>
/// Create a Video from the current Display DatItem
/// <summary>
private static Models.ClrMamePro.Video CreateVideo(Display item)
{
var video = new Models.ClrMamePro.Video
{
Screen = item.GetFieldValue<DisplayType>(Models.Metadata.Display.DisplayTypeKey).AsStringValue<DisplayType>(),
X = item.GetInt64FieldValue(Models.Metadata.Display.WidthKey)?.ToString(),
Y = item.GetInt64FieldValue(Models.Metadata.Display.HeightKey)?.ToString(),
AspectX = item.GetStringFieldValue("ASPECTX"),
AspectY = item.GetStringFieldValue("ASPECTY"),
Freq = item.GetDoubleFieldValue(Models.Metadata.Display.RefreshKey)?.ToString(),
};
switch (item.GetInt64FieldValue(Models.Metadata.Display.RotateKey))
{
case 0:
case 180:
video.Orientation = "horizontal";
break;
case 90:
case 270:
video.Orientation = "vertical";
break;
}
return video;
}
/// <summary>
/// Create a Sound from the current Sound DatItem
/// <summary>
private static Models.ClrMamePro.Sound CreateSound(Sound item)
{
var sound = new Models.ClrMamePro.Sound
{
Channels = item.GetInt64FieldValue(Models.Metadata.Sound.ChannelsKey)?.ToString(),
};
return sound;
}
/// <summary>
/// Create a Input from the current Input DatItem
/// <summary>
private static Models.ClrMamePro.Input CreateInput(Input item)
{
var input = new Models.ClrMamePro.Input
{
Players = item.GetInt64FieldValue(Models.Metadata.Input.PlayersKey)?.ToString(),
//Control = item.GetStringFieldValue(Models.Metadata.Input.ControlKey),
Coins = item.GetInt64FieldValue(Models.Metadata.Input.CoinsKey)?.ToString(),
Tilt = item.GetBoolFieldValue(Models.Metadata.Input.TiltKey).FromYesNo(),
Service = item.GetBoolFieldValue(Models.Metadata.Input.ServiceKey).FromYesNo(),
};
if (item.ControlsSpecified)
input.Buttons = item.GetFieldValue<Control[]?>(Models.Metadata.Input.ControlKey)![0].GetInt64FieldValue(Models.Metadata.Control.ButtonsKey)?.ToString();
return input;
}
/// <summary>
/// Create a DipSwitch from the current DipSwitch DatItem
/// <summary>
private static Models.ClrMamePro.DipSwitch CreateDipSwitch(DipSwitch item)
{
var dipswitch = new Models.ClrMamePro.DipSwitch
{
Name = item.GetName(),
};
if (item.ValuesSpecified)
{
var entries = new List<string>();
foreach (var setting in item.GetFieldValue<DipValue[]?>(Models.Metadata.DipSwitch.DipValueKey)!)
{
entries.Add(setting.GetStringFieldValue(Models.Metadata.DipValue.ValueKey)!);
if (setting.GetBoolFieldValue(Models.Metadata.DipValue.DefaultKey) == true)
dipswitch.Default = setting.GetStringFieldValue(Models.Metadata.DipValue.ValueKey);
}
dipswitch.Entry = [.. entries];
}
return dipswitch;
}
/// <summary>
/// Create a Driver from the current Driver DatItem
/// <summary>
private static Models.ClrMamePro.Driver CreateDriver(Driver item)
{
var driver = new Models.ClrMamePro.Driver
{
Status = item.GetFieldValue<SupportStatus>(Models.Metadata.Driver.StatusKey).AsStringValue<SupportStatus>(),
Color = item.GetFieldValue<SupportStatus>(Models.Metadata.Driver.ColorKey).AsStringValue<SupportStatus>(),
Sound = item.GetFieldValue<SupportStatus>(Models.Metadata.Driver.SoundKey).AsStringValue<SupportStatus>(),
PaletteSize = item.GetInt64FieldValue(Models.Metadata.Driver.PaletteSizeKey)?.ToString(),
Blit = item.GetStringFieldValue(Models.Metadata.Driver.BlitKey),
};
return driver;
}
#endregion
} }
} }

8
SabreTools.DatFiles/Formats/Listrom.Writer.cs
View File

@@ -166,7 +166,7 @@ namespace SabreTools.DatFiles.Formats
/// <summary> /// <summary>
private static Models.Listrom.Row? CreateRow(Disk disk) private static Models.Listrom.Row? CreateRow(Disk disk)
{ {
if (disk.GetFieldValue<ItemStatus>(Models.Metadata.Disk.StatusKey) == ItemStatus.Nodump) if (disk.GetStringFieldValue(Models.Metadata.Disk.StatusKey).AsEnumValue<ItemStatus>() == ItemStatus.Nodump)
{ {
return new Models.Listrom.Row return new Models.Listrom.Row
{ {
@@ -174,7 +174,7 @@ namespace SabreTools.DatFiles.Formats
NoGoodDumpKnown = true, NoGoodDumpKnown = true,
}; };
} }
else if (disk.GetFieldValue<ItemStatus>(Models.Metadata.Disk.StatusKey) == ItemStatus.BadDump) else if (disk.GetStringFieldValue(Models.Metadata.Disk.StatusKey).AsEnumValue<ItemStatus>() == ItemStatus.BadDump)
{ {
var row = new Models.Listrom.Row var row = new Models.Listrom.Row
{ {
@@ -210,7 +210,7 @@ namespace SabreTools.DatFiles.Formats
/// <summary> /// <summary>
private static Models.Listrom.Row? CreateRow(Rom rom) private static Models.Listrom.Row? CreateRow(Rom rom)
{ {
if (rom.GetFieldValue<ItemStatus>(Models.Metadata.Rom.StatusKey) == ItemStatus.Nodump) if (rom.GetStringFieldValue(Models.Metadata.Rom.StatusKey).AsEnumValue<ItemStatus>() == ItemStatus.Nodump)
{ {
return new Models.Listrom.Row return new Models.Listrom.Row
{ {
@@ -219,7 +219,7 @@ namespace SabreTools.DatFiles.Formats
NoGoodDumpKnown = true, NoGoodDumpKnown = true,
}; };
} }
else if (rom.GetFieldValue<ItemStatus>(Models.Metadata.Rom.StatusKey) == ItemStatus.BadDump) else if (rom.GetStringFieldValue(Models.Metadata.Rom.StatusKey).AsEnumValue<ItemStatus>() == ItemStatus.BadDump)
{ {
return new Models.Listrom.Row return new Models.Listrom.Row
{ {

12
SabreTools.DatFiles/Formats/Listxml.Writer.cs
View File

@@ -376,7 +376,7 @@ namespace SabreTools.DatFiles.Formats
{ {
Name = machine.GetStringFieldValue(Models.Metadata.Machine.NameKey), Name = machine.GetStringFieldValue(Models.Metadata.Machine.NameKey),
SourceFile = machine.GetStringFieldValue(Models.Metadata.Machine.SourceFileKey), SourceFile = machine.GetStringFieldValue(Models.Metadata.Machine.SourceFileKey),
Runnable = machine.GetFieldValue<Runnable>(Models.Metadata.Machine.RunnableKey).AsStringValue<Runnable>(), Runnable = machine.GetStringFieldValue(Models.Metadata.Machine.RunnableKey).AsEnumValue<Runnable>().AsStringValue(),
CloneOf = machine.GetStringFieldValue(Models.Metadata.Machine.CloneOfKey), CloneOf = machine.GetStringFieldValue(Models.Metadata.Machine.CloneOfKey),
RomOf = machine.GetStringFieldValue(Models.Metadata.Machine.RomOfKey), RomOf = machine.GetStringFieldValue(Models.Metadata.Machine.RomOfKey),
SampleOf = machine.GetStringFieldValue(Models.Metadata.Machine.SampleOfKey), SampleOf = machine.GetStringFieldValue(Models.Metadata.Machine.SampleOfKey),
@@ -426,7 +426,7 @@ namespace SabreTools.DatFiles.Formats
Merge = item.GetStringFieldValue(Models.Metadata.Rom.MergeKey), Merge = item.GetStringFieldValue(Models.Metadata.Rom.MergeKey),
Region = item.GetStringFieldValue(Models.Metadata.Rom.RegionKey), Region = item.GetStringFieldValue(Models.Metadata.Rom.RegionKey),
Offset = item.GetStringFieldValue(Models.Metadata.Rom.OffsetKey), Offset = item.GetStringFieldValue(Models.Metadata.Rom.OffsetKey),
Status = item.GetFieldValue<ItemStatus>(Models.Metadata.Rom.StatusKey).AsStringValue<ItemStatus>(useSecond: false), Status = item.GetStringFieldValue(Models.Metadata.Rom.StatusKey).AsEnumValue<ItemStatus>().AsStringValue(useSecond: false),
Optional = item.GetBoolFieldValue(Models.Metadata.Rom.OptionalKey).FromYesNo(), Optional = item.GetBoolFieldValue(Models.Metadata.Rom.OptionalKey).FromYesNo(),
Dispose = item.GetBoolFieldValue(Models.Metadata.Rom.DisposeKey).FromYesNo(), Dispose = item.GetBoolFieldValue(Models.Metadata.Rom.DisposeKey).FromYesNo(),
SoundOnly = item.GetBoolFieldValue(Models.Metadata.Rom.SoundOnlyKey).FromYesNo(), SoundOnly = item.GetBoolFieldValue(Models.Metadata.Rom.SoundOnlyKey).FromYesNo(),
@@ -449,7 +449,7 @@ namespace SabreTools.DatFiles.Formats
Region = item.GetStringFieldValue(Models.Metadata.Disk.RegionKey), Region = item.GetStringFieldValue(Models.Metadata.Disk.RegionKey),
Index = item.GetStringFieldValue(Models.Metadata.Disk.IndexKey), Index = item.GetStringFieldValue(Models.Metadata.Disk.IndexKey),
Writable = item.GetBoolFieldValue(Models.Metadata.Disk.WritableKey).FromYesNo(), Writable = item.GetBoolFieldValue(Models.Metadata.Disk.WritableKey).FromYesNo(),
Status = item.GetFieldValue<ItemStatus>(Models.Metadata.Disk.StatusKey).AsStringValue<ItemStatus>(useSecond: false), Status = item.GetStringFieldValue(Models.Metadata.Disk.StatusKey).AsEnumValue<ItemStatus>().AsStringValue(useSecond: false),
Optional = item.GetBoolFieldValue(Models.Metadata.Disk.OptionalKey).FromYesNo(), Optional = item.GetBoolFieldValue(Models.Metadata.Disk.OptionalKey).FromYesNo(),
}; };
@@ -491,7 +491,7 @@ namespace SabreTools.DatFiles.Formats
{ {
Name = item.GetName(), Name = item.GetName(),
Tag = item.GetStringFieldValue(Models.Metadata.Chip.TagKey), Tag = item.GetStringFieldValue(Models.Metadata.Chip.TagKey),
Type = item.GetFieldValue<ChipType>(Models.Metadata.Chip.ChipTypeKey).AsStringValue<ChipType>(), Type = item.GetStringFieldValue(Models.Metadata.Chip.ChipTypeKey).AsEnumValue<ChipType>().AsStringValue(),
SoundOnly = item.GetBoolFieldValue(Models.Metadata.Chip.SoundOnlyKey).FromYesNo(), SoundOnly = item.GetBoolFieldValue(Models.Metadata.Chip.SoundOnlyKey).FromYesNo(),
Clock = item.GetInt64FieldValue(Models.Metadata.Chip.TagKey)?.ToString(), Clock = item.GetInt64FieldValue(Models.Metadata.Chip.TagKey)?.ToString(),
}; };
@@ -507,7 +507,7 @@ namespace SabreTools.DatFiles.Formats
var display = new Models.Listxml.Display var display = new Models.Listxml.Display
{ {
Tag = item.GetStringFieldValue(Models.Metadata.Display.TagKey), Tag = item.GetStringFieldValue(Models.Metadata.Display.TagKey),
Type = item.GetFieldValue<DisplayType>(Models.Metadata.Display.DisplayTypeKey).AsStringValue<DisplayType>(), Type = item.GetStringFieldValue(Models.Metadata.Display.DisplayTypeKey).AsEnumValue<DisplayType>().AsStringValue(),
Rotate = item.GetInt64FieldValue(Models.Metadata.Display.RotateKey)?.ToString(), Rotate = item.GetInt64FieldValue(Models.Metadata.Display.RotateKey)?.ToString(),
FlipX = item.GetBoolFieldValue(Models.Metadata.Display.FlipXKey).FromYesNo(), FlipX = item.GetBoolFieldValue(Models.Metadata.Display.FlipXKey).FromYesNo(),
Width = item.GetStringFieldValue(Models.Metadata.Display.WidthKey)?.ToString(), Width = item.GetStringFieldValue(Models.Metadata.Display.WidthKey)?.ToString(),
@@ -573,7 +573,7 @@ namespace SabreTools.DatFiles.Formats
{ {
var control = new Models.Listxml.Control var control = new Models.Listxml.Control
{ {
Type = item.GetFieldValue<ControlType>(Models.Metadata.Control.ControlTypeKey).AsStringValue<ControlType>(), Type = item.GetStringFieldValue(Models.Metadata.Control.ControlTypeKey).AsEnumValue<ControlType>().AsStringValue(),
Player = item.GetInt64FieldValue(Models.Metadata.Control.PlayerKey)?.ToString(), Player = item.GetInt64FieldValue(Models.Metadata.Control.PlayerKey)?.ToString(),
Buttons = item.GetInt64FieldValue(Models.Metadata.Control.ButtonsKey)?.ToString(), Buttons = item.GetInt64FieldValue(Models.Metadata.Control.ButtonsKey)?.ToString(),
ReqButtons = item.GetInt64FieldValue(Models.Metadata.Control.ReqButtonsKey)?.ToString(), ReqButtons = item.GetInt64FieldValue(Models.Metadata.Control.ReqButtonsKey)?.ToString(),

6
SabreTools.DatFiles/Formats/Logiqx.Writer.cs
View File

@@ -527,7 +527,7 @@ namespace SabreTools.DatFiles.Formats
}; };
if (item.ItemStatusSpecified) if (item.ItemStatusSpecified)
rom.Status = item.GetFieldValue<ItemStatus>(Models.Metadata.Rom.StatusKey).AsStringValue<ItemStatus>(useSecond: false); rom.Status = item.GetStringFieldValue(Models.Metadata.Rom.StatusKey).AsEnumValue<ItemStatus>().AsStringValue(useSecond: false);
return rom; return rom;
} }
@@ -546,8 +546,8 @@ namespace SabreTools.DatFiles.Formats
Region = item.GetStringFieldValue(Models.Metadata.Disk.RegionKey), Region = item.GetStringFieldValue(Models.Metadata.Disk.RegionKey),
}; };
if (item.GetFieldValue<ItemStatus>(Models.Metadata.Disk.StatusKey) != ItemStatus.NULL) if (item.GetStringFieldValue(Models.Metadata.Disk.StatusKey).AsEnumValue<ItemStatus>() != ItemStatus.NULL)
disk.Status = item.GetFieldValue<ItemStatus>(Models.Metadata.Disk.StatusKey).AsStringValue<ItemStatus>(useSecond: false); disk.Status = item.GetStringFieldValue(Models.Metadata.Disk.StatusKey).AsEnumValue<ItemStatus>().AsStringValue(useSecond: false);
return disk; return disk;
} }

10
SabreTools.DatFiles/Formats/SeparatedValue.Writer.cs
View File

@@ -164,7 +164,7 @@ namespace SabreTools.DatFiles.Formats
Description = Header.GetStringFieldValue(Models.Metadata.Header.DescriptionKey), Description = Header.GetStringFieldValue(Models.Metadata.Header.DescriptionKey),
GameName = disk.GetFieldValue<Machine>(DatItem.MachineKey)!.GetStringFieldValue(Models.Metadata.Machine.NameKey), GameName = disk.GetFieldValue<Machine>(DatItem.MachineKey)!.GetStringFieldValue(Models.Metadata.Machine.NameKey),
GameDescription = disk.GetFieldValue<Machine>(DatItem.MachineKey)!.GetStringFieldValue(Models.Metadata.Machine.DescriptionKey), GameDescription = disk.GetFieldValue<Machine>(DatItem.MachineKey)!.GetStringFieldValue(Models.Metadata.Machine.DescriptionKey),
Type = disk.GetFieldValue<ItemType>(Models.Metadata.DatItem.TypeKey).AsStringValue<ItemType>(), Type = disk.GetStringFieldValue(Models.Metadata.DatItem.TypeKey).AsEnumValue<ItemType>().AsStringValue(),
RomName = string.Empty, RomName = string.Empty,
DiskName = disk.GetName(), DiskName = disk.GetName(),
Size = string.Empty, Size = string.Empty,
@@ -175,7 +175,7 @@ namespace SabreTools.DatFiles.Formats
SHA384 = string.Empty, SHA384 = string.Empty,
SHA512 = string.Empty, SHA512 = string.Empty,
SpamSum = string.Empty, SpamSum = string.Empty,
Status = disk.GetFieldValue<ItemStatus>(Models.Metadata.Disk.StatusKey).AsStringValue<ItemStatus>(useSecond: false), Status = disk.GetStringFieldValue(Models.Metadata.Disk.StatusKey).AsEnumValue<ItemStatus>().AsStringValue(useSecond: false),
}; };
return row; return row;
} }
@@ -192,7 +192,7 @@ namespace SabreTools.DatFiles.Formats
Description = Header.GetStringFieldValue(Models.Metadata.Header.DescriptionKey), Description = Header.GetStringFieldValue(Models.Metadata.Header.DescriptionKey),
GameName = media.GetFieldValue<Machine>(DatItem.MachineKey)!.GetStringFieldValue(Models.Metadata.Machine.NameKey), GameName = media.GetFieldValue<Machine>(DatItem.MachineKey)!.GetStringFieldValue(Models.Metadata.Machine.NameKey),
GameDescription = media.GetFieldValue<Machine>(DatItem.MachineKey)!.GetStringFieldValue(Models.Metadata.Machine.DescriptionKey), GameDescription = media.GetFieldValue<Machine>(DatItem.MachineKey)!.GetStringFieldValue(Models.Metadata.Machine.DescriptionKey),
Type = media.GetFieldValue<ItemType>(Models.Metadata.DatItem.TypeKey).AsStringValue<ItemType>(), Type = media.GetStringFieldValue(Models.Metadata.DatItem.TypeKey).AsEnumValue<ItemType>().AsStringValue(),
RomName = string.Empty, RomName = string.Empty,
DiskName = media.GetName(), DiskName = media.GetName(),
Size = string.Empty, Size = string.Empty,
@@ -220,7 +220,7 @@ namespace SabreTools.DatFiles.Formats
Description = Header.GetStringFieldValue(Models.Metadata.Header.DescriptionKey), Description = Header.GetStringFieldValue(Models.Metadata.Header.DescriptionKey),
GameName = rom.GetFieldValue<Machine>(DatItem.MachineKey)!.GetStringFieldValue(Models.Metadata.Machine.NameKey), GameName = rom.GetFieldValue<Machine>(DatItem.MachineKey)!.GetStringFieldValue(Models.Metadata.Machine.NameKey),
GameDescription = rom.GetFieldValue<Machine>(DatItem.MachineKey)!.GetStringFieldValue(Models.Metadata.Machine.DescriptionKey), GameDescription = rom.GetFieldValue<Machine>(DatItem.MachineKey)!.GetStringFieldValue(Models.Metadata.Machine.DescriptionKey),
Type = rom.GetFieldValue<ItemType>(Models.Metadata.DatItem.TypeKey).AsStringValue<ItemType>(), Type = rom.GetStringFieldValue(Models.Metadata.DatItem.TypeKey).AsEnumValue<ItemType>().AsStringValue(),
RomName = rom.GetName(), RomName = rom.GetName(),
DiskName = string.Empty, DiskName = string.Empty,
Size = rom.GetInt64FieldValue(Models.Metadata.Rom.SizeKey).ToString(), Size = rom.GetInt64FieldValue(Models.Metadata.Rom.SizeKey).ToString(),
@@ -231,7 +231,7 @@ namespace SabreTools.DatFiles.Formats
SHA384 = rom.GetStringFieldValue(Models.Metadata.Rom.SHA384Key), SHA384 = rom.GetStringFieldValue(Models.Metadata.Rom.SHA384Key),
SHA512 = rom.GetStringFieldValue(Models.Metadata.Rom.SHA512Key), SHA512 = rom.GetStringFieldValue(Models.Metadata.Rom.SHA512Key),
SpamSum = rom.GetStringFieldValue(Models.Metadata.Rom.SpamSumKey), SpamSum = rom.GetStringFieldValue(Models.Metadata.Rom.SpamSumKey),
Status = rom.GetFieldValue<ItemStatus>(Models.Metadata.Rom.StatusKey).AsStringValue<ItemStatus>(useSecond: false), Status = rom.GetStringFieldValue(Models.Metadata.Rom.StatusKey).AsEnumValue<ItemStatus>().AsStringValue(useSecond: false),
}; };
return row; return row;
} }

10
SabreTools.DatFiles/Formats/SoftwareList.Writer.cs
View File

@@ -261,7 +261,7 @@ namespace SabreTools.DatFiles.Formats
{ {
Name = machine.GetStringFieldValue(Models.Metadata.Machine.NameKey), Name = machine.GetStringFieldValue(Models.Metadata.Machine.NameKey),
CloneOf = machine.GetStringFieldValue(Models.Metadata.Machine.CloneOfKey), CloneOf = machine.GetStringFieldValue(Models.Metadata.Machine.CloneOfKey),
Supported = machine.GetFieldValue<Supported>(Models.Metadata.Machine.SupportedKey).AsStringValue<Supported>(useSecond: true), Supported = machine.GetStringFieldValue(Models.Metadata.Machine.SupportedKey).AsEnumValue<Supported>().AsStringValue(useSecond: true),
Description = machine.GetStringFieldValue(Models.Metadata.Machine.DescriptionKey), Description = machine.GetStringFieldValue(Models.Metadata.Machine.DescriptionKey),
Year = machine.GetStringFieldValue(Models.Metadata.Machine.YearKey), Year = machine.GetStringFieldValue(Models.Metadata.Machine.YearKey),
Publisher = machine.GetStringFieldValue(Models.Metadata.Machine.PublisherKey), Publisher = machine.GetStringFieldValue(Models.Metadata.Machine.PublisherKey),
@@ -381,7 +381,7 @@ namespace SabreTools.DatFiles.Formats
Name = item.GetFieldValue<DataArea?>(Rom.DataAreaKey)?.GetName(), Name = item.GetFieldValue<DataArea?>(Rom.DataAreaKey)?.GetName(),
Size = item.GetFieldValue<DataArea?>(Rom.DataAreaKey)?.GetInt64FieldValue(Models.Metadata.DataArea.SizeKey)?.ToString(), Size = item.GetFieldValue<DataArea?>(Rom.DataAreaKey)?.GetInt64FieldValue(Models.Metadata.DataArea.SizeKey)?.ToString(),
Width = item.GetFieldValue<DataArea?>(Rom.DataAreaKey)?.GetInt64FieldValue(Models.Metadata.DataArea.WidthKey)?.ToString(), Width = item.GetFieldValue<DataArea?>(Rom.DataAreaKey)?.GetInt64FieldValue(Models.Metadata.DataArea.WidthKey)?.ToString(),
Endianness = item.GetFieldValue<DataArea?>(Rom.DataAreaKey)?.GetFieldValue<Endianness>(Models.Metadata.DataArea.EndiannessKey).AsStringValue<Endianness>(), Endianness = item.GetFieldValue<DataArea?>(Rom.DataAreaKey)?.GetStringFieldValue(Models.Metadata.DataArea.EndiannessKey).AsEnumValue<Endianness>().AsStringValue(),
Rom = CreateRom(item), Rom = CreateRom(item),
}; };
return [dataArea]; return [dataArea];
@@ -401,8 +401,8 @@ namespace SabreTools.DatFiles.Formats
SHA1 = item.GetStringFieldValue(Models.Metadata.Rom.SHA1Key), SHA1 = item.GetStringFieldValue(Models.Metadata.Rom.SHA1Key),
Offset = item.GetStringFieldValue(Models.Metadata.Rom.OffsetKey), Offset = item.GetStringFieldValue(Models.Metadata.Rom.OffsetKey),
Value = item.GetStringFieldValue(Models.Metadata.Rom.ValueKey), Value = item.GetStringFieldValue(Models.Metadata.Rom.ValueKey),
Status = item.GetFieldValue<ItemStatus>(Models.Metadata.Rom.StatusKey).AsStringValue<ItemStatus>(useSecond: false), Status = item.GetStringFieldValue(Models.Metadata.Rom.StatusKey).AsEnumValue<ItemStatus>().AsStringValue(useSecond: false),
LoadFlag = item.GetFieldValue<LoadFlag>(Models.Metadata.Rom.LoadFlagKey).AsStringValue<LoadFlag>(), LoadFlag = item.GetStringFieldValue(Models.Metadata.Rom.LoadFlagKey).AsEnumValue<LoadFlag>().AsStringValue(),
}; };
return [rom]; return [rom];
} }
@@ -429,7 +429,7 @@ namespace SabreTools.DatFiles.Formats
Name = item.GetName(), Name = item.GetName(),
MD5 = item.GetStringFieldValue(Models.Metadata.Disk.MD5Key), MD5 = item.GetStringFieldValue(Models.Metadata.Disk.MD5Key),
SHA1 = item.GetStringFieldValue(Models.Metadata.Disk.SHA1Key), SHA1 = item.GetStringFieldValue(Models.Metadata.Disk.SHA1Key),
Status = item.GetFieldValue<ItemStatus>(Models.Metadata.Disk.StatusKey).AsStringValue<ItemStatus>(useSecond: false), Status = item.GetStringFieldValue(Models.Metadata.Disk.StatusKey).AsEnumValue<ItemStatus>().AsStringValue(useSecond: false),
Writeable = item.GetBoolFieldValue(Models.Metadata.Disk.WritableKey)?.ToString(), Writeable = item.GetBoolFieldValue(Models.Metadata.Disk.WritableKey)?.ToString(),
}; };
return [disk]; return [disk];

44
SabreTools.DatFiles/ItemDictionary.cs
View File

@@ -224,22 +224,22 @@ namespace SabreTools.DatFiles
RemovedCount++; RemovedCount++;
// Increment the item count for the type // Increment the item count for the type
AddItemCount(item.GetFieldValue<ItemType>(Models.Metadata.DatItem.TypeKey)); AddItemCount(item.GetStringFieldValue(Models.Metadata.DatItem.TypeKey).AsEnumValue<ItemType>());
// Some item types require special processing // Some item types require special processing
switch (item) switch (item)
{ {
case Disk disk: case Disk disk:
if (disk.GetFieldValue<ItemStatus>(Models.Metadata.Disk.StatusKey) != ItemStatus.Nodump) if (disk.GetStringFieldValue(Models.Metadata.Disk.StatusKey).AsEnumValue<ItemStatus>() != ItemStatus.Nodump)
{ {
AddHashCount(HashType.MD5, string.IsNullOrEmpty(disk.GetStringFieldValue(Models.Metadata.Disk.MD5Key)) ? 0 : 1); AddHashCount(HashType.MD5, string.IsNullOrEmpty(disk.GetStringFieldValue(Models.Metadata.Disk.MD5Key)) ? 0 : 1);
AddHashCount(HashType.SHA1, string.IsNullOrEmpty(disk.GetStringFieldValue(Models.Metadata.Disk.SHA1Key)) ? 0 : 1); AddHashCount(HashType.SHA1, string.IsNullOrEmpty(disk.GetStringFieldValue(Models.Metadata.Disk.SHA1Key)) ? 0 : 1);
} }
AddStatusCount(ItemStatus.BadDump, disk.GetFieldValue<ItemStatus>(Models.Metadata.Disk.StatusKey) == ItemStatus.BadDump ? 1 : 0); AddStatusCount(ItemStatus.BadDump, disk.GetStringFieldValue(Models.Metadata.Disk.StatusKey).AsEnumValue<ItemStatus>() == ItemStatus.BadDump ? 1 : 0);
AddStatusCount(ItemStatus.Good, disk.GetFieldValue<ItemStatus>(Models.Metadata.Disk.StatusKey) == ItemStatus.Good ? 1 : 0); AddStatusCount(ItemStatus.Good, disk.GetStringFieldValue(Models.Metadata.Disk.StatusKey).AsEnumValue<ItemStatus>() == ItemStatus.Good ? 1 : 0);
AddStatusCount(ItemStatus.Nodump, disk.GetFieldValue<ItemStatus>(Models.Metadata.Disk.StatusKey) == ItemStatus.Nodump ? 1 : 0); AddStatusCount(ItemStatus.Nodump, disk.GetStringFieldValue(Models.Metadata.Disk.StatusKey).AsEnumValue<ItemStatus>() == ItemStatus.Nodump ? 1 : 0);
AddStatusCount(ItemStatus.Verified, disk.GetFieldValue<ItemStatus>(Models.Metadata.Disk.StatusKey) == ItemStatus.Verified ? 1 : 0); AddStatusCount(ItemStatus.Verified, disk.GetStringFieldValue(Models.Metadata.Disk.StatusKey).AsEnumValue<ItemStatus>() == ItemStatus.Verified ? 1 : 0);
break; break;
case Media media: case Media media:
AddHashCount(HashType.MD5, string.IsNullOrEmpty(media.GetStringFieldValue(Models.Metadata.Media.MD5Key)) ? 0 : 1); AddHashCount(HashType.MD5, string.IsNullOrEmpty(media.GetStringFieldValue(Models.Metadata.Media.MD5Key)) ? 0 : 1);
@@ -248,7 +248,7 @@ namespace SabreTools.DatFiles
AddHashCount(HashType.SpamSum, string.IsNullOrEmpty(media.GetStringFieldValue(Models.Metadata.Media.SpamSumKey)) ? 0 : 1); AddHashCount(HashType.SpamSum, string.IsNullOrEmpty(media.GetStringFieldValue(Models.Metadata.Media.SpamSumKey)) ? 0 : 1);
break; break;
case Rom rom: case Rom rom:
if (rom.GetFieldValue<ItemStatus>(Models.Metadata.Rom.StatusKey) != ItemStatus.Nodump) if (rom.GetStringFieldValue(Models.Metadata.Rom.StatusKey).AsEnumValue<ItemStatus>() != ItemStatus.Nodump)
{ {
TotalSize += rom.GetInt64FieldValue(Models.Metadata.Rom.SizeKey) ?? 0; TotalSize += rom.GetInt64FieldValue(Models.Metadata.Rom.SizeKey) ?? 0;
AddHashCount(HashType.CRC32, string.IsNullOrEmpty(rom.GetStringFieldValue(Models.Metadata.Rom.CRCKey)) ? 0 : 1); AddHashCount(HashType.CRC32, string.IsNullOrEmpty(rom.GetStringFieldValue(Models.Metadata.Rom.CRCKey)) ? 0 : 1);
@@ -260,10 +260,10 @@ namespace SabreTools.DatFiles
AddHashCount(HashType.SpamSum, string.IsNullOrEmpty(rom.GetStringFieldValue(Models.Metadata.Rom.SpamSumKey)) ? 0 : 1); AddHashCount(HashType.SpamSum, string.IsNullOrEmpty(rom.GetStringFieldValue(Models.Metadata.Rom.SpamSumKey)) ? 0 : 1);
} }
AddStatusCount(ItemStatus.BadDump, rom.GetFieldValue<ItemStatus>(Models.Metadata.Rom.StatusKey) == ItemStatus.BadDump ? 1 : 0); AddStatusCount(ItemStatus.BadDump, rom.GetStringFieldValue(Models.Metadata.Rom.StatusKey).AsEnumValue<ItemStatus>() == ItemStatus.BadDump ? 1 : 0);
AddStatusCount(ItemStatus.Good, rom.GetFieldValue<ItemStatus>(Models.Metadata.Rom.StatusKey) == ItemStatus.Good ? 1 : 0); AddStatusCount(ItemStatus.Good, rom.GetStringFieldValue(Models.Metadata.Rom.StatusKey).AsEnumValue<ItemStatus>() == ItemStatus.Good ? 1 : 0);
AddStatusCount(ItemStatus.Nodump, rom.GetFieldValue<ItemStatus>(Models.Metadata.Rom.StatusKey) == ItemStatus.Nodump ? 1 : 0); AddStatusCount(ItemStatus.Nodump, rom.GetStringFieldValue(Models.Metadata.Rom.StatusKey).AsEnumValue<ItemStatus>() == ItemStatus.Nodump ? 1 : 0);
AddStatusCount(ItemStatus.Verified, rom.GetFieldValue<ItemStatus>(Models.Metadata.Rom.StatusKey) == ItemStatus.Verified ? 1 : 0); AddStatusCount(ItemStatus.Verified, rom.GetStringFieldValue(Models.Metadata.Rom.StatusKey).AsEnumValue<ItemStatus>() == ItemStatus.Verified ? 1 : 0);
break; break;
} }
} }
@@ -505,22 +505,22 @@ namespace SabreTools.DatFiles
RemovedCount--; RemovedCount--;
// Decrement the item count for the type // Decrement the item count for the type
RemoveItemCount(item.GetFieldValue<ItemType>(Models.Metadata.DatItem.TypeKey)); RemoveItemCount(item.GetStringFieldValue(Models.Metadata.DatItem.TypeKey).AsEnumValue<ItemType>());
// Some item types require special processing // Some item types require special processing
switch (item) switch (item)
{ {
case Disk disk: case Disk disk:
if (disk.GetFieldValue<ItemStatus>(Models.Metadata.Disk.StatusKey) != ItemStatus.Nodump) if (disk.GetStringFieldValue(Models.Metadata.Disk.StatusKey).AsEnumValue<ItemStatus>() != ItemStatus.Nodump)
{ {
RemoveHashCount(HashType.MD5, string.IsNullOrEmpty(disk.GetStringFieldValue(Models.Metadata.Disk.MD5Key)) ? 0 : 1); RemoveHashCount(HashType.MD5, string.IsNullOrEmpty(disk.GetStringFieldValue(Models.Metadata.Disk.MD5Key)) ? 0 : 1);
RemoveHashCount(HashType.SHA1, string.IsNullOrEmpty(disk.GetStringFieldValue(Models.Metadata.Disk.SHA1Key)) ? 0 : 1); RemoveHashCount(HashType.SHA1, string.IsNullOrEmpty(disk.GetStringFieldValue(Models.Metadata.Disk.SHA1Key)) ? 0 : 1);
} }
RemoveStatusCount(ItemStatus.BadDump, disk.GetFieldValue<ItemStatus>(Models.Metadata.Disk.StatusKey) == ItemStatus.BadDump ? 1 : 0); RemoveStatusCount(ItemStatus.BadDump, disk.GetStringFieldValue(Models.Metadata.Disk.StatusKey).AsEnumValue<ItemStatus>() == ItemStatus.BadDump ? 1 : 0);
RemoveStatusCount(ItemStatus.Good, disk.GetFieldValue<ItemStatus>(Models.Metadata.Disk.StatusKey) == ItemStatus.Good ? 1 : 0); RemoveStatusCount(ItemStatus.Good, disk.GetStringFieldValue(Models.Metadata.Disk.StatusKey).AsEnumValue<ItemStatus>() == ItemStatus.Good ? 1 : 0);
RemoveStatusCount(ItemStatus.Nodump, disk.GetFieldValue<ItemStatus>(Models.Metadata.Disk.StatusKey) == ItemStatus.Nodump ? 1 : 0); RemoveStatusCount(ItemStatus.Nodump, disk.GetStringFieldValue(Models.Metadata.Disk.StatusKey).AsEnumValue<ItemStatus>() == ItemStatus.Nodump ? 1 : 0);
RemoveStatusCount(ItemStatus.Verified, disk.GetFieldValue<ItemStatus>(Models.Metadata.Disk.StatusKey) == ItemStatus.Verified ? 1 : 0); RemoveStatusCount(ItemStatus.Verified, disk.GetStringFieldValue(Models.Metadata.Disk.StatusKey).AsEnumValue<ItemStatus>() == ItemStatus.Verified ? 1 : 0);
break; break;
case Media media: case Media media:
RemoveHashCount(HashType.MD5, string.IsNullOrEmpty(media.GetStringFieldValue(Models.Metadata.Media.MD5Key)) ? 0 : 1); RemoveHashCount(HashType.MD5, string.IsNullOrEmpty(media.GetStringFieldValue(Models.Metadata.Media.MD5Key)) ? 0 : 1);
@@ -529,7 +529,7 @@ namespace SabreTools.DatFiles
RemoveHashCount(HashType.SpamSum, string.IsNullOrEmpty(media.GetStringFieldValue(Models.Metadata.Media.SpamSumKey)) ? 0 : 1); RemoveHashCount(HashType.SpamSum, string.IsNullOrEmpty(media.GetStringFieldValue(Models.Metadata.Media.SpamSumKey)) ? 0 : 1);
break; break;
case Rom rom: case Rom rom:
if (rom.GetFieldValue<ItemStatus>(Models.Metadata.Rom.StatusKey) != ItemStatus.Nodump) if (rom.GetStringFieldValue(Models.Metadata.Rom.StatusKey).AsEnumValue<ItemStatus>() != ItemStatus.Nodump)
{ {
TotalSize -= rom.GetInt64FieldValue(Models.Metadata.Rom.SizeKey) ?? 0; TotalSize -= rom.GetInt64FieldValue(Models.Metadata.Rom.SizeKey) ?? 0;
RemoveHashCount(HashType.CRC32, string.IsNullOrEmpty(rom.GetStringFieldValue(Models.Metadata.Rom.CRCKey)) ? 0 : 1); RemoveHashCount(HashType.CRC32, string.IsNullOrEmpty(rom.GetStringFieldValue(Models.Metadata.Rom.CRCKey)) ? 0 : 1);
@@ -541,10 +541,10 @@ namespace SabreTools.DatFiles
RemoveHashCount(HashType.SpamSum, string.IsNullOrEmpty(rom.GetStringFieldValue(Models.Metadata.Rom.SpamSumKey)) ? 0 : 1); RemoveHashCount(HashType.SpamSum, string.IsNullOrEmpty(rom.GetStringFieldValue(Models.Metadata.Rom.SpamSumKey)) ? 0 : 1);
} }
RemoveStatusCount(ItemStatus.BadDump, rom.GetFieldValue<ItemStatus>(Models.Metadata.Rom.StatusKey) == ItemStatus.BadDump ? 1 : 0); RemoveStatusCount(ItemStatus.BadDump, rom.GetStringFieldValue(Models.Metadata.Rom.StatusKey).AsEnumValue<ItemStatus>() == ItemStatus.BadDump ? 1 : 0);
RemoveStatusCount(ItemStatus.Good, rom.GetFieldValue<ItemStatus>(Models.Metadata.Rom.StatusKey) == ItemStatus.Good ? 1 : 0); RemoveStatusCount(ItemStatus.Good, rom.GetStringFieldValue(Models.Metadata.Rom.StatusKey).AsEnumValue<ItemStatus>() == ItemStatus.Good ? 1 : 0);
RemoveStatusCount(ItemStatus.Nodump, rom.GetFieldValue<ItemStatus>(Models.Metadata.Rom.StatusKey) == ItemStatus.Nodump ? 1 : 0); RemoveStatusCount(ItemStatus.Nodump, rom.GetStringFieldValue(Models.Metadata.Rom.StatusKey).AsEnumValue<ItemStatus>() == ItemStatus.Nodump ? 1 : 0);
RemoveStatusCount(ItemStatus.Verified, rom.GetFieldValue<ItemStatus>(Models.Metadata.Rom.StatusKey) == ItemStatus.Verified ? 1 : 0); RemoveStatusCount(ItemStatus.Verified, rom.GetStringFieldValue(Models.Metadata.Rom.StatusKey).AsEnumValue<ItemStatus>() == ItemStatus.Verified ? 1 : 0);
break; break;
} }
} }

44
SabreTools.DatFiles/ItemDictionaryDB.cs
View File

@@ -341,22 +341,22 @@ namespace SabreTools.DatFiles
RemovedCount++; RemovedCount++;
// Increment the item count for the type // Increment the item count for the type
AddItemCount(item.GetFieldValue<ItemType>(Models.Metadata.DatItem.TypeKey)); AddItemCount(item.GetStringFieldValue(Models.Metadata.DatItem.TypeKey).AsEnumValue<ItemType>());
// Some item types require special processing // Some item types require special processing
switch (item) switch (item)
{ {
case Disk disk: case Disk disk:
if (disk.GetFieldValue<ItemStatus>(Models.Metadata.Disk.StatusKey) != ItemStatus.Nodump) if (disk.GetStringFieldValue(Models.Metadata.Disk.StatusKey).AsEnumValue<ItemStatus>() != ItemStatus.Nodump)
{ {
AddHashCount(HashType.MD5, string.IsNullOrEmpty(disk.GetStringFieldValue(Models.Metadata.Disk.MD5Key)) ? 0 : 1); AddHashCount(HashType.MD5, string.IsNullOrEmpty(disk.GetStringFieldValue(Models.Metadata.Disk.MD5Key)) ? 0 : 1);
AddHashCount(HashType.SHA1, string.IsNullOrEmpty(disk.GetStringFieldValue(Models.Metadata.Disk.SHA1Key)) ? 0 : 1); AddHashCount(HashType.SHA1, string.IsNullOrEmpty(disk.GetStringFieldValue(Models.Metadata.Disk.SHA1Key)) ? 0 : 1);
} }
AddStatusCount(ItemStatus.BadDump, disk.GetFieldValue<ItemStatus>(Models.Metadata.Disk.StatusKey) == ItemStatus.BadDump ? 1 : 0); AddStatusCount(ItemStatus.BadDump, disk.GetStringFieldValue(Models.Metadata.Disk.StatusKey).AsEnumValue<ItemStatus>() == ItemStatus.BadDump ? 1 : 0);
AddStatusCount(ItemStatus.Good, disk.GetFieldValue<ItemStatus>(Models.Metadata.Disk.StatusKey) == ItemStatus.Good ? 1 : 0); AddStatusCount(ItemStatus.Good, disk.GetStringFieldValue(Models.Metadata.Disk.StatusKey).AsEnumValue<ItemStatus>() == ItemStatus.Good ? 1 : 0);
AddStatusCount(ItemStatus.Nodump, disk.GetFieldValue<ItemStatus>(Models.Metadata.Disk.StatusKey) == ItemStatus.Nodump ? 1 : 0); AddStatusCount(ItemStatus.Nodump, disk.GetStringFieldValue(Models.Metadata.Disk.StatusKey).AsEnumValue<ItemStatus>() == ItemStatus.Nodump ? 1 : 0);
AddStatusCount(ItemStatus.Verified, disk.GetFieldValue<ItemStatus>(Models.Metadata.Disk.StatusKey) == ItemStatus.Verified ? 1 : 0); AddStatusCount(ItemStatus.Verified, disk.GetStringFieldValue(Models.Metadata.Disk.StatusKey).AsEnumValue<ItemStatus>() == ItemStatus.Verified ? 1 : 0);
break; break;
case Media media: case Media media:
AddHashCount(HashType.MD5, string.IsNullOrEmpty(media.GetStringFieldValue(Models.Metadata.Media.MD5Key)) ? 0 : 1); AddHashCount(HashType.MD5, string.IsNullOrEmpty(media.GetStringFieldValue(Models.Metadata.Media.MD5Key)) ? 0 : 1);
@@ -365,7 +365,7 @@ namespace SabreTools.DatFiles
AddHashCount(HashType.SpamSum, string.IsNullOrEmpty(media.GetStringFieldValue(Models.Metadata.Media.SpamSumKey)) ? 0 : 1); AddHashCount(HashType.SpamSum, string.IsNullOrEmpty(media.GetStringFieldValue(Models.Metadata.Media.SpamSumKey)) ? 0 : 1);
break; break;
case Rom rom: case Rom rom:
if (rom.GetFieldValue<ItemStatus>(Models.Metadata.Rom.StatusKey) != ItemStatus.Nodump) if (rom.GetStringFieldValue(Models.Metadata.Rom.StatusKey).AsEnumValue<ItemStatus>() != ItemStatus.Nodump)
{ {
TotalSize += rom.GetInt64FieldValue(Models.Metadata.Rom.SizeKey) ?? 0; TotalSize += rom.GetInt64FieldValue(Models.Metadata.Rom.SizeKey) ?? 0;
AddHashCount(HashType.CRC32, string.IsNullOrEmpty(rom.GetStringFieldValue(Models.Metadata.Rom.CRCKey)) ? 0 : 1); AddHashCount(HashType.CRC32, string.IsNullOrEmpty(rom.GetStringFieldValue(Models.Metadata.Rom.CRCKey)) ? 0 : 1);
@@ -377,10 +377,10 @@ namespace SabreTools.DatFiles
AddHashCount(HashType.SpamSum, string.IsNullOrEmpty(rom.GetStringFieldValue(Models.Metadata.Rom.SpamSumKey)) ? 0 : 1); AddHashCount(HashType.SpamSum, string.IsNullOrEmpty(rom.GetStringFieldValue(Models.Metadata.Rom.SpamSumKey)) ? 0 : 1);
} }
AddStatusCount(ItemStatus.BadDump, rom.GetFieldValue<ItemStatus>(Models.Metadata.Rom.StatusKey) == ItemStatus.BadDump ? 1 : 0); AddStatusCount(ItemStatus.BadDump, rom.GetStringFieldValue(Models.Metadata.Rom.StatusKey).AsEnumValue<ItemStatus>() == ItemStatus.BadDump ? 1 : 0);
AddStatusCount(ItemStatus.Good, rom.GetFieldValue<ItemStatus>(Models.Metadata.Rom.StatusKey) == ItemStatus.Good ? 1 : 0); AddStatusCount(ItemStatus.Good, rom.GetStringFieldValue(Models.Metadata.Rom.StatusKey).AsEnumValue<ItemStatus>() == ItemStatus.Good ? 1 : 0);
AddStatusCount(ItemStatus.Nodump, rom.GetFieldValue<ItemStatus>(Models.Metadata.Rom.StatusKey) == ItemStatus.Nodump ? 1 : 0); AddStatusCount(ItemStatus.Nodump, rom.GetStringFieldValue(Models.Metadata.Rom.StatusKey).AsEnumValue<ItemStatus>() == ItemStatus.Nodump ? 1 : 0);
AddStatusCount(ItemStatus.Verified, rom.GetFieldValue<ItemStatus>(Models.Metadata.Rom.StatusKey) == ItemStatus.Verified ? 1 : 0); AddStatusCount(ItemStatus.Verified, rom.GetStringFieldValue(Models.Metadata.Rom.StatusKey).AsEnumValue<ItemStatus>() == ItemStatus.Verified ? 1 : 0);
break; break;
} }
} }
@@ -649,22 +649,22 @@ namespace SabreTools.DatFiles
RemovedCount--; RemovedCount--;
// Decrement the item count for the type // Decrement the item count for the type
RemoveItemCount(item.GetFieldValue<ItemType>(Models.Metadata.DatItem.TypeKey)); RemoveItemCount(item.GetStringFieldValue(Models.Metadata.DatItem.TypeKey).AsEnumValue<ItemType>());
// Some item types require special processing // Some item types require special processing
switch (item) switch (item)
{ {
case Disk disk: case Disk disk:
if (disk.GetFieldValue<ItemStatus>(Models.Metadata.Disk.StatusKey) != ItemStatus.Nodump) if (disk.GetStringFieldValue(Models.Metadata.Disk.StatusKey).AsEnumValue<ItemStatus>() != ItemStatus.Nodump)
{ {
RemoveHashCount(HashType.MD5, string.IsNullOrEmpty(disk.GetStringFieldValue(Models.Metadata.Disk.MD5Key)) ? 0 : 1); RemoveHashCount(HashType.MD5, string.IsNullOrEmpty(disk.GetStringFieldValue(Models.Metadata.Disk.MD5Key)) ? 0 : 1);
RemoveHashCount(HashType.SHA1, string.IsNullOrEmpty(disk.GetStringFieldValue(Models.Metadata.Disk.SHA1Key)) ? 0 : 1); RemoveHashCount(HashType.SHA1, string.IsNullOrEmpty(disk.GetStringFieldValue(Models.Metadata.Disk.SHA1Key)) ? 0 : 1);
} }
RemoveStatusCount(ItemStatus.BadDump, disk.GetFieldValue<ItemStatus>(Models.Metadata.Disk.StatusKey) == ItemStatus.BadDump ? 1 : 0); RemoveStatusCount(ItemStatus.BadDump, disk.GetStringFieldValue(Models.Metadata.Disk.StatusKey).AsEnumValue<ItemStatus>() == ItemStatus.BadDump ? 1 : 0);
RemoveStatusCount(ItemStatus.Good, disk.GetFieldValue<ItemStatus>(Models.Metadata.Disk.StatusKey) == ItemStatus.Good ? 1 : 0); RemoveStatusCount(ItemStatus.Good, disk.GetStringFieldValue(Models.Metadata.Disk.StatusKey).AsEnumValue<ItemStatus>() == ItemStatus.Good ? 1 : 0);
RemoveStatusCount(ItemStatus.Nodump, disk.GetFieldValue<ItemStatus>(Models.Metadata.Disk.StatusKey) == ItemStatus.Nodump ? 1 : 0); RemoveStatusCount(ItemStatus.Nodump, disk.GetStringFieldValue(Models.Metadata.Disk.StatusKey).AsEnumValue<ItemStatus>() == ItemStatus.Nodump ? 1 : 0);
RemoveStatusCount(ItemStatus.Verified, disk.GetFieldValue<ItemStatus>(Models.Metadata.Disk.StatusKey) == ItemStatus.Verified ? 1 : 0); RemoveStatusCount(ItemStatus.Verified, disk.GetStringFieldValue(Models.Metadata.Disk.StatusKey).AsEnumValue<ItemStatus>() == ItemStatus.Verified ? 1 : 0);
break; break;
case Media media: case Media media:
RemoveHashCount(HashType.MD5, string.IsNullOrEmpty(media.GetStringFieldValue(Models.Metadata.Media.MD5Key)) ? 0 : 1); RemoveHashCount(HashType.MD5, string.IsNullOrEmpty(media.GetStringFieldValue(Models.Metadata.Media.MD5Key)) ? 0 : 1);
@@ -673,7 +673,7 @@ namespace SabreTools.DatFiles
RemoveHashCount(HashType.SpamSum, string.IsNullOrEmpty(media.GetStringFieldValue(Models.Metadata.Media.SpamSumKey)) ? 0 : 1); RemoveHashCount(HashType.SpamSum, string.IsNullOrEmpty(media.GetStringFieldValue(Models.Metadata.Media.SpamSumKey)) ? 0 : 1);
break; break;
case Rom rom: case Rom rom:
if (rom.GetFieldValue<ItemStatus>(Models.Metadata.Rom.StatusKey) != ItemStatus.Nodump) if (rom.GetStringFieldValue(Models.Metadata.Rom.StatusKey).AsEnumValue<ItemStatus>() != ItemStatus.Nodump)
{ {
TotalSize -= rom.GetInt64FieldValue(Models.Metadata.Rom.SizeKey) ?? 0; TotalSize -= rom.GetInt64FieldValue(Models.Metadata.Rom.SizeKey) ?? 0;
RemoveHashCount(HashType.CRC32, string.IsNullOrEmpty(rom.GetStringFieldValue(Models.Metadata.Rom.CRCKey)) ? 0 : 1); RemoveHashCount(HashType.CRC32, string.IsNullOrEmpty(rom.GetStringFieldValue(Models.Metadata.Rom.CRCKey)) ? 0 : 1);
@@ -685,10 +685,10 @@ namespace SabreTools.DatFiles
RemoveHashCount(HashType.SpamSum, string.IsNullOrEmpty(rom.GetStringFieldValue(Models.Metadata.Rom.SpamSumKey)) ? 0 : 1); RemoveHashCount(HashType.SpamSum, string.IsNullOrEmpty(rom.GetStringFieldValue(Models.Metadata.Rom.SpamSumKey)) ? 0 : 1);
} }
RemoveStatusCount(ItemStatus.BadDump, rom.GetFieldValue<ItemStatus>(Models.Metadata.Rom.StatusKey) == ItemStatus.BadDump ? 1 : 0); RemoveStatusCount(ItemStatus.BadDump, rom.GetStringFieldValue(Models.Metadata.Rom.StatusKey).AsEnumValue<ItemStatus>() == ItemStatus.BadDump ? 1 : 0);
RemoveStatusCount(ItemStatus.Good, rom.GetFieldValue<ItemStatus>(Models.Metadata.Rom.StatusKey) == ItemStatus.Good ? 1 : 0); RemoveStatusCount(ItemStatus.Good, rom.GetStringFieldValue(Models.Metadata.Rom.StatusKey).AsEnumValue<ItemStatus>() == ItemStatus.Good ? 1 : 0);
RemoveStatusCount(ItemStatus.Nodump, rom.GetFieldValue<ItemStatus>(Models.Metadata.Rom.StatusKey) == ItemStatus.Nodump ? 1 : 0); RemoveStatusCount(ItemStatus.Nodump, rom.GetStringFieldValue(Models.Metadata.Rom.StatusKey).AsEnumValue<ItemStatus>() == ItemStatus.Nodump ? 1 : 0);
RemoveStatusCount(ItemStatus.Verified, rom.GetFieldValue<ItemStatus>(Models.Metadata.Rom.StatusKey) == ItemStatus.Verified ? 1 : 0); RemoveStatusCount(ItemStatus.Verified, rom.GetStringFieldValue(Models.Metadata.Rom.StatusKey).AsEnumValue<ItemStatus>() == ItemStatus.Verified ? 1 : 0);
break; break;
} }
} }

2
SabreTools.DatFiles/Setter.cs
View File

@@ -190,7 +190,7 @@ namespace SabreTools.DatFiles
return; return;
// If there are no field names for this type or generic, return // If there are no field names for this type or generic, return
string? itemType = datItem.GetFieldValue<ItemType>(Models.Metadata.DatItem.TypeKey).AsStringValue<ItemType>(); string? itemType = datItem.GetStringFieldValue(Models.Metadata.DatItem.TypeKey).AsEnumValue<ItemType>().AsStringValue();
if (itemType == null || (!ItemFieldMappings.Keys.Any(kvp => kvp.Item1 == itemType) && !ItemFieldMappings.Keys.Any(kvp => kvp.Item1 == "item"))) if (itemType == null || (!ItemFieldMappings.Keys.Any(kvp => kvp.Item1 == itemType) && !ItemFieldMappings.Keys.Any(kvp => kvp.Item1 == "item")))
return; return;

16
SabreTools.DatItems/DatItem.cs
View File

@@ -326,7 +326,7 @@ namespace SabreTools.DatItems
public virtual bool Equals(DatItem? other) public virtual bool Equals(DatItem? other)
{ {
// If we don't have a matched type, return false // If we don't have a matched type, return false
if (GetFieldValue<ItemType>(Models.Metadata.DatItem.TypeKey) != other?.GetFieldValue<ItemType>(Models.Metadata.DatItem.TypeKey)) if (GetStringFieldValue(Models.Metadata.DatItem.TypeKey).AsEnumValue<ItemType>() != other?.GetStringFieldValue(Models.Metadata.DatItem.TypeKey).AsEnumValue<ItemType>())
return false; return false;
// Compare the internal models // Compare the internal models
@@ -528,13 +528,13 @@ namespace SabreTools.DatItems
} }
// If it's a nodump, add and skip // If it's a nodump, add and skip
if (item is Rom rom && rom.GetFieldValue<ItemStatus>(Models.Metadata.Rom.StatusKey) == ItemStatus.Nodump) if (item is Rom rom && rom.GetStringFieldValue(Models.Metadata.Rom.StatusKey).AsEnumValue<ItemStatus>() == ItemStatus.Nodump)
{ {
outfiles.Add(item); outfiles.Add(item);
nodumpCount++; nodumpCount++;
continue; continue;
} }
else if (item is Disk disk && disk.GetFieldValue<ItemStatus>(Models.Metadata.Disk.StatusKey) == ItemStatus.Nodump) else if (item is Disk disk && disk.GetStringFieldValue(Models.Metadata.Disk.StatusKey).AsEnumValue<ItemStatus>() == ItemStatus.Nodump)
{ {
outfiles.Add(item); outfiles.Add(item);
nodumpCount++; nodumpCount++;
@@ -643,10 +643,10 @@ namespace SabreTools.DatItems
} }
// Get the last item name, if applicable // Get the last item name, if applicable
string lastItemName = lastItem.GetName() ?? lastItem.GetFieldValue<ItemType>(Models.Metadata.DatItem.TypeKey).ToString(); string lastItemName = lastItem.GetName() ?? lastItem.GetStringFieldValue(Models.Metadata.DatItem.TypeKey).AsEnumValue<ItemType>().AsStringValue() ?? string.Empty;
// Get the current item name, if applicable // Get the current item name, if applicable
string datItemName = datItem.GetName() ?? datItem.GetFieldValue<ItemType>(Models.Metadata.DatItem.TypeKey).ToString(); string datItemName = datItem.GetName() ?? datItem.GetStringFieldValue(Models.Metadata.DatItem.TypeKey).AsEnumValue<ItemType>().AsStringValue() ?? string.Empty;
// If the current item exactly matches the last item, then we don't add it // If the current item exactly matches the last item, then we don't add it
#if NETFRAMEWORK #if NETFRAMEWORK
@@ -739,7 +739,7 @@ namespace SabreTools.DatItems
if (x.GetFieldValue<Machine>(DatItem.MachineKey)!.GetStringFieldValue(Models.Metadata.Machine.NameKey) == y.GetFieldValue<Machine>(DatItem.MachineKey)!.GetStringFieldValue(Models.Metadata.Machine.NameKey)) if (x.GetFieldValue<Machine>(DatItem.MachineKey)!.GetStringFieldValue(Models.Metadata.Machine.NameKey) == y.GetFieldValue<Machine>(DatItem.MachineKey)!.GetStringFieldValue(Models.Metadata.Machine.NameKey))
{ {
// If item types match, more refinement is needed // If item types match, more refinement is needed
if (x.GetFieldValue<ItemType>(Models.Metadata.DatItem.TypeKey) == y.GetFieldValue<ItemType>(Models.Metadata.DatItem.TypeKey)) if (x.GetStringFieldValue(Models.Metadata.DatItem.TypeKey) == y.GetStringFieldValue(Models.Metadata.DatItem.TypeKey))
{ {
string? xDirectoryName = Path.GetDirectoryName(TextHelper.RemovePathUnsafeCharacters(x.GetName() ?? string.Empty)); string? xDirectoryName = Path.GetDirectoryName(TextHelper.RemovePathUnsafeCharacters(x.GetName() ?? string.Empty));
string? yDirectoryName = Path.GetDirectoryName(TextHelper.RemovePathUnsafeCharacters(y.GetName() ?? string.Empty)); string? yDirectoryName = Path.GetDirectoryName(TextHelper.RemovePathUnsafeCharacters(y.GetName() ?? string.Empty));
@@ -763,7 +763,7 @@ namespace SabreTools.DatItems
} }
// Otherwise, just sort based on item type // Otherwise, just sort based on item type
return x.GetFieldValue<ItemType>(Models.Metadata.DatItem.TypeKey) - y.GetFieldValue<ItemType>(Models.Metadata.DatItem.TypeKey); return x.GetStringFieldValue(Models.Metadata.DatItem.TypeKey).AsEnumValue<ItemType>() - y.GetStringFieldValue(Models.Metadata.DatItem.TypeKey).AsEnumValue<ItemType>();
} }
// Otherwise, just sort based on machine name // Otherwise, just sort based on machine name
@@ -891,7 +891,7 @@ namespace SabreTools.DatItems
public virtual bool Equals(DatItem<T>? other) public virtual bool Equals(DatItem<T>? other)
{ {
// If we don't have a matched type, return false // If we don't have a matched type, return false
if (GetFieldValue<ItemType>(Models.Metadata.DatItem.TypeKey) != other?.GetFieldValue<ItemType>(Models.Metadata.DatItem.TypeKey)) if (GetStringFieldValue(Models.Metadata.DatItem.TypeKey).AsEnumValue<ItemType>() != other?.GetStringFieldValue(Models.Metadata.DatItem.TypeKey).AsEnumValue<ItemType>())
return false; return false;
// Compare the internal models // Compare the internal models

5
SabreTools.DatItems/Formats/Blank.cs
View File

@@ -1,6 +1,7 @@
using System.Xml.Serialization; using System.Xml.Serialization;
using Newtonsoft.Json; using Newtonsoft.Json;
using SabreTools.Core; using SabreTools.Core;
using SabreTools.Core.Tools;
namespace SabreTools.DatItems.Formats namespace SabreTools.DatItems.Formats
{ {
@@ -38,7 +39,7 @@ namespace SabreTools.DatItems.Formats
blank.SetFieldValue<Machine>(DatItem.MachineKey, GetFieldValue<Machine>(DatItem.MachineKey)); blank.SetFieldValue<Machine>(DatItem.MachineKey, GetFieldValue<Machine>(DatItem.MachineKey));
blank.SetFieldValue<bool?>(DatItem.RemoveKey, GetBoolFieldValue(DatItem.RemoveKey)); blank.SetFieldValue<bool?>(DatItem.RemoveKey, GetBoolFieldValue(DatItem.RemoveKey));
blank.SetFieldValue<Source?>(DatItem.SourceKey, GetFieldValue<Source?>(DatItem.SourceKey)); blank.SetFieldValue<Source?>(DatItem.SourceKey, GetFieldValue<Source?>(DatItem.SourceKey));
blank.SetFieldValue<ItemType>(Models.Metadata.DatItem.TypeKey, GetFieldValue<ItemType>(Models.Metadata.DatItem.TypeKey)); blank.SetFieldValue<string?>(Models.Metadata.DatItem.TypeKey, GetStringFieldValue(Models.Metadata.DatItem.TypeKey).AsEnumValue<ItemType>().AsStringValue());
return blank; return blank;
} }
@@ -51,7 +52,7 @@ namespace SabreTools.DatItems.Formats
public override bool Equals(DatItem? other) public override bool Equals(DatItem? other)
{ {
// If we don't have a blank, return false // If we don't have a blank, return false
if (GetFieldValue<ItemType>(Models.Metadata.DatItem.TypeKey) != other?.GetFieldValue<ItemType>(Models.Metadata.DatItem.TypeKey)) if (GetStringFieldValue(Models.Metadata.DatItem.TypeKey) != other?.GetStringFieldValue(Models.Metadata.DatItem.TypeKey))
return false; return false;
// Otherwise, treat it as a Blank // Otherwise, treat it as a Blank

2
SabreTools.DatItems/Formats/File.cs
View File

@@ -192,7 +192,7 @@ namespace SabreTools.DatItems.Formats
bool dupefound = false; bool dupefound = false;
// If we don't have a file, return false // If we don't have a file, return false
if (GetFieldValue<ItemType>(Models.Metadata.DatItem.TypeKey) != other?.GetFieldValue<ItemType>(Models.Metadata.DatItem.TypeKey)) if (GetStringFieldValue(Models.Metadata.DatItem.TypeKey) != other?.GetStringFieldValue(Models.Metadata.DatItem.TypeKey))
return dupefound; return dupefound;
// Otherwise, treat it as a File // Otherwise, treat it as a File

5
SabreTools.DatItems/Formats/ReleaseDetails.cs
View File

@@ -1,6 +1,7 @@
using System.Xml.Serialization; using System.Xml.Serialization;
using Newtonsoft.Json; using Newtonsoft.Json;
using SabreTools.Core; using SabreTools.Core;
using SabreTools.Core.Tools;
// TODO: Add item mappings for all fields // TODO: Add item mappings for all fields
namespace SabreTools.DatItems.Formats namespace SabreTools.DatItems.Formats
@@ -148,7 +149,7 @@ namespace SabreTools.DatItems.Formats
releaseDetails.SetFieldValue<Machine>(DatItem.MachineKey, GetFieldValue<Machine>(DatItem.MachineKey)); releaseDetails.SetFieldValue<Machine>(DatItem.MachineKey, GetFieldValue<Machine>(DatItem.MachineKey));
releaseDetails.SetFieldValue<bool?>(DatItem.RemoveKey, GetBoolFieldValue(DatItem.RemoveKey)); releaseDetails.SetFieldValue<bool?>(DatItem.RemoveKey, GetBoolFieldValue(DatItem.RemoveKey));
releaseDetails.SetFieldValue<Source?>(DatItem.SourceKey, GetFieldValue<Source?>(DatItem.SourceKey)); releaseDetails.SetFieldValue<Source?>(DatItem.SourceKey, GetFieldValue<Source?>(DatItem.SourceKey));
releaseDetails.SetFieldValue<ItemType>(Models.Metadata.DatItem.TypeKey, GetFieldValue<ItemType>(Models.Metadata.DatItem.TypeKey)); releaseDetails.SetFieldValue<string?>(Models.Metadata.DatItem.TypeKey, GetStringFieldValue(Models.Metadata.DatItem.TypeKey).AsEnumValue<ItemType>().AsStringValue());
return releaseDetails; return releaseDetails;
} }
@@ -161,7 +162,7 @@ namespace SabreTools.DatItems.Formats
public override bool Equals(DatItem? other) public override bool Equals(DatItem? other)
{ {
// If we don't have a Details, return false // If we don't have a Details, return false
if (GetFieldValue<ItemType>(Models.Metadata.DatItem.TypeKey) != other?.GetFieldValue<ItemType>(Models.Metadata.DatItem.TypeKey)) if (GetStringFieldValue(Models.Metadata.DatItem.TypeKey) != other?.GetStringFieldValue(Models.Metadata.DatItem.TypeKey))
return false; return false;
// Otherwise, treat it as a Details // Otherwise, treat it as a Details

2
SabreTools.DatItems/Formats/Rom.cs
View File

@@ -39,7 +39,7 @@ namespace SabreTools.DatItems.Formats
{ {
get get
{ {
var status = GetFieldValue<ItemStatus>(Models.Metadata.Rom.StatusKey); var status = GetStringFieldValue(Models.Metadata.Rom.StatusKey).AsEnumValue<ItemStatus>();
return status != ItemStatus.NULL && status != ItemStatus.None; return status != ItemStatus.NULL && status != ItemStatus.None;
} }
} }

5
SabreTools.DatItems/Formats/Serials.cs
View File

@@ -1,6 +1,7 @@
using System.Xml.Serialization; using System.Xml.Serialization;
using Newtonsoft.Json; using Newtonsoft.Json;
using SabreTools.Core; using SabreTools.Core;
using SabreTools.Core.Tools;
// TODO: Add item mappings for all fields // TODO: Add item mappings for all fields
namespace SabreTools.DatItems.Formats namespace SabreTools.DatItems.Formats
@@ -140,7 +141,7 @@ namespace SabreTools.DatItems.Formats
serials.SetFieldValue<Machine>(DatItem.MachineKey, GetFieldValue<Machine>(DatItem.MachineKey)); serials.SetFieldValue<Machine>(DatItem.MachineKey, GetFieldValue<Machine>(DatItem.MachineKey));
serials.SetFieldValue<bool?>(DatItem.RemoveKey, GetBoolFieldValue(DatItem.RemoveKey)); serials.SetFieldValue<bool?>(DatItem.RemoveKey, GetBoolFieldValue(DatItem.RemoveKey));
serials.SetFieldValue<Source?>(DatItem.SourceKey, GetFieldValue<Source?>(DatItem.SourceKey)); serials.SetFieldValue<Source?>(DatItem.SourceKey, GetFieldValue<Source?>(DatItem.SourceKey));
serials.SetFieldValue<ItemType>(Models.Metadata.DatItem.TypeKey, GetFieldValue<ItemType>(Models.Metadata.DatItem.TypeKey)); serials.SetFieldValue<string?>(Models.Metadata.DatItem.TypeKey, GetStringFieldValue(Models.Metadata.DatItem.TypeKey).AsEnumValue<ItemType>().AsStringValue());
return serials; return serials;
} }
@@ -153,7 +154,7 @@ namespace SabreTools.DatItems.Formats
public override bool Equals(DatItem? other) public override bool Equals(DatItem? other)
{ {
// If we don't have a Serials, return false // If we don't have a Serials, return false
if (GetFieldValue<ItemType>(Models.Metadata.DatItem.TypeKey) != other?.GetFieldValue<ItemType>(Models.Metadata.DatItem.TypeKey)) if (GetStringFieldValue(Models.Metadata.DatItem.TypeKey) != other?.GetStringFieldValue(Models.Metadata.DatItem.TypeKey))
return false; return false;
// Otherwise, treat it as a Serials // Otherwise, treat it as a Serials

5
SabreTools.DatItems/Formats/SourceDetails.cs
View File

@@ -1,6 +1,7 @@
using System.Xml.Serialization; using System.Xml.Serialization;
using Newtonsoft.Json; using Newtonsoft.Json;
using SabreTools.Core; using SabreTools.Core;
using SabreTools.Core.Tools;
// TODO: Add item mappings for all fields // TODO: Add item mappings for all fields
namespace SabreTools.DatItems.Formats namespace SabreTools.DatItems.Formats
@@ -183,7 +184,7 @@ namespace SabreTools.DatItems.Formats
sourceDetails.SetFieldValue<Machine>(DatItem.MachineKey, GetFieldValue<Machine>(DatItem.MachineKey)); sourceDetails.SetFieldValue<Machine>(DatItem.MachineKey, GetFieldValue<Machine>(DatItem.MachineKey));
sourceDetails.SetFieldValue<bool?>(DatItem.RemoveKey, GetBoolFieldValue(DatItem.RemoveKey)); sourceDetails.SetFieldValue<bool?>(DatItem.RemoveKey, GetBoolFieldValue(DatItem.RemoveKey));
sourceDetails.SetFieldValue<Source?>(DatItem.SourceKey, GetFieldValue<Source?>(DatItem.SourceKey)); sourceDetails.SetFieldValue<Source?>(DatItem.SourceKey, GetFieldValue<Source?>(DatItem.SourceKey));
sourceDetails.SetFieldValue<ItemType>(Models.Metadata.DatItem.TypeKey, GetFieldValue<ItemType>(Models.Metadata.DatItem.TypeKey)); sourceDetails.SetFieldValue<string?>(Models.Metadata.DatItem.TypeKey, GetStringFieldValue(Models.Metadata.DatItem.TypeKey).AsEnumValue<ItemType>().AsStringValue());
return sourceDetails; return sourceDetails;
} }
@@ -196,7 +197,7 @@ namespace SabreTools.DatItems.Formats
public override bool Equals(DatItem? other) public override bool Equals(DatItem? other)
{ {
// If we don't have a SourceDetails, return false // If we don't have a SourceDetails, return false
if (GetFieldValue<ItemType>(Models.Metadata.DatItem.TypeKey) != other?.GetFieldValue<ItemType>(Models.Metadata.DatItem.TypeKey)) if (GetStringFieldValue(Models.Metadata.DatItem.TypeKey) != other?.GetStringFieldValue(Models.Metadata.DatItem.TypeKey))
return false; return false;
// Otherwise, treat it as a SourceDetails // Otherwise, treat it as a SourceDetails

3
SabreTools.DatTools/DatFromDir.cs
View File

@@ -6,6 +6,7 @@ using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
#endif #endif
using SabreTools.Core; using SabreTools.Core;
using SabreTools.Core.Tools;
using SabreTools.DatFiles; using SabreTools.DatFiles;
using SabreTools.DatItems; using SabreTools.DatItems;
using SabreTools.DatItems.Formats; using SabreTools.DatItems.Formats;
@@ -416,7 +417,7 @@ namespace SabreTools.DatTools
{ {
// If we didn't get an accepted parsed type somehow, cancel out // If we didn't get an accepted parsed type somehow, cancel out
List<ItemType> parsed = [ItemType.Disk, ItemType.File, ItemType.Media, ItemType.Rom]; List<ItemType> parsed = [ItemType.Disk, ItemType.File, ItemType.Media, ItemType.Rom];
if (!parsed.Contains(datItem.GetFieldValue<ItemType>(Models.Metadata.DatItem.TypeKey))) if (!parsed.Contains(datItem.GetStringFieldValue(Models.Metadata.DatItem.TypeKey).AsEnumValue<ItemType>()))
return; return;
try try

12
SabreTools.DatTools/Rebuilder.cs
View File

@@ -157,11 +157,11 @@ namespace SabreTools.DatTools
// Otherwise, we rebuild that file to all locations that we need to // Otherwise, we rebuild that file to all locations that we need to
bool usedInternally; bool usedInternally;
if (items[0].GetFieldValue<ItemType>(Models.Metadata.DatItem.TypeKey) == ItemType.Disk) if (items[0].GetStringFieldValue(Models.Metadata.DatItem.TypeKey).AsEnumValue<ItemType>() == ItemType.Disk)
usedInternally = RebuildIndividualFile(datFile, new Disk(fileinfo), foundpath, outDir, date, inverse, outputFormat, isZip: false); usedInternally = RebuildIndividualFile(datFile, new Disk(fileinfo), foundpath, outDir, date, inverse, outputFormat, isZip: false);
else if (items[0].GetFieldValue<ItemType>(Models.Metadata.DatItem.TypeKey) == ItemType.File) else if (items[0].GetStringFieldValue(Models.Metadata.DatItem.TypeKey).AsEnumValue<ItemType>() == ItemType.File)
usedInternally = RebuildIndividualFile(datFile, new DatItems.Formats.File(fileinfo), foundpath, outDir, date, inverse, outputFormat, isZip: false); usedInternally = RebuildIndividualFile(datFile, new DatItems.Formats.File(fileinfo), foundpath, outDir, date, inverse, outputFormat, isZip: false);
else if (items[0].GetFieldValue<ItemType>(Models.Metadata.DatItem.TypeKey) == ItemType.Media) else if (items[0].GetStringFieldValue(Models.Metadata.DatItem.TypeKey).AsEnumValue<ItemType>() == ItemType.Media)
usedInternally = RebuildIndividualFile(datFile, new Media(fileinfo), foundpath, outDir, date, inverse, outputFormat, isZip: false); usedInternally = RebuildIndividualFile(datFile, new Media(fileinfo), foundpath, outDir, date, inverse, outputFormat, isZip: false);
else else
usedInternally = RebuildIndividualFile(datFile, new Rom(fileinfo), foundpath, outDir, date, inverse, outputFormat, isZip: false); usedInternally = RebuildIndividualFile(datFile, new Rom(fileinfo), foundpath, outDir, date, inverse, outputFormat, isZip: false);
@@ -422,7 +422,7 @@ namespace SabreTools.DatTools
if (RebuildTorrentXz(datFile, datItem, file, outDir, outputFormat, isZip)) if (RebuildTorrentXz(datFile, datItem, file, outDir, outputFormat, isZip))
return true; return true;
logger.User($"{(inverse ? "No matches" : "Matches")} found for '{Path.GetFileName(datItem.GetName() ?? datItem.GetFieldValue<ItemType>(Models.Metadata.DatItem.TypeKey).ToString())}', rebuilding accordingly..."); logger.User($"{(inverse ? "No matches" : "Matches")} found for '{Path.GetFileName(datItem.GetName() ?? datItem.GetStringFieldValue(Models.Metadata.DatItem.TypeKey).AsEnumValue<ItemType>().AsStringValue())}', rebuilding accordingly...");
rebuilt = true; rebuilt = true;
// Special case for partial packing mode // Special case for partial packing mode
@@ -478,7 +478,7 @@ namespace SabreTools.DatTools
// If we have duplicates and we're not filtering // If we have duplicates and we're not filtering
if (ShouldRebuild(datFile, headerless, transformStream, false, out dupes)) if (ShouldRebuild(datFile, headerless, transformStream, false, out dupes))
{ {
logger.User($"Headerless matches found for '{Path.GetFileName(datItem.GetName() ?? datItem.GetFieldValue<ItemType>(Models.Metadata.DatItem.TypeKey).ToString())}', rebuilding accordingly..."); logger.User($"Headerless matches found for '{Path.GetFileName(datItem.GetName() ?? datItem.GetStringFieldValue(Models.Metadata.DatItem.TypeKey).AsEnumValue<ItemType>().AsStringValue())}', rebuilding accordingly...");
rebuilt = true; rebuilt = true;
// Now loop through the list and rebuild accordingly // Now loop through the list and rebuild accordingly
@@ -678,7 +678,7 @@ namespace SabreTools.DatTools
{ {
BaseArchive? archive = BaseArchive.Create(file); BaseArchive? archive = BaseArchive.Create(file);
if (archive != null) if (archive != null)
(stream, _) = archive.CopyToStream(datItem.GetName() ?? datItem.GetFieldValue<ItemType>(Models.Metadata.DatItem.TypeKey).ToString()); (stream, _) = archive.CopyToStream(datItem.GetName() ?? datItem.GetStringFieldValue(Models.Metadata.DatItem.TypeKey).AsEnumValue<ItemType>().AsStringValue() ?? string.Empty);
} }
// Otherwise, just open the filestream // Otherwise, just open the filestream
else else

6
SabreTools.DatTools/Splitter.cs
View File

@@ -185,7 +185,7 @@ namespace SabreTools.DatTools
switch (item) switch (item)
{ {
case Disk disk: case Disk disk:
if (disk.GetFieldValue<ItemStatus>(Models.Metadata.Disk.StatusKey) == ItemStatus.Nodump) if (disk.GetStringFieldValue(Models.Metadata.Disk.StatusKey).AsEnumValue<ItemStatus>() == ItemStatus.Nodump)
fieldDats[Models.Metadata.Disk.StatusKey].Items.Add(key, item); fieldDats[Models.Metadata.Disk.StatusKey].Items.Add(key, item);
else if (!string.IsNullOrEmpty(disk.GetStringFieldValue(Models.Metadata.Disk.SHA1Key))) else if (!string.IsNullOrEmpty(disk.GetStringFieldValue(Models.Metadata.Disk.SHA1Key)))
fieldDats[Models.Metadata.Disk.SHA1Key].Items.Add(key, item); fieldDats[Models.Metadata.Disk.SHA1Key].Items.Add(key, item);
@@ -209,7 +209,7 @@ namespace SabreTools.DatTools
break; break;
case Rom rom: case Rom rom:
if (rom.GetFieldValue<ItemStatus>(Models.Metadata.Rom.StatusKey) == ItemStatus.Nodump) if (rom.GetStringFieldValue(Models.Metadata.Rom.StatusKey).AsEnumValue<ItemStatus>() == ItemStatus.Nodump)
fieldDats[Models.Metadata.Rom.StatusKey].Items.Add(key, item); fieldDats[Models.Metadata.Rom.StatusKey].Items.Add(key, item);
else if (!string.IsNullOrEmpty(rom.GetStringFieldValue(Models.Metadata.Rom.SHA512Key))) else if (!string.IsNullOrEmpty(rom.GetStringFieldValue(Models.Metadata.Rom.SHA512Key)))
fieldDats[Models.Metadata.Rom.SHA512Key].Items.Add(key, item); fieldDats[Models.Metadata.Rom.SHA512Key].Items.Add(key, item);
@@ -605,7 +605,7 @@ namespace SabreTools.DatTools
foreach (DatItem item in items) foreach (DatItem item in items)
{ {
if (item.GetFieldValue<ItemType>(Models.Metadata.DatItem.TypeKey) == itemType) if (item.GetStringFieldValue(Models.Metadata.DatItem.TypeKey).AsEnumValue<ItemType>() == itemType)
indexDat.Items.Add(key, item); indexDat.Items.Add(key, item);
} }
#if NET40_OR_GREATER || NETCOREAPP #if NET40_OR_GREATER || NETCOREAPP

2
SabreTools.Filtering/Remover.cs
View File

@@ -227,7 +227,7 @@ namespace SabreTools.Filtering
return; return;
// If there are no field names for this type or generic, return // If there are no field names for this type or generic, return
string? itemType = datItem.GetFieldValue<ItemType>(Models.Metadata.DatItem.TypeKey).AsStringValue<ItemType>(); string? itemType = datItem.GetStringFieldValue(Models.Metadata.DatItem.TypeKey).AsEnumValue<ItemType>().AsStringValue();
if (itemType == null || (!ItemFieldNames.ContainsKey(itemType) && !ItemFieldNames.ContainsKey("item"))) if (itemType == null || (!ItemFieldNames.ContainsKey(itemType) && !ItemFieldNames.ContainsKey("item")))
return; return;

4
SabreTools.Filtering/Replacer.cs
View File

@@ -55,11 +55,11 @@ namespace SabreTools.Filtering
#region Common #region Common
if (datItem.GetFieldValue<ItemType>(Models.Metadata.DatItem.TypeKey) != repDatItem.GetFieldValue<ItemType>(Models.Metadata.DatItem.TypeKey)) if (datItem.GetStringFieldValue(Models.Metadata.DatItem.TypeKey) != repDatItem.GetStringFieldValue(Models.Metadata.DatItem.TypeKey))
return; return;
// If there are no field names for this type or generic, return // If there are no field names for this type or generic, return
string? itemType = datItem.GetFieldValue<ItemType>(Models.Metadata.DatItem.TypeKey).AsStringValue<ItemType>(); string? itemType = datItem.GetStringFieldValue(Models.Metadata.DatItem.TypeKey).AsEnumValue<ItemType>().AsStringValue();
if (itemType == null || (!itemFieldNames.ContainsKey(itemType) && !itemFieldNames.ContainsKey("item"))) if (itemType == null || (!itemFieldNames.ContainsKey(itemType) && !itemFieldNames.ContainsKey("item")))
return; return;

4
SabreTools.Filtering/Splitter.cs
View File

@@ -336,7 +336,7 @@ namespace SabreTools.Filtering
foreach (DatItem item in devItems) foreach (DatItem item in devItems)
{ {
// If the parent machine doesn't already contain this item, add it // If the parent machine doesn't already contain this item, add it
if (!datFile.Items[machine]!.Any(i => i.GetFieldValue<ItemType>(Models.Metadata.DatItem.TypeKey) == item.GetFieldValue<ItemType>(Models.Metadata.DatItem.TypeKey) && i.GetName() == item.GetName())) if (!datFile.Items[machine]!.Any(i => i.GetStringFieldValue(Models.Metadata.DatItem.TypeKey) == item.GetStringFieldValue(Models.Metadata.DatItem.TypeKey) && i.GetName() == item.GetName()))
{ {
// Set that we found new items // Set that we found new items
foundnew = true; foundnew = true;
@@ -388,7 +388,7 @@ namespace SabreTools.Filtering
foreach (DatItem item in slotItems) foreach (DatItem item in slotItems)
{ {
// If the parent machine doesn't already contain this item, add it // If the parent machine doesn't already contain this item, add it
if (!datFile.Items[machine]!.Any(i => i.GetFieldValue<ItemType>(Models.Metadata.DatItem.TypeKey) == item.GetFieldValue<ItemType>(Models.Metadata.DatItem.TypeKey) && i.GetName() == item.GetName())) if (!datFile.Items[machine]!.Any(i => i.GetStringFieldValue(Models.Metadata.DatItem.TypeKey) == item.GetStringFieldValue(Models.Metadata.DatItem.TypeKey) && i.GetName() == item.GetName()))
{ {
// Set that we found new items // Set that we found new items
foundnew = true; foundnew = true;

2
SabreTools.Help/Feature.cs
View File

@@ -520,7 +520,7 @@ namespace SabreTools.Help
/// <summary> /// <summary>
/// Get the string value associated with this feature /// Get the string value associated with this feature
/// </summary> /// </summary>
public string? GetStringValue() public string? GetStringFieldValue()
{ {
if (_featureType != ParameterType.String) if (_featureType != ParameterType.String)
throw new ArgumentException("Feature is not a string"); throw new ArgumentException("Feature is not a string");

2
SabreTools.Help/TopLevel.cs
View File

@@ -145,7 +145,7 @@ namespace SabreTools.Help
if (!features.ContainsKey(key)) if (!features.ContainsKey(key))
return null; return null;
return features[key]!.GetStringValue(); return features[key]!.GetStringFieldValue();
} }
#endregion #endregion

3
SabreTools.Test/DatItems/DatItemTests.cs
View File

@@ -1,4 +1,5 @@
using SabreTools.Core; using SabreTools.Core;
using SabreTools.Core.Tools;
using SabreTools.DatItems; using SabreTools.DatItems;
using SabreTools.DatItems.Formats; using SabreTools.DatItems.Formats;
using SabreTools.FileTypes; using SabreTools.FileTypes;
@@ -21,7 +22,7 @@ namespace SabreTools.Test.DatItems
{ {
var baseFile = CreateBaseFile(fileType); var baseFile = CreateBaseFile(fileType);
var actual = DatItem.Create(baseFile); var actual = DatItem.Create(baseFile);
Assert.Equal(expected, actual?.GetFieldValue<ItemType>(Models.Metadata.DatItem.TypeKey)); Assert.Equal(expected, actual?.GetStringFieldValue(Models.Metadata.DatItem.TypeKey).AsEnumValue<ItemType>());
} }
[Fact] [Fact]