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

Fix more places where enums were being used instead of strings

Browse Source
This commit is contained in:
Matt Nadareski
2024-03-12 00:20:36 -04:00
parent 1b9c3a4dc9
commit 71b997c7be
6 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1065,7 +1065,7 @@ namespace SabreTools.DatFiles
var item = new DatItems.Formats.Rom(); var item = new DatItems.Formats.Rom();
item.SetName(name); item.SetName(name);
item.SetFieldValue<string?>(Models.Metadata.Rom.OffsetKey, rom.ReadString(Models.Metadata.Rom.OffsetKey)); item.SetFieldValue<string?>(Models.Metadata.Rom.OffsetKey, rom.ReadString(Models.Metadata.Rom.OffsetKey));
item.SetFieldValue<OpenMSXSubType>(Models.Metadata.Rom.OpenMSXMediaType, subType); item.SetFieldValue<string?>(Models.Metadata.Rom.OpenMSXMediaType, subType.AsStringValue());
item.SetFieldValue<string?>(Models.Metadata.Rom.OpenMSXType, rom.ReadString(Models.Metadata.Rom.OpenMSXType)); item.SetFieldValue<string?>(Models.Metadata.Rom.OpenMSXType, rom.ReadString(Models.Metadata.Rom.OpenMSXType));
item.SetFieldValue<string?>(Models.Metadata.Rom.RemarkKey, rom.ReadString(Models.Metadata.Rom.RemarkKey)); item.SetFieldValue<string?>(Models.Metadata.Rom.RemarkKey, rom.ReadString(Models.Metadata.Rom.RemarkKey));
item.SetFieldValue<string?>(Models.Metadata.Rom.SHA1Key, rom.ReadString(Models.Metadata.Rom.SHA1Key)); item.SetFieldValue<string?>(Models.Metadata.Rom.SHA1Key, rom.ReadString(Models.Metadata.Rom.SHA1Key));

2
SabreTools.DatFiles/DatFile.cs
View File

@@ -283,7 +283,7 @@ namespace SabreTools.DatFiles
&& !rom.HasHashes()) && !rom.HasHashes())
{ {
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());
} }
item = rom; item = rom;

12
SabreTools.DatFiles/Formats/Listrom.Reader.cs
View File

