Convert Disk fully over to properties

2026-09-22 14:55:11 +00:00 · 2026-04-04 01:15:40 -04:00
parent e5e279a48d
commit 9ffa2a5e23
55 changed files with 487 additions and 433 deletions
--- a/SabreTools.Serialization.CrossModel/ClrMamePro.Deserializer.cs
+++ b/SabreTools.Serialization.CrossModel/ClrMamePro.Deserializer.cs
@@ -197,11 +197,11 @@ namespace SabreTools.Serialization.CrossModel
            var disk = new Disk
            {
                Name = item.Name,
-                MD5 = item.ReadString(Data.Models.Metadata.Disk.MD5Key),
-                SHA1 = item.ReadString(Data.Models.Metadata.Disk.SHA1Key),
-                Merge = item.ReadString(Data.Models.Metadata.Disk.MergeKey),
+                MD5 = item.MD5,
+                SHA1 = item.SHA1,
+                Merge = item.Merge,
                Status = item.Status,
-                Flags = item.ReadString(Data.Models.Metadata.Disk.FlagsKey),
+                Flags = item.Flags,
            };
            return disk;
        }
--- a/SabreTools.Serialization.CrossModel/ClrMamePro.Serializer.cs
+++ b/SabreTools.Serialization.CrossModel/ClrMamePro.Serializer.cs
@@ -210,11 +210,11 @@ namespace SabreTools.Serialization.CrossModel
            var disk = new Data.Models.Metadata.Disk
            {
                Name = item.Name,
-                [Data.Models.Metadata.Disk.MD5Key] = item.MD5,
-                [Data.Models.Metadata.Disk.SHA1Key] = item.SHA1,
-                [Data.Models.Metadata.Disk.MergeKey] = item.Merge,
+                MD5 = item.MD5,
+                SHA1 = item.SHA1,
+                Merge = item.Merge,
                Status = item.Status,
-                [Data.Models.Metadata.Disk.FlagsKey] = item.Flags,
+                Flags = item.Flags,
            };
            return disk;
        }
--- a/SabreTools.Serialization.CrossModel/Listrom.Deserializer.cs
+++ b/SabreTools.Serialization.CrossModel/Listrom.Deserializer.cs
@@ -56,8 +56,8 @@ namespace SabreTools.Serialization.CrossModel
            var row = new Row
            {
                Name = item.Name,
-                MD5 = item.ReadString(Data.Models.Metadata.Disk.MD5Key),
-                SHA1 = item.ReadString(Data.Models.Metadata.Disk.SHA1Key),
+                MD5 = item.MD5,
+                SHA1 = item.SHA1,
            };

            if (item.Status == Data.Models.Metadata.ItemStatus.Nodump)
--- a/SabreTools.Serialization.CrossModel/Listrom.Serializer.cs
+++ b/SabreTools.Serialization.CrossModel/Listrom.Serializer.cs
@@ -84,8 +84,8 @@ namespace SabreTools.Serialization.CrossModel
                var disk = new Data.Models.Metadata.Disk
                {
                    Name = item.Name,
-                    [Data.Models.Metadata.Disk.MD5Key] = item.MD5,
-                    [Data.Models.Metadata.Disk.SHA1Key] = item.SHA1,
+                    MD5 = item.MD5,
+                    SHA1 = item.SHA1,
                };

                if (item.NoGoodDumpKnown)
