SabreTools/SabreTools.Serialization
1
0
Fork 0
mirror of https://github.com/SabreTools/SabreTools.Serialization.git synced 2026-04-05 22:01:33 +00:00
Code Issues 56 Packages Projects Releases 20 Wiki Activity

Reduce extension confusion

Browse Source
This commit is contained in:
Matt Nadareski
2026-03-27 00:48:44 -04:00
parent e5679b9152
commit e9902f0907
34 changed files with 82 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
SabreTools.Data.Extensions.Test/MetadataExtensionsTests.cs
View File

@@ -1851,6 +1851,19 @@ namespace SabreTools.Data.Extensions.Test
Assert.Equal(expected, actual);
}
[Theory]
[InlineData(null, null)]
[InlineData("INVALID", null)]
[InlineData("yes", true)]
[InlineData("True", true)]
[InlineData("no", false)]
[InlineData("False", false)]
public void AsYesNoTest(string? field, bool? expected)
{
bool? actual = field.AsYesNo();
Assert.Equal(expected, actual);
}
#endregion
#region Enum to String
@@ -2137,6 +2150,16 @@ namespace SabreTools.Data.Extensions.Test
Assert.Equal(expected, actual);
}
[Theory]
[InlineData(null, null)]
[InlineData(true, "yes")]
[InlineData(false, "no")]
public void FromYesNo(bool? field, string? expected)
{
string? actual = field.FromYesNo();
Assert.Equal(expected, actual);
}
#endregion
}
}

31
SabreTools.Data.Extensions/MetadataExtensions.cs
View File

@@ -1214,6 +1214,21 @@ namespace SabreTools.Data.Extensions
};
}
/// <summary>
/// Get bool? value from input string
/// </summary>
/// <param name="yesno">String to get value from</param>
/// <returns>bool? corresponding to the string</returns>
public static bool? AsYesNo(this string? yesno)
{
return yesno?.ToLowerInvariant() switch
{
"yes" or "true" => true,
"no" or "false" => false,
_ => null,
};
}
#endregion
#region Enum to String
@@ -1574,7 +1589,21 @@ namespace SabreTools.Data.Extensions
};
}
#endregion
/// <summary>
/// Get string value from input bool?
/// </summary>
/// <param name="yesno">bool? to get value from</param>
/// <returns>String corresponding to the bool?</returns>
public static string? FromYesNo(this bool? yesno)
{
return yesno switch
{
true => "yes",
false => "no",
_ => null,
};
}
#endregion
}
}

1
SabreTools.Metadata.DatItems.Test/DatItemTests.cs
View File

@@ -1,3 +1,4 @@
using SabreTools.Data.Extensions;
using SabreTools.Metadata.DatItems.Formats;
using Xunit;

1
SabreTools.Metadata.DatItems/DatItemT.cs
View File

