claunia/SabreTools
1
0
Fork 0
mirror of https://github.com/claunia/SabreTools.git synced 2025-12-16 19:14:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove redundant helper methods

Browse Source
This commit is contained in:
Matt Nadareski
2024-03-05 15:24:11 -05:00
parent 3166a438a8
commit fa99e6aefb
33 changed files with 260 additions and 592 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
SabreTools.DatFiles/DatHeader.cs
View File

@@ -458,13 +458,13 @@ namespace SabreTools.DatFiles
Type = mappings[DatHeaderField.Type];
if (mappings.ContainsKey(DatHeaderField.ForceMerging))
ForceMerging = mappings[DatHeaderField.ForceMerging].AsMergingFlag();
ForceMerging = mappings[DatHeaderField.ForceMerging].AsEnumValue<MergingFlag>();
if (mappings.ContainsKey(DatHeaderField.ForceNodump))
ForceNodump = mappings[DatHeaderField.ForceNodump].AsNodumpFlag();
ForceNodump = mappings[DatHeaderField.ForceNodump].AsEnumValue<NodumpFlag>();
if (mappings.ContainsKey(DatHeaderField.ForcePacking))
ForcePacking = mappings[DatHeaderField.ForcePacking].AsPackingFlag();
ForcePacking = mappings[DatHeaderField.ForcePacking].AsEnumValue<PackingFlag>();
#endregion
@@ -487,13 +487,13 @@ namespace SabreTools.DatFiles
Build = mappings[DatHeaderField.Build];
if (mappings.ContainsKey(DatHeaderField.RomMode))
RomMode = mappings[DatHeaderField.RomMode].AsMergingFlag();
RomMode = mappings[DatHeaderField.RomMode].AsEnumValue<MergingFlag>();
if (mappings.ContainsKey(DatHeaderField.BiosMode))
BiosMode = mappings[DatHeaderField.BiosMode].AsMergingFlag();
BiosMode = mappings[DatHeaderField.BiosMode].AsEnumValue<MergingFlag>();
if (mappings.ContainsKey(DatHeaderField.SampleMode))
SampleMode = mappings[DatHeaderField.SampleMode].AsMergingFlag();
SampleMode = mappings[DatHeaderField.SampleMode].AsEnumValue<MergingFlag>();
if (mappings.ContainsKey(DatHeaderField.LockRomMode))
LockRomMode = mappings[DatHeaderField.LockRomMode].AsYesNo();

16
SabreTools.DatFiles/Formats/ClrMamePro.Reader.cs
View File