--- a/SabreTools.Serialization.CrossModel/Listxml.Deserializer.cs
+++ b/SabreTools.Serialization.CrossModel/Listxml.Deserializer.cs
@@ -404,11 +404,11 @@ namespace SabreTools.Serialization.CrossModel
            var disk = new Disk
            {
                Name = item.Name,
-                MD5 = item.ReadString(Data.Models.Metadata.Disk.MD5Key),
-                SHA1 = item.ReadString(Data.Models.Metadata.Disk.SHA1Key),
-                Merge = item.ReadString(Data.Models.Metadata.Disk.MergeKey),
-                Region = item.ReadString(Data.Models.Metadata.Disk.RegionKey),
-                Index = item.ReadString(Data.Models.Metadata.Disk.IndexKey),
+                MD5 = item.MD5,
+                SHA1 = item.SHA1,
+                Merge = item.Merge,
+                Region = item.Region,
+                Index = item.Index,
                Writable = item.Writable,
                Status = item.Status,
                Optional = item.Optional,
--- a/SabreTools.Serialization.CrossModel/Listxml.Serializer.cs
+++ b/SabreTools.Serialization.CrossModel/Listxml.Serializer.cs
@@ -427,11 +427,11 @@ namespace SabreTools.Serialization.CrossModel
            var disk = new Data.Models.Metadata.Disk
            {
                Name = item.Name,
-                [Data.Models.Metadata.Disk.MD5Key] = item.MD5,
-                [Data.Models.Metadata.Disk.SHA1Key] = item.SHA1,
-                [Data.Models.Metadata.Disk.MergeKey] = item.Merge,
-                [Data.Models.Metadata.Disk.RegionKey] = item.Region,
-                [Data.Models.Metadata.Disk.IndexKey] = item.Index,
+                MD5 = item.MD5,
+                SHA1 = item.SHA1,
+                Merge = item.Merge,
+                Region = item.Region,
+                Index = item.Index,
                Writable = item.Writable,
                Status = item.Status,
                Optional = item.Optional,
--- a/SabreTools.Serialization.CrossModel/Logiqx.Deserializer.cs
+++ b/SabreTools.Serialization.CrossModel/Logiqx.Deserializer.cs
@@ -233,11 +233,11 @@ namespace SabreTools.Serialization.CrossModel
            var disk = new Disk
            {
                Name = item.Name,
-                MD5 = item.ReadString(Data.Models.Metadata.Disk.MD5Key),
-                SHA1 = item.ReadString(Data.Models.Metadata.Disk.SHA1Key),
-                Merge = item.ReadString(Data.Models.Metadata.Disk.MergeKey),
+                MD5 = item.MD5,
+                SHA1 = item.SHA1,
+                Merge = item.Merge,
                Status = item.Status,
-                Region = item.ReadString(Data.Models.Metadata.Disk.RegionKey),
+                Region = item.Region,
            };
            return disk;
        }
--- a/SabreTools.Serialization.CrossModel/Logiqx.Serializer.cs
+++ b/SabreTools.Serialization.CrossModel/Logiqx.Serializer.cs
@@ -227,11 +227,11 @@ namespace SabreTools.Serialization.CrossModel
            var disk = new Data.Models.Metadata.Disk
            {
                Name = item.Name,
-                [Data.Models.Metadata.Disk.MD5Key] = item.MD5,
-                [Data.Models.Metadata.Disk.SHA1Key] = item.SHA1,
-                [Data.Models.Metadata.Disk.MergeKey] = item.Merge,
+                MD5 = item.MD5,
+                SHA1 = item.SHA1,
+                Merge = item.Merge,
                Status = item.Status,
-                [Data.Models.Metadata.Disk.RegionKey] = item.Region,
+                Region = item.Region,
            };
            return disk;
        }
--- a/SabreTools.Serialization.CrossModel/SeparatedValue.Deserializer.cs
+++ b/SabreTools.Serialization.CrossModel/SeparatedValue.Deserializer.cs
@@ -86,8 +86,8 @@ namespace SabreTools.Serialization.CrossModel
                DiskName = item.Name,
                Size = null,
                CRC = null,
-                MD5 = item.ReadString(Data.Models.Metadata.Disk.MD5Key),
-                SHA1 = item.ReadString(Data.Models.Metadata.Disk.SHA1Key),
+                MD5 = item.MD5,
+                SHA1 = item.SHA1,
                SHA256 = null,
                SHA384 = null,
                SHA512 = null,
--- a/SabreTools.Serialization.CrossModel/SeparatedValue.Serializer.cs
+++ b/SabreTools.Serialization.CrossModel/SeparatedValue.Serializer.cs
@@ -90,8 +90,8 @@ namespace SabreTools.Serialization.CrossModel
                "disk" => new Data.Models.Metadata.Disk
                {
                    Name = item.DiskName,
-                    [Data.Models.Metadata.Disk.MD5Key] = item.MD5,
-                    [Data.Models.Metadata.Disk.SHA1Key] = item.SHA1,
+                    MD5 = item.MD5,
+                    SHA1 = item.SHA1,
                    Status = item.Status,
                },
                "media" => new Data.Models.Metadata.Media
--- a/SabreTools.Serialization.CrossModel/SoftwareList.Deserializer.cs
+++ b/SabreTools.Serialization.CrossModel/SoftwareList.Deserializer.cs
@@ -127,8 +127,8 @@ namespace SabreTools.Serialization.CrossModel
            var disk = new Disk
            {
                Name = item.Name,
-                MD5 = item.ReadString(Data.Models.Metadata.Disk.MD5Key),
-                SHA1 = item.ReadString(Data.Models.Metadata.Disk.SHA1Key),
+                MD5 = item.MD5,
+                SHA1 = item.SHA1,
                Status = item.Status,
                Writeable = item.Writable,
            };
--- a/SabreTools.Serialization.CrossModel/SoftwareList.Serializer.cs
+++ b/SabreTools.Serialization.CrossModel/SoftwareList.Serializer.cs
@@ -126,8 +126,8 @@ namespace SabreTools.Serialization.CrossModel
            var disk = new Data.Models.Metadata.Disk
            {
                Name = item.Name,
-                [Data.Models.Metadata.Disk.MD5Key] = item.MD5,
-                [Data.Models.Metadata.Disk.SHA1Key] = item.SHA1,
+                MD5 = item.MD5,
+                SHA1 = item.SHA1,
                Status = item.Status,
                Writable = item.Writeable,
            };