@@ -1,4 +1,5 @@
using System;
using SabreTools.Data.Extensions;
namespace SabreTools.Metadata.DatItems
{

1
SabreTools.Metadata.DatItems/Formats/Adjuster.cs
View File

@@ -1,5 +1,6 @@
using System.Xml.Serialization;
using Newtonsoft.Json;
using SabreTools.Data.Extensions;
namespace SabreTools.Metadata.DatItems.Formats
{

1
SabreTools.Metadata.DatItems/Formats/Analog.cs
View File

@@ -1,5 +1,6 @@
using System.Xml.Serialization;
using Newtonsoft.Json;
using SabreTools.Data.Extensions;
namespace SabreTools.Metadata.DatItems.Formats
{

1
SabreTools.Metadata.DatItems/Formats/Archive.cs
View File

@@ -1,5 +1,6 @@
using System.Xml.Serialization;
using Newtonsoft.Json;
using SabreTools.Data.Extensions;
namespace SabreTools.Metadata.DatItems.Formats
{

1
SabreTools.Metadata.DatItems/Formats/BiosSet.cs
View File

@@ -1,5 +1,6 @@
using System.Xml.Serialization;
using Newtonsoft.Json;
using SabreTools.Data.Extensions;
namespace SabreTools.Metadata.DatItems.Formats
{

1
SabreTools.Metadata.DatItems/Formats/ConfLocation.cs
View File

@@ -1,5 +1,6 @@
using System.Xml.Serialization;
using Newtonsoft.Json;
using SabreTools.Data.Extensions;
namespace SabreTools.Metadata.DatItems.Formats
{

1
SabreTools.Metadata.DatItems/Formats/ConfSetting.cs
View File

@@ -1,5 +1,6 @@
using System.Xml.Serialization;
using Newtonsoft.Json;
using SabreTools.Data.Extensions;
namespace SabreTools.Metadata.DatItems.Formats
{

1
SabreTools.Metadata.DatItems/Formats/Configuration.cs
View File

@@ -1,6 +1,7 @@
using System;
using System.Xml.Serialization;
using Newtonsoft.Json;
using SabreTools.Data.Extensions;
namespace SabreTools.Metadata.DatItems.Formats
{

1
SabreTools.Metadata.DatItems/Formats/DeviceRef.cs
View File

@@ -1,5 +1,6 @@
using System.Xml.Serialization;
using Newtonsoft.Json;
using SabreTools.Data.Extensions;
namespace SabreTools.Metadata.DatItems.Formats
{

1
SabreTools.Metadata.DatItems/Formats/DipLocation.cs
View File

@@ -1,5 +1,6 @@
using System.Xml.Serialization;
using Newtonsoft.Json;
using SabreTools.Data.Extensions;
namespace SabreTools.Metadata.DatItems.Formats
{

1
SabreTools.Metadata.DatItems/Formats/DipSwitch.cs
View File

@@ -1,6 +1,7 @@
using System;
using System.Xml.Serialization;
using Newtonsoft.Json;
using SabreTools.Data.Extensions;
namespace SabreTools.Metadata.DatItems.Formats
{

1
SabreTools.Metadata.DatItems/Formats/DipValue.cs
View File

@@ -1,5 +1,6 @@
using System.Xml.Serialization;
using Newtonsoft.Json;
using SabreTools.Data.Extensions;
namespace SabreTools.Metadata.DatItems.Formats
{

1
SabreTools.Metadata.DatItems/Formats/DiskArea.cs
View File

@@ -1,5 +1,6 @@
using System.Xml.Serialization;
using Newtonsoft.Json;
using SabreTools.Data.Extensions;
namespace SabreTools.Metadata.DatItems.Formats
{

1
SabreTools.Metadata.DatItems/Formats/Extension.cs
View File

@@ -1,5 +1,6 @@
using System.Xml.Serialization;
using Newtonsoft.Json;
using SabreTools.Data.Extensions;
namespace SabreTools.Metadata.DatItems.Formats
{

1
SabreTools.Metadata.DatItems/Formats/Info.cs
View File

@@ -1,5 +1,6 @@
using System.Xml.Serialization;
using Newtonsoft.Json;
using SabreTools.Data.Extensions;
namespace SabreTools.Metadata.DatItems.Formats
{

1
SabreTools.Metadata.DatItems/Formats/Input.cs
View File

@@ -1,6 +1,7 @@
using System;
using System.Xml.Serialization;
using Newtonsoft.Json;
using SabreTools.Data.Extensions;
namespace SabreTools.Metadata.DatItems.Formats
{

1
SabreTools.Metadata.DatItems/Formats/Instance.cs
View File

@@ -1,5 +1,6 @@
using System.Xml.Serialization;
using Newtonsoft.Json;
using SabreTools.Data.Extensions;
namespace SabreTools.Metadata.DatItems.Formats
{

1
SabreTools.Metadata.DatItems/Formats/Part.cs
View File

@@ -1,5 +1,6 @@
using System.Xml.Serialization;
using Newtonsoft.Json;
using SabreTools.Data.Extensions;
namespace SabreTools.Metadata.DatItems.Formats
{

1
SabreTools.Metadata.DatItems/Formats/Port.cs
View File

@@ -1,6 +1,7 @@
using System;
using System.Xml.Serialization;
using Newtonsoft.Json;
using SabreTools.Data.Extensions;
namespace SabreTools.Metadata.DatItems.Formats
{

1
SabreTools.Metadata.DatItems/Formats/RamOption.cs
View File

@@ -1,5 +1,6 @@
using System.Xml.Serialization;
using Newtonsoft.Json;
using SabreTools.Data.Extensions;
namespace SabreTools.Metadata.DatItems.Formats
{

1
SabreTools.Metadata.DatItems/Formats/Release.cs
View File

@@ -1,5 +1,6 @@
using System.Xml.Serialization;
using Newtonsoft.Json;
using SabreTools.Data.Extensions;
namespace SabreTools.Metadata.DatItems.Formats
{

1
SabreTools.Metadata.DatItems/Formats/Sample.cs
View File

@@ -1,5 +1,6 @@
using System.Xml.Serialization;
using Newtonsoft.Json;
using SabreTools.Data.Extensions;
namespace SabreTools.Metadata.DatItems.Formats
{

1
SabreTools.Metadata.DatItems/Formats/SharedFeat.cs
View File

@@ -1,5 +1,6 @@
using System.Xml.Serialization;
using Newtonsoft.Json;
using SabreTools.Data.Extensions;
namespace SabreTools.Metadata.DatItems.Formats
{

1
SabreTools.Metadata.DatItems/Formats/Slot.cs
View File

@@ -1,6 +1,7 @@
using System;
using System.Xml.Serialization;
using Newtonsoft.Json;
using SabreTools.Data.Extensions;
namespace SabreTools.Metadata.DatItems.Formats
{

1
SabreTools.Metadata.DatItems/Formats/SlotOption.cs
View File

@@ -1,5 +1,6 @@
using System.Xml.Serialization;
using Newtonsoft.Json;
using SabreTools.Data.Extensions;
namespace SabreTools.Metadata.DatItems.Formats
{

1
SabreTools.Metadata.DatItems/Formats/Sound.cs
View File

@@ -1,5 +1,6 @@
using System.Xml.Serialization;
using Newtonsoft.Json;
using SabreTools.Data.Extensions;
namespace SabreTools.Metadata.DatItems.Formats
{

1
SabreTools.Metadata.DatItems/Trurip.cs
View File

@@ -1,6 +1,7 @@
using System;
using System.Xml.Serialization;
using Newtonsoft.Json;
using SabreTools.Data.Extensions;
namespace SabreTools.Metadata.DatItems
{

1
SabreTools.Metadata.Filter/FilterObject.cs
View File

@@ -1,5 +1,6 @@
using System;
using System.Text.RegularExpressions;
using SabreTools.Data.Extensions;
using SabreTools.Data.Models.Metadata;
using SabreTools.Text.Extensions;

38
SabreTools.Metadata.Test/ConvertersTests.cs
View File

@@ -1,38 +0,0 @@
using Xunit;
namespace SabreTools.Metadata.Test
{
public class ConvertersTests
{
#region String to Enum
[Theory]
[InlineData(null, null)]
[InlineData("INVALID", null)]
[InlineData("yes", true)]
[InlineData("True", true)]
[InlineData("no", false)]
[InlineData("False", false)]
public void AsYesNoTest(string? field, bool? expected)
{
bool? actual = field.AsYesNo();
Assert.Equal(expected, actual);
}
#endregion
#region Enum to String
[Theory]
[InlineData(null, null)]
[InlineData(true, "yes")]
[InlineData(false, "no")]
public void FromYesNo(bool? field, string? expected)
{
string? actual = field.FromYesNo();
Assert.Equal(expected, actual);
}
#endregion
}
}

43
SabreTools.Metadata/Converters.cs
View File

@@ -1,43 +0,0 @@
namespace SabreTools.Metadata
{
public static class Converters
{
#region String to Enum
/// <summary>
/// Get bool? value from input string
/// </summary>
/// <param name="yesno">String to get value from</param>
/// <returns>bool? corresponding to the string</returns>
public static bool? AsYesNo(this string? yesno)
{
return yesno?.ToLowerInvariant() switch
{
"yes" or "true" => true,
"no" or "false" => false,
_ => null,
};
}
#endregion
#region Enum to String
/// <summary>
/// Get string value from input bool?
/// </summary>
/// <param name="yesno">bool? to get value from</param>
/// <returns>String corresponding to the bool?</returns>
public static string? FromYesNo(this bool? yesno)
{
return yesno switch
{
true => "yes",
false => "no",
_ => null,
};
}
#endregion
}
}

39
SabreTools.Metadata/DictionaryBaseExtensions.cs
View File

@@ -8,45 +8,6 @@ namespace SabreTools.Metadata
{
public static class DictionaryBaseExtensions
{
#region Cloning
/// <summary>
/// Deep clone a DictionaryBase object
/// </summary>
public static DictionaryBase? Clone(this DictionaryBase self)
{
// If construction failed, we can't do anything
if (Activator.CreateInstance(self.GetType()) is not DictionaryBase clone)
return null;
// Loop through and clone per type
foreach (string key in self.Keys)
{
object? value = self[key];
clone[key] = value switch
{
// Primative types
bool or long or double or string => value,
// DictionaryBase types
DictionaryBase db => db.Clone(),
// Enumerable types
byte[] bytArr => bytArr.Clone(),
string[] strArr => strArr.Clone(),
DictionaryBase[] dbArr => Array.ConvertAll(dbArr, Clone),
ICloneable[] clArr => Array.ConvertAll(clArr, cl => cl.Clone()),
// Everything else just copies
_ => value,
};
}
return clone;
}
#endregion
#region Equality Checking
/// <summary>