Convert size keys to size properties

This commit is contained in:
Matt Nadareski
2026-04-02 23:45:17 -04:00
parent 11803aa34c
commit 3c6cfef070
115 changed files with 377 additions and 446 deletions

View File

@@ -48,7 +48,7 @@ namespace SabreTools.Serialization.CrossModel
Source = item.ReadString(Data.Models.Metadata.Rom.SourceKey),
BitTorrentMagnetHash = item.ReadString(Data.Models.Metadata.Rom.BitTorrentMagnetHashKey),
LastModifiedTime = item.ReadString(Data.Models.Metadata.Rom.LastModifiedTimeKey),
Size = item.ReadString(Data.Models.Metadata.Rom.SizeKey),
Size = item.Size?.ToString(),
MD5 = item.ReadString(Data.Models.Metadata.Rom.MD5Key),
CRC32 = item.ReadString(Data.Models.Metadata.Rom.CRCKey),
SHA1 = item.ReadString(Data.Models.Metadata.Rom.SHA1Key),

View File

@@ -1,5 +1,6 @@
using System;
using SabreTools.Data.Models.ArchiveDotOrg;
using SabreTools.Text.Extensions;
namespace SabreTools.Serialization.CrossModel
{
@@ -65,7 +66,7 @@ namespace SabreTools.Serialization.CrossModel
[Data.Models.Metadata.Rom.SourceKey] = item.Source,
[Data.Models.Metadata.Rom.BitTorrentMagnetHashKey] = item.BitTorrentMagnetHash,
[Data.Models.Metadata.Rom.LastModifiedTimeKey] = item.LastModifiedTime,
[Data.Models.Metadata.Rom.SizeKey] = item.Size,
Size = NumberHelper.ConvertToInt64(item.Size),
[Data.Models.Metadata.Rom.MD5Key] = item.MD5,
[Data.Models.Metadata.Rom.CRCKey] = item.CRC32,
[Data.Models.Metadata.Rom.SHA1Key] = item.SHA1,

View File

@@ -279,7 +279,7 @@ namespace SabreTools.Serialization.CrossModel
var rom = new Rom
{
Name = item.Name,
Size = item.ReadString(Data.Models.Metadata.Rom.SizeKey),
Size = item.Size,
CRC16 = item.ReadString(Data.Models.Metadata.Rom.CRC16Key),
CRC = item.ReadString(Data.Models.Metadata.Rom.CRCKey),
CRC64 = item.ReadString(Data.Models.Metadata.Rom.CRC64Key),

View File

@@ -292,7 +292,7 @@ namespace SabreTools.Serialization.CrossModel
var rom = new Data.Models.Metadata.Rom
{
Name = item.Name,
[Data.Models.Metadata.Rom.SizeKey] = item.Size,
Size = item.Size,
[Data.Models.Metadata.Rom.CRC16Key] = item.CRC16,
[Data.Models.Metadata.Rom.CRCKey] = item.CRC,
[Data.Models.Metadata.Rom.CRC64Key] = item.CRC64,

View File

@@ -67,7 +67,7 @@ namespace SabreTools.Serialization.CrossModel
var file = new File
{
Name = item.Name,
Size = item.ReadString(Data.Models.Metadata.Rom.SizeKey),
Size = item.Size,
CRC = item.ReadString(Data.Models.Metadata.Rom.CRCKey),
SHA1 = item.ReadString(Data.Models.Metadata.Rom.SHA1Key),
Date = item.ReadString(Data.Models.Metadata.Rom.DateKey),

View File

@@ -70,7 +70,7 @@ namespace SabreTools.Serialization.CrossModel
var rom = new Data.Models.Metadata.Rom
{
Name = item.Name,
[Data.Models.Metadata.Rom.SizeKey] = item.Size,
Size = item.Size,
[Data.Models.Metadata.Rom.CRCKey] = item.CRC,
[Data.Models.Metadata.Rom.SHA1Key] = item.SHA1,
[Data.Models.Metadata.Rom.DateKey] = item.Date,

View File

@@ -50,7 +50,7 @@ namespace SabreTools.Serialization.CrossModel
SHA1 = item.ReadString(Data.Models.Metadata.Rom.SHA1Key),
MD5 = item.ReadString(Data.Models.Metadata.Rom.MD5Key),
CRC32 = item.ReadString(Data.Models.Metadata.Rom.CRCKey),
Size = item.ReadString(Data.Models.Metadata.Rom.SizeKey),
Size = item.Size,
};
return row;
}

View File

@@ -61,7 +61,7 @@ namespace SabreTools.Serialization.CrossModel
[Data.Models.Metadata.Rom.SHA1Key] = item.SHA1,
[Data.Models.Metadata.Rom.MD5Key] = item.MD5,
[Data.Models.Metadata.Rom.CRCKey] = item.CRC32,
[Data.Models.Metadata.Rom.SizeKey] = item.Size,
Size = item.Size,
};
return rom;
}

View File

@@ -76,7 +76,7 @@ namespace SabreTools.Serialization.CrossModel
var row = new Row
{
Name = item.Name,
Size = item.ReadString(Data.Models.Metadata.Rom.SizeKey),
Size = item.Size,
CRC = item.ReadString(Data.Models.Metadata.Rom.CRCKey),
SHA1 = item.ReadString(Data.Models.Metadata.Rom.SHA1Key),
};

View File

@@ -100,7 +100,7 @@ namespace SabreTools.Serialization.CrossModel
var rom = new Data.Models.Metadata.Rom
{
Name = item.Name,
[Data.Models.Metadata.Rom.SizeKey] = item.Size,
Size = item.Size,
[Data.Models.Metadata.Rom.CRCKey] = item.CRC,
[Data.Models.Metadata.Rom.SHA1Key] = item.SHA1,
};

View File

@@ -567,7 +567,7 @@ namespace SabreTools.Serialization.CrossModel
{
Name = item.Name,
Bios = item.ReadString(Data.Models.Metadata.Rom.BiosKey),
Size = item.ReadString(Data.Models.Metadata.Rom.SizeKey),
Size = item.Size,
CRC = item.ReadString(Data.Models.Metadata.Rom.CRCKey),
SHA1 = item.ReadString(Data.Models.Metadata.Rom.SHA1Key),
Merge = item.ReadString(Data.Models.Metadata.Rom.MergeKey),

View File

@@ -606,7 +606,7 @@ namespace SabreTools.Serialization.CrossModel
{
Name = item.Name,
[Data.Models.Metadata.Rom.BiosKey] = item.Bios,
[Data.Models.Metadata.Rom.SizeKey] = item.Size,
Size = item.Size,
[Data.Models.Metadata.Rom.CRCKey] = item.CRC,
[Data.Models.Metadata.Rom.SHA1Key] = item.SHA1,
[Data.Models.Metadata.Rom.MergeKey] = item.Merge,

View File

@@ -301,7 +301,7 @@ namespace SabreTools.Serialization.CrossModel
var rom = new Rom
{
Name = item.Name,
Size = item.ReadString(Data.Models.Metadata.Rom.SizeKey),
Size = item.Size,
CRC16 = item.ReadString(Data.Models.Metadata.Rom.CRC16Key),
CRC = item.ReadString(Data.Models.Metadata.Rom.CRCKey),
CRC64 = item.ReadString(Data.Models.Metadata.Rom.CRC64Key),

View File

@@ -295,7 +295,7 @@ namespace SabreTools.Serialization.CrossModel
var rom = new Data.Models.Metadata.Rom
{
Name = item.Name,
[Data.Models.Metadata.Rom.SizeKey] = item.Size,
Size = item.Size,
[Data.Models.Metadata.Rom.CRC16Key] = item.CRC16,
[Data.Models.Metadata.Rom.CRCKey] = item.CRC,
[Data.Models.Metadata.Rom.CRC64Key] = item.CRC64,

View File

@@ -99,8 +99,8 @@ namespace SabreTools.Serialization.CrossModel
var roms = item.Read<Data.Models.Metadata.Rom[]>(Data.Models.Metadata.Machine.RomKey);
if (roms is not null && roms.Length > 0)
{
var romSizes = Array.ConvertAll(roms, r => r.ReadLong(Data.Models.Metadata.Rom.SizeKey) ?? -1);
game.RomSize = Array.Find(romSizes, s => s > -1).ToString();
var romSizes = Array.ConvertAll(roms, r => r.Size ?? -1);
game.RomSize = Array.Find(romSizes, s => s > -1);
var romCRCs = Array.ConvertAll(roms, ConvertFromInternalModel);
game.Files = new Files { RomCRC = romCRCs };

View File

@@ -85,7 +85,7 @@ namespace SabreTools.Serialization.CrossModel
= Array.ConvertAll(item.Files.RomCRC, romCRC =>
{
var rom = ConvertToInternalModel(romCRC);
rom[Data.Models.Metadata.Rom.SizeKey] = item.RomSize;
rom.Size = item.RomSize;
return rom;
});
}

View File

@@ -104,7 +104,7 @@ namespace SabreTools.Serialization.CrossModel
GameDescription = parent.Description,
RomName = item.Name,
RomCRC = item.ReadString(Data.Models.Metadata.Rom.CRCKey),
RomSize = item.ReadString(Data.Models.Metadata.Rom.SizeKey),
RomSize = item.Size,
RomOf = parent.ReadString(Data.Models.Metadata.Machine.RomOfKey),
MergeName = item.ReadString(Data.Models.Metadata.Rom.MergeKey),
};

View File

@@ -90,7 +90,7 @@ namespace SabreTools.Serialization.CrossModel
{
Name = item.RomName,
[Data.Models.Metadata.Rom.CRCKey] = item.RomCRC,
[Data.Models.Metadata.Rom.SizeKey] = item.RomSize,
Size = item.RomSize,
[Data.Models.Metadata.Rom.MergeKey] = item.MergeName,
};
return rom;

View File

@@ -139,7 +139,7 @@ namespace SabreTools.Serialization.CrossModel
Type = "rom",
RomName = item.Name,
DiskName = null,
Size = item.ReadString(Data.Models.Metadata.Rom.SizeKey),
Size = item.Size,
CRC = item.ReadString(Data.Models.Metadata.Rom.CRCKey),
MD5 = item.ReadString(Data.Models.Metadata.Rom.MD5Key),
SHA1 = item.ReadString(Data.Models.Metadata.Rom.SHA1Key),

View File

@@ -105,7 +105,7 @@ namespace SabreTools.Serialization.CrossModel
"rom" => new Data.Models.Metadata.Rom
{
Name = item.RomName,
[Data.Models.Metadata.Rom.SizeKey] = item.Size,
Size = item.Size,
[Data.Models.Metadata.Rom.CRCKey] = item.CRC,
[Data.Models.Metadata.Rom.MD5Key] = item.MD5,
[Data.Models.Metadata.Rom.SHA1Key] = item.SHA1,

View File

@@ -74,7 +74,7 @@ namespace SabreTools.Serialization.CrossModel
var dataArea = new DataArea
{
Name = item.Name,
Size = item.ReadString(Data.Models.Metadata.DataArea.SizeKey),
Size = item.Size,
Width = item.ReadString(Data.Models.Metadata.DataArea.WidthKey),
Endianness = item.Endianness,
};
@@ -216,7 +216,7 @@ namespace SabreTools.Serialization.CrossModel
var rom = new Rom
{
Name = item.Name,
Size = item.ReadString(Data.Models.Metadata.Rom.SizeKey),
Size = item.Size,
Length = item.ReadString(Data.Models.Metadata.Rom.LengthKey),
CRC = item.ReadString(Data.Models.Metadata.Rom.CRCKey),
SHA1 = item.ReadString(Data.Models.Metadata.Rom.SHA1Key),

View File

@@ -32,7 +32,7 @@ namespace SabreTools.Serialization.CrossModel
{
var header = new Data.Models.Metadata.Header
{
Name = item.Name,
Name = item.Name,
Description = item.Description,
Notes = item.Notes,
};
@@ -75,7 +75,7 @@ namespace SabreTools.Serialization.CrossModel
var dataArea = new Data.Models.Metadata.DataArea
{
Name = item.Name,
[Data.Models.Metadata.DataArea.SizeKey] = item.Size,
Size = item.Size,
[Data.Models.Metadata.DataArea.WidthKey] = item.Width,
Endianness = item.Endianness,
};
@@ -210,7 +210,7 @@ namespace SabreTools.Serialization.CrossModel
var rom = new Data.Models.Metadata.Rom
{
Name = item.Name,
[Data.Models.Metadata.Rom.SizeKey] = item.Size,
Size = item.Size,
[Data.Models.Metadata.Rom.LengthKey] = item.Length,
[Data.Models.Metadata.Rom.CRCKey] = item.CRC,
[Data.Models.Metadata.Rom.SHA1Key] = item.SHA1,