@@ -112,7 +112,7 @@ namespace SabreTools.DatFiles.Formats
{ {
var disk = new Disk(); var disk = new Disk();
disk.SetName(row.Name); disk.SetName(row.Name);
disk.SetFieldValue<ItemStatus>(Models.Metadata.Disk.StatusKey, ItemStatus.None); disk.SetFieldValue<string?>(Models.Metadata.Disk.StatusKey, ItemStatus.None.AsStringValue());
disk.SetFieldValue<Source?>(DatItem.SourceKey, new Source { Index = indexId, Name = filename }); disk.SetFieldValue<Source?>(DatItem.SourceKey, new Source { Index = indexId, Name = filename });
if (!string.IsNullOrEmpty(row.MD5)) if (!string.IsNullOrEmpty(row.MD5))
@@ -136,7 +136,7 @@ namespace SabreTools.DatFiles.Formats
rom.SetFieldValue<string?>(Models.Metadata.Rom.SHA1Key, row.SHA1); rom.SetFieldValue<string?>(Models.Metadata.Rom.SHA1Key, row.SHA1);
rom.SetFieldValue<string?>(Models.Metadata.Rom.SizeKey, NumberHelper.ConvertToInt64(row.Size).ToString()); rom.SetFieldValue<string?>(Models.Metadata.Rom.SizeKey, NumberHelper.ConvertToInt64(row.Size).ToString());
rom.SetFieldValue<Source?>(DatItem.SourceKey, new Source { Index = indexId, Name = filename }); rom.SetFieldValue<Source?>(DatItem.SourceKey, new Source { Index = indexId, Name = filename });
rom.SetFieldValue<ItemStatus>(Models.Metadata.Rom.StatusKey, ItemStatus.None); rom.SetFieldValue<string?>(Models.Metadata.Rom.StatusKey, ItemStatus.None.AsStringValue());
// Now process and add the item // Now process and add the item
rom.CopyMachineInformation(machine); rom.CopyMachineInformation(machine);
@@ -152,7 +152,7 @@ namespace SabreTools.DatFiles.Formats
{ {
var disk = new Disk(); var disk = new Disk();
disk.SetName(row.Name); disk.SetName(row.Name);
disk.SetFieldValue<ItemStatus>(Models.Metadata.Disk.StatusKey, ItemStatus.BadDump); disk.SetFieldValue<string?>(Models.Metadata.Disk.StatusKey, ItemStatus.BadDump.AsStringValue());
disk.SetFieldValue<Source?>(DatItem.SourceKey, new Source { Index = indexId, Name = filename }); disk.SetFieldValue<Source?>(DatItem.SourceKey, new Source { Index = indexId, Name = filename });
if (!string.IsNullOrEmpty(row.MD5)) if (!string.IsNullOrEmpty(row.MD5))
@@ -174,7 +174,7 @@ namespace SabreTools.DatFiles.Formats
disk.SetFieldValue<string?>(Models.Metadata.Disk.MD5Key, null); disk.SetFieldValue<string?>(Models.Metadata.Disk.MD5Key, null);
disk.SetFieldValue<string?>(Models.Metadata.Disk.SHA1Key, null); disk.SetFieldValue<string?>(Models.Metadata.Disk.SHA1Key, null);
disk.SetFieldValue<Source?>(DatItem.SourceKey, new Source { Index = indexId, Name = filename }); disk.SetFieldValue<Source?>(DatItem.SourceKey, new Source { Index = indexId, Name = filename });
disk.SetFieldValue<ItemStatus?>(Models.Metadata.Disk.StatusKey, ItemStatus.Nodump); disk.SetFieldValue<string?>(Models.Metadata.Disk.StatusKey, ItemStatus.Nodump.AsStringValue());
// Now process and add the item // Now process and add the item
disk.CopyMachineInformation(machine); disk.CopyMachineInformation(machine);
@@ -192,7 +192,7 @@ namespace SabreTools.DatFiles.Formats
rom.SetFieldValue<string?>(Models.Metadata.Rom.SHA1Key, row.SHA1); rom.SetFieldValue<string?>(Models.Metadata.Rom.SHA1Key, row.SHA1);
rom.SetFieldValue<string?>(Models.Metadata.Rom.SizeKey, NumberHelper.ConvertToInt64(row.Size).ToString()); rom.SetFieldValue<string?>(Models.Metadata.Rom.SizeKey, NumberHelper.ConvertToInt64(row.Size).ToString());
rom.SetFieldValue<Source?>(DatItem.SourceKey, new Source { Index = indexId, Name = filename }); rom.SetFieldValue<Source?>(DatItem.SourceKey, new Source { Index = indexId, Name = filename });
rom.SetFieldValue<ItemStatus>(Models.Metadata.Rom.StatusKey, ItemStatus.BadDump); rom.SetFieldValue<string?>(Models.Metadata.Rom.StatusKey, ItemStatus.BadDump.AsStringValue());
// Now process and add the item // Now process and add the item
rom.CopyMachineInformation(machine); rom.CopyMachineInformation(machine);
@@ -209,7 +209,7 @@ namespace SabreTools.DatFiles.Formats
rom.SetFieldValue<string?>(Models.Metadata.Rom.SHA1Key, null); rom.SetFieldValue<string?>(Models.Metadata.Rom.SHA1Key, null);
rom.SetFieldValue<string?>(Models.Metadata.Rom.SizeKey, NumberHelper.ConvertToInt64(row.Size).ToString()); rom.SetFieldValue<string?>(Models.Metadata.Rom.SizeKey, NumberHelper.ConvertToInt64(row.Size).ToString());
rom.SetFieldValue<Source?>(DatItem.SourceKey, new Source { Index = indexId, Name = filename }); rom.SetFieldValue<Source?>(DatItem.SourceKey, new Source { Index = indexId, Name = filename });
rom.SetFieldValue<ItemStatus>(Models.Metadata.Rom.StatusKey, ItemStatus.Nodump); rom.SetFieldValue<string?>(Models.Metadata.Rom.StatusKey, ItemStatus.Nodump.AsStringValue());
// Now process and add the item // Now process and add the item
rom.CopyMachineInformation(machine); rom.CopyMachineInformation(machine);

6
SabreTools.DatItems/Formats/Disk.cs
View File

@@ -63,13 +63,13 @@ namespace SabreTools.DatItems.Formats
public Disk() : base() public Disk() : base()
{ {
SetFieldValue<DupeType>(DatItem.DupeTypeKey, 0x00); SetFieldValue<DupeType>(DatItem.DupeTypeKey, 0x00);
SetFieldValue<ItemStatus>(Models.Metadata.Disk.StatusKey, ItemStatus.None); SetFieldValue<string?>(Models.Metadata.Disk.StatusKey, ItemStatus.None.AsStringValue());
} }
public Disk(Models.Metadata.Disk item) : base(item) public Disk(Models.Metadata.Disk item) : base(item)
{ {
SetFieldValue<DupeType>(DatItem.DupeTypeKey, 0x00); SetFieldValue<DupeType>(DatItem.DupeTypeKey, 0x00);
SetFieldValue<ItemStatus>(Models.Metadata.Disk.StatusKey, ItemStatus.None); SetFieldValue<string?>(Models.Metadata.Disk.StatusKey, ItemStatus.None.AsStringValue());
} }
public Disk(BaseFile baseFile) : base() public Disk(BaseFile baseFile) : base()
@@ -79,7 +79,7 @@ namespace SabreTools.DatItems.Formats
SetFieldValue<string?>(Models.Metadata.Disk.SHA1Key, TextHelper.ByteArrayToString(baseFile.SHA1)); SetFieldValue<string?>(Models.Metadata.Disk.SHA1Key, TextHelper.ByteArrayToString(baseFile.SHA1));
SetFieldValue<DupeType>(DatItem.DupeTypeKey, 0x00); SetFieldValue<DupeType>(DatItem.DupeTypeKey, 0x00);
SetFieldValue<ItemStatus>(Models.Metadata.Disk.StatusKey, ItemStatus.None); SetFieldValue<string?>(Models.Metadata.Disk.StatusKey, ItemStatus.None.AsStringValue());
} }
#endregion #endregion

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

@@ -30,7 +30,7 @@ namespace SabreTools.DatItems.Formats
{ {
SetFieldValue<long?>(Models.Metadata.Video.AspectXKey, NumberHelper.ConvertToInt64(item.ReadString(Models.Metadata.Video.AspectXKey))); SetFieldValue<long?>(Models.Metadata.Video.AspectXKey, NumberHelper.ConvertToInt64(item.ReadString(Models.Metadata.Video.AspectXKey)));
SetFieldValue<long?>(Models.Metadata.Video.AspectYKey, NumberHelper.ConvertToInt64(item.ReadString(Models.Metadata.Video.AspectYKey))); SetFieldValue<long?>(Models.Metadata.Video.AspectYKey, NumberHelper.ConvertToInt64(item.ReadString(Models.Metadata.Video.AspectYKey)));
SetFieldValue<DisplayType>(Models.Metadata.Display.DisplayTypeKey, item.ReadString(Models.Metadata.Video.ScreenKey)?.AsEnumValue<DisplayType>() ?? DisplayType.NULL); SetFieldValue<string?>(Models.Metadata.Display.DisplayTypeKey, item.ReadString(Models.Metadata.Video.ScreenKey)?.AsEnumValue<DisplayType>().AsStringValue());
SetFieldValue<long?>(Models.Metadata.Display.HeightKey, NumberHelper.ConvertToInt64(item.ReadString(Models.Metadata.Video.HeightKey))); SetFieldValue<long?>(Models.Metadata.Display.HeightKey, NumberHelper.ConvertToInt64(item.ReadString(Models.Metadata.Video.HeightKey)));
SetFieldValue<double?>(Models.Metadata.Display.RefreshKey, NumberHelper.ConvertToDouble(item.ReadString(Models.Metadata.Video.RefreshKey))); SetFieldValue<double?>(Models.Metadata.Display.RefreshKey, NumberHelper.ConvertToDouble(item.ReadString(Models.Metadata.Video.RefreshKey)));
SetFieldValue<long?>(Models.Metadata.Display.WidthKey, NumberHelper.ConvertToInt64(item.ReadString(Models.Metadata.Video.WidthKey))); SetFieldValue<long?>(Models.Metadata.Display.WidthKey, NumberHelper.ConvertToInt64(item.ReadString(Models.Metadata.Video.WidthKey)));

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

@@ -87,7 +87,7 @@ namespace SabreTools.DatItems.Formats
public Rom() : base() public Rom() : base()
{ {
SetFieldValue<DupeType>(DatItem.DupeTypeKey, 0x00); SetFieldValue<DupeType>(DatItem.DupeTypeKey, 0x00);
SetFieldValue<ItemStatus>(Models.Metadata.Rom.StatusKey, ItemStatus.None); SetFieldValue<string?>(Models.Metadata.Rom.StatusKey, ItemStatus.None.AsStringValue());
} }
public Rom(BaseFile baseFile) : base() public Rom(BaseFile baseFile) : base()
@@ -104,13 +104,13 @@ namespace SabreTools.DatItems.Formats
SetFieldValue<string?>(Models.Metadata.Rom.SpamSumKey, System.Text.Encoding.UTF8.GetString(baseFile.SpamSum ?? [])); SetFieldValue<string?>(Models.Metadata.Rom.SpamSumKey, System.Text.Encoding.UTF8.GetString(baseFile.SpamSum ?? []));
SetFieldValue<DupeType>(DatItem.DupeTypeKey, 0x00); SetFieldValue<DupeType>(DatItem.DupeTypeKey, 0x00);
SetFieldValue<ItemStatus>(Models.Metadata.Rom.StatusKey, ItemStatus.None); SetFieldValue<string?>(Models.Metadata.Rom.StatusKey, ItemStatus.None.AsStringValue());
} }
public Rom(Models.Metadata.Rom item) : base(item) public Rom(Models.Metadata.Rom item) : base(item)
{ {
SetFieldValue<DupeType>(DatItem.DupeTypeKey, 0x00); SetFieldValue<DupeType>(DatItem.DupeTypeKey, 0x00);
SetFieldValue<ItemStatus>(Models.Metadata.Rom.StatusKey, ItemStatus.None); SetFieldValue<string?>(Models.Metadata.Rom.StatusKey, ItemStatus.None.AsStringValue());
} }
#endregion #endregion