@@ -60,11 +60,11 @@ namespace SabreTools.DatFiles.Formats
Header.HeaderSkipper ??= cmp.Header;
Header.Type ??= cmp.Type;
if (Header.ForceMerging == MergingFlag.None)
Header.ForceMerging = cmp.ForceMerging?.AsMergingFlag() ?? MergingFlag.None;
Header.ForceMerging = cmp.ForceMerging?.AsEnumValue<MergingFlag>() ?? MergingFlag.None;
if (Header.ForcePacking == PackingFlag.None)
Header.ForcePacking = cmp.ForceZipping?.AsPackingFlag() ?? PackingFlag.None;
Header.ForcePacking = cmp.ForceZipping?.AsEnumValue<PackingFlag>() ?? PackingFlag.None;
if (Header.ForcePacking == PackingFlag.None)
Header.ForcePacking = cmp.ForcePacking?.AsPackingFlag() ?? PackingFlag.None;
Header.ForcePacking = cmp.ForcePacking?.AsEnumValue<PackingFlag>() ?? PackingFlag.None;
// Handle implied SuperDAT
if (cmp.Name?.Contains(" - SuperDAT") == true && keep)
@@ -258,7 +258,7 @@ namespace SabreTools.DatFiles.Formats
//xxHash364 = rom.xxHash364, // TODO: Add to internal model
//xxHash3128 = rom.xxHash3128, // TODO: Add to internal model
MergeTag = rom.Merge,
ItemStatus = rom.Status?.AsItemStatus() ?? ItemStatus.NULL,
ItemStatus = rom.Status?.AsEnumValue<ItemStatus>() ?? ItemStatus.NULL,
Region = rom.Region,
//Flags = rom.Flags, // TODO: Add to internal model
Offset = rom.Offs,
@@ -304,7 +304,7 @@ namespace SabreTools.DatFiles.Formats
MD5 = disk.MD5,
SHA1 = disk.SHA1,
MergeTag = disk.Merge,
ItemStatus = disk.Status?.AsItemStatus() ?? ItemStatus.NULL,
ItemStatus = disk.Status?.AsEnumValue<ItemStatus>() ?? ItemStatus.NULL,
//Flags = disk.Flags, // TODO: Add to internal model
Source = new Source
@@ -411,7 +411,7 @@ namespace SabreTools.DatFiles.Formats
{
var item = new Chip
{
ChipType = chip.Type?.AsChipType() ?? ChipType.NULL,
ChipType = chip.Type?.AsEnumValue<ChipType>() ?? ChipType.NULL,
Name = chip.Name,
//Flags = chip.Flags, // TODO: Add to internal model
Clock = NumberHelper.ConvertToInt64(chip.Clock),
@@ -448,7 +448,7 @@ namespace SabreTools.DatFiles.Formats
{
var item = new Display
{
DisplayType = video.Screen?.AsDisplayType() ?? DisplayType.NULL,
DisplayType = video.Screen?.AsEnumValue<DisplayType>() ?? DisplayType.NULL,
Width = NumberHelper.ConvertToInt64(video.X),
Height = NumberHelper.ConvertToInt64(video.Y),
//AspectX = video.AspectX, // TODO: Add to internal model or find mapping
@@ -614,7 +614,7 @@ namespace SabreTools.DatFiles.Formats
containsItems = true;
var item = new Driver
{
Status = driver.Status?.AsSupportStatus() ?? SupportStatus.NULL,
Status = driver.Status?.AsEnumValue<SupportStatus>() ?? SupportStatus.NULL,
//Color = driver.Color, // TODO: Add to internal model or find mapping
//Sound = driver.Sound, // TODO: Add to internal model or find mapping
//PaletteSize = driver.PaletteSize, // TODO: Add to internal model or find mapping

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

@@ -199,9 +199,9 @@ namespace SabreTools.DatFiles.Formats
};
if (Header.ForceMergingSpecified)
clrMamePro.ForceMerging = Header.ForceMerging.FromMergingFlag(romCenter: false);
clrMamePro.ForceMerging = Header.ForceMerging.AsStringValue<MergingFlag>(useSecond: false);
if (Header.ForcePackingSpecified)
clrMamePro.ForcePacking = Header.ForcePacking.FromPackingFlag(yesno: false);
clrMamePro.ForcePacking = Header.ForcePacking.AsStringValue<PackingFlag>(useSecond: false);
return clrMamePro;
}
@@ -394,7 +394,7 @@ namespace SabreTools.DatFiles.Formats
};
if (item.ItemStatusSpecified)
rom.Status = item.ItemStatus.FromItemStatus(yesno: false);
rom.Status = item.ItemStatus.AsStringValue<ItemStatus>(useSecond: false);
if (item.InvertedSpecified)
rom.Inverted = item.Inverted.FromYesNo();
if (item.MIASpecified)
@@ -418,7 +418,7 @@ namespace SabreTools.DatFiles.Formats
};
if (item.ItemStatusSpecified)
disk.Status = item.ItemStatus.FromItemStatus(yesno: false);
disk.Status = item.ItemStatus.AsStringValue<ItemStatus>(useSecond: false);
return disk;
}
@@ -470,7 +470,7 @@ namespace SabreTools.DatFiles.Formats
{
var chip = new Models.ClrMamePro.Chip
{
Type = item.ChipType.FromChipType(),
Type = item.ChipType.AsStringValue<ChipType>(),
Name = item.Name,
//Flags = item.Flags, // TODO: Add to internal model
Clock = item.Clock?.ToString(),
@@ -485,7 +485,7 @@ namespace SabreTools.DatFiles.Formats
{
var video = new Models.ClrMamePro.Video
{
Screen = item.DisplayType.FromDisplayType(),
Screen = item.DisplayType.AsStringValue<DisplayType>(),
X = item.Width?.ToString(),
Y = item.Height?.ToString(),
//AspectX = item.AspectX, // TODO: Add to internal model or find mapping
@@ -573,7 +573,7 @@ namespace SabreTools.DatFiles.Formats
{
var driver = new Models.ClrMamePro.Driver
{
Status = item.Status.FromSupportStatus(),
Status = item.Status.AsStringValue<SupportStatus>(),
//Color = item.Color, // TODO: Add to internal model or find mapping
//Sound = item.Sound, // TODO: Add to internal model or find mapping
//PaletteSize = item.PaletteSize, // TODO: Add to internal model or find mapping

46
SabreTools.DatFiles/Formats/Listxml.Reader.cs
View File

@@ -97,7 +97,7 @@ namespace SabreTools.DatFiles.Formats
{
Name = game.Name,
SourceFile = game.SourceFile,
Runnable = game.Runnable.AsRunnable(),
Runnable = game.Runnable.AsEnumValue<Runnable>(),
CloneOf = game.CloneOf,
RomOf = game.RomOf,
SampleOf = game.SampleOf,
@@ -220,7 +220,7 @@ namespace SabreTools.DatFiles.Formats
MergeTag = rom.Merge,
Region = rom.Region,
Offset = rom.Offset,
ItemStatus = rom.Status.AsItemStatus(),
ItemStatus = rom.Status.AsEnumValue<ItemStatus>(),
Optional = rom.Optional.AsYesNo(),
//Dispose = rom.Dispose.AsYesNo(), // TODO: Add to internal model
//SoundOnly = rom.SoundOnly.AsYesNo(), // TODO: Add to internal model
@@ -264,7 +264,7 @@ namespace SabreTools.DatFiles.Formats
Region = disk.Region,
Index = disk.Index,
Writable = disk.Writable.AsYesNo(),
ItemStatus = disk.Status.AsItemStatus(),
ItemStatus = disk.Status.AsEnumValue<ItemStatus>(),
Optional = disk.Optional.AsYesNo(),
Source = new Source
@@ -369,7 +369,7 @@ namespace SabreTools.DatFiles.Formats
{
Name = chip.Name,
Tag = chip.Tag,
ChipType = chip.Type.AsChipType(),
ChipType = chip.Type.AsEnumValue<ChipType>(),
//SoundOnly = chip.SoundOnly, // TODO: Add to internal model
Clock = NumberHelper.ConvertToInt64(chip.Clock),
@@ -406,7 +406,7 @@ namespace SabreTools.DatFiles.Formats
var item = new Display
{
Tag = display.Tag,
DisplayType = display.Type.AsDisplayType(),
DisplayType = display.Type.AsEnumValue<DisplayType>(),
Rotate = NumberHelper.ConvertToInt64(display.Rotate),
FlipX = display.FlipX.AsYesNo(),
Width = NumberHelper.ConvertToInt64(display.Width),
@@ -452,7 +452,7 @@ namespace SabreTools.DatFiles.Formats
{
var item = new Display
{
DisplayType = video.Screen?.AsDisplayType() ?? DisplayType.NULL,
DisplayType = video.Screen?.AsEnumValue<DisplayType>() ?? DisplayType.NULL,
Width = NumberHelper.ConvertToInt64(video.Width),
Height = NumberHelper.ConvertToInt64(video.Height),
//AspectX = video.AspectX, // TODO: Add to internal model or find mapping
@@ -549,7 +549,7 @@ namespace SabreTools.DatFiles.Formats
{
var controlItem = new Control
{
ControlType = control.Type.AsControlType(),
ControlType = control.Type.AsEnumValue<ControlType>(),
Player = NumberHelper.ConvertToInt64(control.Player),
Buttons = NumberHelper.ConvertToInt64(control.Buttons),
RequiredButtons = NumberHelper.ConvertToInt64(control.ReqButtons),
@@ -609,7 +609,7 @@ namespace SabreTools.DatFiles.Formats
{
Tag = dipswitch.Condition.Tag,
Mask = dipswitch.Condition.Mask,
Relation = dipswitch.Condition.Relation.AsRelation(),
Relation = dipswitch.Condition.Relation.AsEnumValue<Relation>(),
Value = dipswitch.Condition.Value,
};
item.Conditions = [condition];
@@ -646,7 +646,7 @@ namespace SabreTools.DatFiles.Formats
{
Tag = dipvalue.Condition.Tag,
Mask = dipvalue.Condition.Mask,
Relation = dipvalue.Condition.Relation.AsRelation(),
Relation = dipvalue.Condition.Relation.AsEnumValue<Relation>(),
Value = dipvalue.Condition.Value,
};
dipValueItem.Conditions = [condition];
@@ -700,7 +700,7 @@ namespace SabreTools.DatFiles.Formats
{
Tag = configuration.Condition.Tag,
Mask = configuration.Condition.Mask,
Relation = configuration.Condition.Relation.AsRelation(),
Relation = configuration.Condition.Relation.AsEnumValue<Relation>(),
Value = configuration.Condition.Value,
};
item.Conditions = [condition];
@@ -737,7 +737,7 @@ namespace SabreTools.DatFiles.Formats
{
Tag = dipvalue.Condition.Tag,
Mask = dipvalue.Condition.Mask,
Relation = dipvalue.Condition.Relation.AsRelation(),
Relation = dipvalue.Condition.Relation.AsEnumValue<Relation>(),
Value = dipvalue.Condition.Value,
};
settingItem.Conditions = [condition];
@@ -837,7 +837,7 @@ namespace SabreTools.DatFiles.Formats
{
Tag = adjuster.Condition.Tag,
Mask = adjuster.Condition.Mask,
Relation = adjuster.Condition.Relation.AsRelation(),
Relation = adjuster.Condition.Relation.AsEnumValue<Relation>(),
Value = adjuster.Condition.Value,
};
item.Conditions = [condition];
@@ -866,13 +866,13 @@ namespace SabreTools.DatFiles.Formats
containsItems = true;
var item = new Driver
{
Status = driver.Status.AsSupportStatus(),
//Color = driver.Color.AsSupportStatus(), // TODO: Add to internal model
//Sound = driver.Sound.AsSupportStatus(), // TODO: Add to internal model
Status = driver.Status.AsEnumValue<SupportStatus>(),
//Color = driver.Color.AsEnumValue<SupportStatus>(), // TODO: Add to internal model
//Sound = driver.Sound.AsEnumValue<SupportStatus>(), // TODO: Add to internal model
//PaletteSize = NumberHelper.ConvertToInt64(driver.PaletteSize), // TODO: Add to internal model
Emulation = driver.Emulation.AsSupportStatus(),
Cocktail = driver.Cocktail.AsSupportStatus(),
SaveState = driver.SaveState.AsSupported(),
Emulation = driver.Emulation.AsEnumValue<SupportStatus>(),
Cocktail = driver.Cocktail.AsEnumValue<SupportStatus>(),
SaveState = driver.SaveState.AsEnumValue<Supported>(),
RequiresArtwork = driver.RequiresArtwork.AsYesNo(),
Unofficial = driver.Unofficial.AsYesNo(),
NoSoundHardware = driver.NoSoundHardware.AsYesNo(),
@@ -909,9 +909,9 @@ namespace SabreTools.DatFiles.Formats
{
var item = new Feature
{
Type = feature.Type.AsFeatureType(),
Status = feature.Status.AsFeatureStatus(),
Overall = feature.Overall.AsFeatureStatus(),
Type = feature.Type.AsEnumValue<FeatureType>(),
Status = feature.Status.AsEnumValue<FeatureStatus>(),
Overall = feature.Overall.AsEnumValue<FeatureStatus>(),
Source = new Source
{
@@ -945,7 +945,7 @@ namespace SabreTools.DatFiles.Formats
{
var item = new Device
{
DeviceType = device.Type.AsDeviceType(),
DeviceType = device.Type.AsEnumValue<DeviceType>(),
Tag = device.Tag,
FixedImage = device.FixedImage,
Mandatory = NumberHelper.ConvertToInt64(device.Mandatory),
@@ -1057,7 +1057,7 @@ namespace SabreTools.DatFiles.Formats
{
Tag = softwarelist.Tag,
Name = softwarelist.Name,
Status = softwarelist.Status.AsSoftwareListStatus(),
Status = softwarelist.Status.AsEnumValue<SoftwareListStatus>(),
Filter = softwarelist.Filter,
Source = new Source

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

@@ -374,7 +374,7 @@ namespace SabreTools.DatFiles.Formats
{
Name = machine.Name,
SourceFile = machine.SourceFile,
Runnable = machine.Runnable.FromRunnable(),
Runnable = machine.Runnable.AsStringValue<Runnable>(),
CloneOf = machine.CloneOf,
RomOf = machine.RomOf,
SampleOf = machine.SampleOf,
@@ -435,7 +435,7 @@ namespace SabreTools.DatFiles.Formats
Merge = item.MergeTag,
Region = item.Region,
Offset = item.Offset,
Status = item.ItemStatus.FromItemStatus(yesno: false),
Status = item.ItemStatus.AsStringValue<ItemStatus>(useSecond: false),
Optional = item.Optional.FromYesNo(),
//Dispose = item.Dispose.FromYesNo(), // TODO: Add to internal model
//SoundOnly = item.SoundOnly.FromYesNo(), // TODO: Add to internal model
@@ -458,7 +458,7 @@ namespace SabreTools.DatFiles.Formats
Region = item.Region,
Index = item.Index,
Writable = item.Writable.FromYesNo(),
Status = item.ItemStatus.FromItemStatus(yesno: false),
Status = item.ItemStatus.AsStringValue<ItemStatus>(useSecond: false),
Optional = item.Optional.FromYesNo(),
};
@@ -500,7 +500,7 @@ namespace SabreTools.DatFiles.Formats
{
Name = item.Name,
Tag = item.Tag,
Type = item.ChipType.FromChipType(),
Type = item.ChipType.AsStringValue<ChipType>(),
//SoundOnly = item.SoundOnly, // TODO: Add to internal model
Clock = item.Clock?.ToString(),
};
@@ -516,7 +516,7 @@ namespace SabreTools.DatFiles.Formats
var display = new Models.Listxml.Display
{
Tag = item.Tag,
Type = item.DisplayType.FromDisplayType(),
Type = item.DisplayType.AsStringValue<DisplayType>(),
Rotate = item.Rotate?.ToString(),
FlipX = item.FlipX.FromYesNo(),
Width = item.Width?.ToString(),
@@ -582,7 +582,7 @@ namespace SabreTools.DatFiles.Formats
{
var control = new Models.Listxml.Control
{
Type = item.ControlType.FromControlType(),
Type = item.ControlType.AsStringValue<ControlType>(),
Player = item.Player?.ToString(),
Buttons = item.Buttons?.ToString(),
ReqButtons = item.RequiredButtons?.ToString(),
@@ -618,7 +618,7 @@ namespace SabreTools.DatFiles.Formats
{
Tag = conditionItem?.Tag,
Mask = conditionItem?.Mask,
Relation = conditionItem?.Relation.FromRelation(),
Relation = conditionItem?.Relation.AsStringValue<Relation>(),
Value = conditionItem?.Value,
};
dipswitch.Condition = condition;
@@ -681,7 +681,7 @@ namespace SabreTools.DatFiles.Formats
{
Tag = conditionItem?.Tag,
Mask = conditionItem?.Mask,
Relation = conditionItem?.Relation.FromRelation(),
Relation = conditionItem?.Relation.AsStringValue<Relation>(),
Value = conditionItem?.Value,
};
dipvalue.Condition = condition;
@@ -709,7 +709,7 @@ namespace SabreTools.DatFiles.Formats
{
Tag = conditionItem?.Tag,
Mask = conditionItem?.Mask,
Relation = conditionItem?.Relation.FromRelation(),
Relation = conditionItem?.Relation.AsStringValue<Relation>(),
Value = conditionItem?.Value,
};
configuration.Condition = condition;
@@ -772,7 +772,7 @@ namespace SabreTools.DatFiles.Formats
{
Tag = conditionItem?.Tag,
Mask = conditionItem?.Mask,
Relation = conditionItem?.Relation.FromRelation(),
Relation = conditionItem?.Relation.AsStringValue<Relation>(),
Value = conditionItem?.Value,
};
confsetting.Condition = condition;
@@ -812,7 +812,7 @@ namespace SabreTools.DatFiles.Formats
{
Tag = conditionItem?.Tag,
Mask = conditionItem?.Mask,
Relation = conditionItem?.Relation.FromRelation(),
Relation = conditionItem?.Relation.AsStringValue<Relation>(),
Value = conditionItem?.Value,
};
adjuster.Condition = condition;
@@ -828,13 +828,13 @@ namespace SabreTools.DatFiles.Formats
{
var driver = new Models.Listxml.Driver
{
Status = item.Status.FromSupportStatus(),
//Color = item.Color.FromSupportStatus(), // TODO: Add to internal model
//Sound = item.Sound.FromSupportStatus(), // TODO: Add to internal model
Status = item.Status.AsStringValue<SupportStatus>(),
//Color = item.Color.AsStringValue<SupportStatus>(), // TODO: Add to internal model
//Sound = item.Sound.AsStringValue<SupportStatus>(), // TODO: Add to internal model
//PaletteSize = driver.PaletteSize?.ToString(), // TODO: Add to internal model
Emulation = item.Emulation.FromSupportStatus(),
Cocktail = item.Cocktail.FromSupportStatus(),
SaveState = item.SaveState.FromSupported(verbose: true),
Emulation = item.Emulation.AsStringValue<SupportStatus>(),
Cocktail = item.Cocktail.AsStringValue<SupportStatus>(),
SaveState = item.SaveState.AsStringValue<Supported>(useSecond: true),
RequiresArtwork = item.RequiresArtwork.FromYesNo(),
Unofficial = item.Unofficial.FromYesNo(),
NoSoundHardware = item.NoSoundHardware.FromYesNo(),
@@ -851,9 +851,9 @@ namespace SabreTools.DatFiles.Formats
{
var feature = new Models.Listxml.Feature
{
Type = item.Type.FromFeatureType(),
Status = item.Status.FromFeatureStatus(),
Overall = item.Overall.FromFeatureStatus(),
Type = item.Type.AsStringValue<FeatureType>(),
Status = item.Status.AsStringValue<FeatureStatus>(),
Overall = item.Overall.AsStringValue<FeatureStatus>(),
};
return feature;
@@ -866,7 +866,7 @@ namespace SabreTools.DatFiles.Formats
{
var device = new Models.Listxml.Device
{
Type = item.DeviceType.FromDeviceType(),
Type = item.DeviceType.AsStringValue<DeviceType>(),
Tag = item.Tag,
FixedImage = item.FixedImage,
Mandatory = item.Mandatory?.ToString(),
@@ -937,7 +937,7 @@ namespace SabreTools.DatFiles.Formats
{
Tag = item.Tag,
Name = item.Name,
Status = item.Status.FromSoftwareListStatus(),
Status = item.Status.AsStringValue<SoftwareListStatus>(),
Filter = item.Filter,
};

28
SabreTools.DatFiles/Formats/Logiqx.Reader.cs
View File

@@ -102,11 +102,11 @@ namespace SabreTools.DatFiles.Formats
Header.HeaderSkipper ??= clrMamePro.Header;
if (Header.ForceMerging == MergingFlag.None)
Header.ForceMerging = clrMamePro.ForceMerging.AsMergingFlag();
Header.ForceMerging = clrMamePro.ForceMerging.AsEnumValue<MergingFlag>();
if (Header.ForceNodump == NodumpFlag.None)
Header.ForceNodump = clrMamePro.ForceNodump.AsNodumpFlag();
Header.ForceNodump = clrMamePro.ForceNodump.AsEnumValue<NodumpFlag>();
if (Header.ForcePacking == PackingFlag.None)
Header.ForcePacking = clrMamePro.ForcePacking.AsPackingFlag();
Header.ForcePacking = clrMamePro.ForcePacking.AsEnumValue<PackingFlag>();
}
/// <summary>
@@ -122,11 +122,11 @@ namespace SabreTools.DatFiles.Formats
Header.System ??= romCenter.Plugin;
if (Header.RomMode == MergingFlag.None)
Header.RomMode = romCenter.RomMode.AsMergingFlag();
Header.RomMode = romCenter.RomMode.AsEnumValue<MergingFlag>();
if (Header.BiosMode == MergingFlag.None)
Header.BiosMode = romCenter.BiosMode.AsMergingFlag();
Header.BiosMode = romCenter.BiosMode.AsEnumValue<MergingFlag>();
if (Header.SampleMode == MergingFlag.None)
Header.SampleMode = romCenter.SampleMode.AsMergingFlag();
Header.SampleMode = romCenter.SampleMode.AsEnumValue<MergingFlag>();
Header.LockRomMode ??= romCenter.LockRomMode.AsYesNo();
Header.LockBiosMode ??= romCenter.LockBiosMode.AsYesNo();
@@ -218,7 +218,7 @@ namespace SabreTools.DatFiles.Formats
RebuildTo = game.RebuildTo,
NoIntroId = game.Id,
NoIntroCloneOfId = game.CloneOfId,
Runnable = game.Runnable.AsRunnable(),
Runnable = game.Runnable.AsEnumValue<Runnable>(),
Description = game.Description,
Year = game.Year,
@@ -406,7 +406,7 @@ namespace SabreTools.DatFiles.Formats
//xxHash364 = rom.xxHash364, // TODO: Add to internal model
//xxHash3128 = rom.xxHash3128, // TODO: Add to internal model
MergeTag = rom.Merge,
ItemStatus = rom.Status?.AsItemStatus() ?? ItemStatus.NULL,
ItemStatus = rom.Status?.AsEnumValue<ItemStatus>() ?? ItemStatus.NULL,
//Serial = rom.Serial, // TODO: Add to internal model
//Header = rom.Header, // TODO: Add to internal model
Date = rom.Date,
@@ -449,7 +449,7 @@ namespace SabreTools.DatFiles.Formats
MD5 = disk.MD5,
SHA1 = disk.SHA1,
MergeTag = disk.Merge,
ItemStatus = disk.Status?.AsItemStatus() ?? ItemStatus.NULL,
ItemStatus = disk.Status?.AsEnumValue<ItemStatus>() ?? ItemStatus.NULL,
Source = new Source
{
@@ -621,10 +621,10 @@ namespace SabreTools.DatFiles.Formats
containsItems = true;
var item = new Driver
{
Status = driver.Status?.AsSupportStatus() ?? SupportStatus.NULL,
Emulation = driver.Emulation?.AsSupportStatus() ?? SupportStatus.NULL,
Cocktail = driver.Cocktail?.AsSupportStatus() ?? SupportStatus.NULL,
SaveState = driver.SaveState?.AsSupported() ?? Supported.NULL,
Status = driver.Status?.AsEnumValue<SupportStatus>() ?? SupportStatus.NULL,
Emulation = driver.Emulation?.AsEnumValue<SupportStatus>() ?? SupportStatus.NULL,
Cocktail = driver.Cocktail?.AsEnumValue<SupportStatus>() ?? SupportStatus.NULL,
SaveState = driver.SaveState?.AsEnumValue<Supported>() ?? Supported.NULL,
RequiresArtwork = driver.RequiresArtwork?.AsYesNo(),
Unofficial = driver.Unofficial?.AsYesNo(),
NoSoundHardware = driver.NoSoundHardware?.AsYesNo(),
@@ -663,7 +663,7 @@ namespace SabreTools.DatFiles.Formats
{
Tag = softwarelist.Tag,
Name = softwarelist.Name,
Status = softwarelist.Status?.AsSoftwareListStatus() ?? SoftwareListStatus.None,
Status = softwarelist.Status?.AsEnumValue<SoftwareListStatus>() ?? SoftwareListStatus.None,
Filter = softwarelist.Filter,
Source = new Source

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

@@ -233,11 +233,11 @@ namespace SabreTools.DatFiles.Formats
};
if (Header.ForceMergingSpecified)
subheader.ForceMerging = Header.ForceMerging.FromMergingFlag(romCenter: false);
subheader.ForceMerging = Header.ForceMerging.AsStringValue<MergingFlag>(useSecond: false);
if (Header.ForceNodumpSpecified)
subheader.ForceNodump = Header.ForceNodump.FromNodumpFlag();
subheader.ForceNodump = Header.ForceNodump.AsStringValue<NodumpFlag>();
if (Header.ForcePackingSpecified)
subheader.ForcePacking = Header.ForcePacking.FromPackingFlag(yesno: false);
subheader.ForcePacking = Header.ForcePacking.AsStringValue<PackingFlag>(useSecond: false);
return subheader;
}
@@ -265,11 +265,11 @@ namespace SabreTools.DatFiles.Formats
};
if (Header.RomModeSpecified)
subheader.RomMode = Header.RomMode.FromMergingFlag(romCenter: true);
subheader.RomMode = Header.RomMode.AsStringValue<MergingFlag>(useSecond: true);
if (Header.BiosModeSpecified)
subheader.BiosMode = Header.BiosMode.FromMergingFlag(romCenter: true);
subheader.BiosMode = Header.BiosMode.AsStringValue<MergingFlag>(useSecond: true);
if (Header.SampleModeSpecified)
subheader.SampleMode = Header.SampleMode.FromMergingFlag(romCenter: true);
subheader.SampleMode = Header.SampleMode.AsStringValue<MergingFlag>(useSecond: true);
if (Header.LockRomModeSpecified)
subheader.LockRomMode = Header.LockRomMode.FromYesNo();
@@ -413,7 +413,7 @@ namespace SabreTools.DatFiles.Formats
game.RebuildTo = machine.RebuildTo;
game.Id = machine.NoIntroId;
game.CloneOfId = machine.NoIntroCloneOfId;
game.Runnable = machine.Runnable.FromRunnable();
game.Runnable = machine.Runnable.AsStringValue<Runnable>();
if (machine.Comment != null)
{
if (machine.Comment.Contains(';'))
@@ -538,7 +538,7 @@ namespace SabreTools.DatFiles.Formats
};
if (item.ItemStatusSpecified)
rom.Status = item.ItemStatus.FromItemStatus(yesno: false);
rom.Status = item.ItemStatus.AsStringValue<ItemStatus>(useSecond: false);
if (item.InvertedSpecified)
rom.Inverted = item.Inverted.FromYesNo();
if (item.MIASpecified)
@@ -562,7 +562,7 @@ namespace SabreTools.DatFiles.Formats
};
if (item.ItemStatusSpecified)
disk.Status = item.ItemStatus.FromItemStatus(yesno: false);
disk.Status = item.ItemStatus.AsStringValue<ItemStatus>(useSecond: false);
return disk;
}
@@ -626,10 +626,10 @@ namespace SabreTools.DatFiles.Formats
{
var driver = new Models.Logiqx.Driver
{
Status = item.Status.FromSupportStatus(),
Emulation = item.Emulation.FromSupportStatus(),
Cocktail = item.Cocktail.FromSupportStatus(),
SaveState = item.SaveState.FromSupported(true),
Status = item.Status.AsStringValue<SupportStatus>(),
Emulation = item.Emulation.AsStringValue<SupportStatus>(),
Cocktail = item.Cocktail.AsStringValue<SupportStatus>(),
SaveState = item.SaveState.AsStringValue<Supported>(useSecond: true),
};
if (item.RequiresArtworkSpecified)
@@ -657,7 +657,7 @@ namespace SabreTools.DatFiles.Formats
};
if (item.StatusSpecified)
softwarelist.Status = item.Status.FromSoftwareListStatus();
softwarelist.Status = item.Status.AsStringValue<SoftwareListStatus>();
return softwarelist;
}

2
SabreTools.DatFiles/Formats/SabreJSON.cs
View File

@@ -209,7 +209,7 @@ namespace SabreTools.DatFiles.Formats
if (datItemObj == null)
return;
switch (datItemObj.Value<string>("type").AsItemType())
switch (datItemObj.Value<string>("type").AsEnumValue<ItemType>())
{
case ItemType.Adjuster:
datItem = datItemObj.ToObject<Adjuster>();

6
SabreTools.DatFiles/Formats/SeparatedValue.Reader.cs
View File

@@ -79,7 +79,7 @@ namespace SabreTools.DatFiles.Formats
// Read item values
DatItem? item = null;
switch (row.Type.AsItemType())
switch (row.Type.AsEnumValue<ItemType>())
{
case ItemType.Disk:
item = new Disk
@@ -87,7 +87,7 @@ namespace SabreTools.DatFiles.Formats
Name = row.DiskName,
MD5 = row.MD5,
SHA1 = row.SHA1,
ItemStatus = row.Status.AsItemStatus(),
ItemStatus = row.Status.AsEnumValue<ItemStatus>(),
Source = new Source
{
@@ -125,7 +125,7 @@ namespace SabreTools.DatFiles.Formats
SHA384 = row.SHA384,
SHA512 = row.SHA512,
SpamSum = row.SpamSum,
ItemStatus = row.Status.AsItemStatus(),
ItemStatus = row.Status.AsEnumValue<ItemStatus>(),
Source = new Source
{

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

@@ -164,7 +164,7 @@ namespace SabreTools.DatFiles.Formats
Description = Header.Description,
GameName = disk.Machine.Name,
GameDescription = disk.Machine.Description,
Type = disk.ItemType.FromItemType(),
Type = disk.ItemType.AsStringValue<ItemType>(),
RomName = string.Empty,
DiskName = disk.Name,
Size = string.Empty,
@@ -175,7 +175,7 @@ namespace SabreTools.DatFiles.Formats
SHA384 = string.Empty,
SHA512 = string.Empty,
SpamSum = string.Empty,
Status = disk.ItemStatus.FromItemStatus(yesno: false),
Status = disk.ItemStatus.AsStringValue<ItemStatus>(useSecond: false),
};
return row;
}
@@ -192,7 +192,7 @@ namespace SabreTools.DatFiles.Formats
Description = Header.Description,
GameName = media.Machine.Name,
GameDescription = media.Machine.Description,
Type = media.ItemType.FromItemType(),
Type = media.ItemType.AsStringValue<ItemType>(),
RomName = string.Empty,
DiskName = media.Name,
Size = string.Empty,
@@ -220,7 +220,7 @@ namespace SabreTools.DatFiles.Formats
Description = Header.Description,
GameName = rom.Machine.Name,
GameDescription = rom.Machine.Description,
Type = rom.ItemType.FromItemType(),
Type = rom.ItemType.AsStringValue<ItemType>(),
RomName = rom.Name,
DiskName = string.Empty,
Size = rom.Size?.ToString(),
@@ -231,7 +231,7 @@ namespace SabreTools.DatFiles.Formats
SHA384 = rom.SHA384,
SHA512 = rom.SHA512,
SpamSum = rom.SpamSum,
Status = rom.ItemStatus.FromItemStatus(yesno: false),
Status = rom.ItemStatus.AsStringValue<ItemStatus>(useSecond: false),
};
return row;
}

11
SabreTools.DatFiles/Formats/SoftwareList.Reader.cs
View File

@@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using SabreTools.Core;
using SabreTools.Core.Tools;
using SabreTools.DatItems;
using SabreTools.DatItems.Formats;
@@ -93,7 +94,7 @@ namespace SabreTools.DatFiles.Formats
{
Name = software.Name,
CloneOf = software.CloneOf,
Supported = software.Supported.AsSupported(),
Supported = software.Supported.AsEnumValue<Supported>(),
Description = software.Description,
Year = software.Year,
Publisher = software.Publisher,
@@ -258,7 +259,7 @@ namespace SabreTools.DatFiles.Formats
Name = dataarea.Name,
Size = NumberHelper.ConvertToInt64(dataarea.Size),
Width = NumberHelper.ConvertToInt64(dataarea.Width),
Endianness = dataarea.Endianness.AsEndianness(),
Endianness = dataarea.Endianness.AsEnumValue<Endianness>(),
Source = new Source
{
@@ -300,8 +301,8 @@ namespace SabreTools.DatFiles.Formats
SHA1 = rom.SHA1,
Offset = rom.Offset,
Value = rom.Value,
ItemStatus = rom.Status.AsItemStatus(),
LoadFlag = rom.LoadFlag.AsLoadFlag(),
ItemStatus = rom.Status.AsEnumValue<ItemStatus>(),
LoadFlag = rom.LoadFlag.AsEnumValue<LoadFlag>(),
Part = part,
DataArea = dataarea,
@@ -377,7 +378,7 @@ namespace SabreTools.DatFiles.Formats
Name = rom.Name,
MD5 = rom.MD5,
SHA1 = rom.SHA1,
ItemStatus = rom.Status.AsItemStatus(),
ItemStatus = rom.Status.AsEnumValue<ItemStatus>(),
Writable = rom.Writeable.AsYesNo(),
Part = part,

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

@@ -261,7 +261,7 @@ namespace SabreTools.DatFiles.Formats
{
Name = machine.Name,
CloneOf = machine.CloneOf,
Supported = machine.Supported.FromSupported(verbose: true),
Supported = machine.Supported.AsStringValue<Supported>(useSecond: true),
Description = machine.Description,
Year = machine.Year,
Publisher = machine.Publisher,
@@ -381,7 +381,7 @@ namespace SabreTools.DatFiles.Formats
Name = item.DataArea?.Name,
Size = item.DataArea?.Size?.ToString(),
Width = item.DataArea?.Width?.ToString(),
Endianness = item.DataArea?.Endianness.FromEndianness(),
Endianness = item.DataArea?.Endianness.AsStringValue<Endianness>(),
Rom = CreateRom(item),
};
return [dataArea];
@@ -401,8 +401,8 @@ namespace SabreTools.DatFiles.Formats
SHA1 = item.SHA1,
Offset = item.Offset,
Value = item.Value,
Status = item.ItemStatus.FromItemStatus(yesno: false),
LoadFlag = item.LoadFlag.FromLoadFlag(),
Status = item.ItemStatus.AsStringValue<ItemStatus>(useSecond: false),
LoadFlag = item.LoadFlag.AsStringValue<LoadFlag>(),
};
return [rom];
}
@@ -429,7 +429,7 @@ namespace SabreTools.DatFiles.Formats
Name = item.Name,
MD5 = item.MD5,
SHA1 = item.SHA1,
Status = item.ItemStatus.FromItemStatus(yesno: false),
Status = item.ItemStatus.AsStringValue<ItemStatus>(useSecond: false),
Writeable = item.Writable?.ToString(),
};
return [disk];

12
SabreTools.DatFiles/Setter.cs
View File

@@ -104,7 +104,7 @@ namespace SabreTools.DatFiles
datHeader.Author = DatHeaderMappings[DatHeaderField.Author];
if (DatHeaderMappings.ContainsKey(DatHeaderField.BiosMode))
datHeader.BiosMode = DatHeaderMappings[DatHeaderField.BiosMode].AsMergingFlag();
datHeader.BiosMode = DatHeaderMappings[DatHeaderField.BiosMode].AsEnumValue<MergingFlag>();
if (DatHeaderMappings.ContainsKey(DatHeaderField.Build))
datHeader.Build = DatHeaderMappings[DatHeaderField.Build];
@@ -133,13 +133,13 @@ namespace SabreTools.DatFiles
datHeader.FileName = DatHeaderMappings[DatHeaderField.FileName];
if (DatHeaderMappings.ContainsKey(DatHeaderField.ForceMerging))
datHeader.ForceMerging = DatHeaderMappings[DatHeaderField.ForceMerging].AsMergingFlag();
datHeader.ForceMerging = DatHeaderMappings[DatHeaderField.ForceMerging].AsEnumValue<MergingFlag>();
if (DatHeaderMappings.ContainsKey(DatHeaderField.ForceNodump))
datHeader.ForceNodump = DatHeaderMappings[DatHeaderField.ForceNodump].AsNodumpFlag();
datHeader.ForceNodump = DatHeaderMappings[DatHeaderField.ForceNodump].AsEnumValue<NodumpFlag>();
if (DatHeaderMappings.ContainsKey(DatHeaderField.ForcePacking))
datHeader.ForcePacking = DatHeaderMappings[DatHeaderField.ForcePacking].AsPackingFlag();
datHeader.ForcePacking = DatHeaderMappings[DatHeaderField.ForcePacking].AsEnumValue<PackingFlag>();
if (DatHeaderMappings.ContainsKey(DatHeaderField.HeaderSkipper))
datHeader.HeaderSkipper = DatHeaderMappings[DatHeaderField.HeaderSkipper];
@@ -174,7 +174,7 @@ namespace SabreTools.DatFiles
datHeader.RomCenterVersion = DatHeaderMappings[DatHeaderField.RomCenterVersion];
if (DatHeaderMappings.ContainsKey(DatHeaderField.RomMode))
datHeader.RomMode = DatHeaderMappings[DatHeaderField.RomMode].AsMergingFlag();
datHeader.RomMode = DatHeaderMappings[DatHeaderField.RomMode].AsEnumValue<MergingFlag>();
if (DatHeaderMappings.ContainsKey(DatHeaderField.RomTitle))
datHeader.RomTitle = DatHeaderMappings[DatHeaderField.RomTitle];
@@ -183,7 +183,7 @@ namespace SabreTools.DatFiles
datHeader.RootDir = DatHeaderMappings[DatHeaderField.RootDir];
if (DatHeaderMappings.ContainsKey(DatHeaderField.SampleMode))
datHeader.SampleMode = DatHeaderMappings[DatHeaderField.SampleMode].AsMergingFlag();
datHeader.SampleMode = DatHeaderMappings[DatHeaderField.SampleMode].AsEnumValue<MergingFlag>();
if (DatHeaderMappings.ContainsKey(DatHeaderField.ScreenshotsHeight))
datHeader.ScreenshotsHeight = DatHeaderMappings[DatHeaderField.ScreenshotsHeight];