That-One-Nerd/SrcMod
1
0
Fork 0
Code Issues 30 Pull Requests Actions Packages Projects Releases 9 Wiki Activity

Fixed a config parsing error with booleans.

Browse Source
This commit is contained in:
That_One_Nerd 2023-05-16 08:31:06 -04:00
parent dfda870eac
commit 858bd580b6
2 changed files with 65 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
SrcMod/Shell/Modules/ObjectModels/TypeParsers.cs
View File

@ -2,38 +2,73 @@
public static class TypeParsers public static class TypeParsers
{ {
public static bool CanParse(object? obj) => obj is not null && obj is sbyte or byte or short or ushort or int public static bool CanParse(object? obj) => obj is not null && obj is bool or sbyte or byte or short or ushort
or uint or long or ulong or Int128 or UInt128 or nint or nuint or Half or float or double or decimal or int or uint or long or ulong or Int128 or UInt128 or nint or nuint or Half or float or double or decimal
or char or DateOnly or DateTime or DateTimeOffset or Guid or TimeOnly or TimeSpan; or char or DateOnly or DateTime or DateTimeOffset or Guid or TimeOnly or TimeSpan;
public static object ParseAll(string msg) public static object ParseAll(string msg)
{ {
if (TryParse(msg, out sbyte int8)) return int8; if (TryParseBool(msg, out bool resBool)) return resBool;
if (TryParse(msg, out byte uInt8)) return uInt8; else if (TryParse(msg, out sbyte int8)) return int8;
if (TryParse(msg, out short int16)) return int16; else if (TryParse(msg, out byte uInt8)) return uInt8;
if (TryParse(msg, out ushort uInt16)) return uInt16; else if (TryParse(msg, out short int16)) return int16;
if (TryParse(msg, out int int32)) return int32; else if (TryParse(msg, out ushort uInt16)) return uInt16;
if (TryParse(msg, out uint uInt32)) return uInt32; else if (TryParse(msg, out int int32)) return int32;
if (TryParse(msg, out long int64)) return int64; else if (TryParse(msg, out uint uInt32)) return uInt32;
if (TryParse(msg, out ulong uInt64)) return uInt64; else if (TryParse(msg, out long int64)) return int64;
if (TryParse(msg, out Int128 int128)) return int128; else if (TryParse(msg, out ulong uInt64)) return uInt64;
if (TryParse(msg, out UInt128 uInt128)) return uInt128; else if (TryParse(msg, out Int128 int128)) return int128;
if (TryParse(msg, out nint intPtr)) return intPtr; else if (TryParse(msg, out UInt128 uInt128)) return uInt128;
if (TryParse(msg, out nuint uIntPtr)) return uIntPtr; else if (TryParse(msg, out nint intPtr)) return intPtr;
if (TryParse(msg, out Half float16)) return float16; else if (TryParse(msg, out nuint uIntPtr)) return uIntPtr;
if (TryParse(msg, out float float32)) return float32; else if (TryParse(msg, out Half float16)) return float16;
if (TryParse(msg, out double float64)) return float64; else if (TryParse(msg, out float float32)) return float32;
if (TryParse(msg, out decimal float128)) return float128; else if (TryParse(msg, out double float64)) return float64;
if (TryParse(msg, out char resChar)) return resChar; else if (TryParse(msg, out decimal float128)) return float128;
if (TryParse(msg, out DateOnly dateOnly)) return dateOnly; else if (TryParse(msg, out char resChar)) return resChar;
if (TryParse(msg, out DateTime dateTime)) return dateTime; else if (TryParse(msg, out DateOnly dateOnly)) return dateOnly;
if (TryParse(msg, out DateTimeOffset dateTimeOffset)) return dateTimeOffset; else if (TryParse(msg, out DateTime dateTime)) return dateTime;
if (TryParse(msg, out Guid guid)) return guid; else if (TryParse(msg, out DateTimeOffset dateTimeOffset)) return dateTimeOffset;
if (TryParse(msg, out TimeOnly timeOnly)) return timeOnly; else if (TryParse(msg, out Guid guid)) return guid;
if (TryParse(msg, out TimeSpan timeSpan)) return timeSpan; else if (TryParse(msg, out TimeOnly timeOnly)) return timeOnly;
else if (TryParse(msg, out TimeSpan timeSpan)) return timeSpan;
return msg; else return msg;
} }
public static bool TryParseBool(string msg, out bool result)
{
string trimmed = msg.Trim().ToLower();
string[] trues = new string[]
{
"t",
"true",
"1",
"y",
"yes"
},
falses = new string[]
{
"f",
"false",
"0",
"n",
"no"
};
foreach (string t in trues) if (trimmed == t)
{
result = true;
return true;
}
foreach (string f in falses) if (trimmed == f)
{
result = false;
return true;
}
result = false;
return false;
}
public static bool TryParse<T>(string msg, out T? result) where T : IParsable<T> public static bool TryParse<T>(string msg, out T? result) where T : IParsable<T>
=> T.TryParse(msg, null, out result); => T.TryParse(msg, null, out result);
} }

3
SrcMod/Shell/ObjectModels/Config.cs
View File

@ -71,6 +71,7 @@ public class Config
public string[] GameDirectories; public string[] GameDirectories;
public AskMode RunUnsafeCommands; public AskMode RunUnsafeCommands;
public bool UseLocalModDirectories;
internal Config() internal Config()
{ {
@ -130,6 +131,7 @@ public class Config
} }
RunUnsafeCommands = AskMode.Ask; RunUnsafeCommands = AskMode.Ask;
UseLocalModDirectories = true;
} }
public Config ApplyChanges(Changes changes) public Config ApplyChanges(Changes changes)
@ -230,6 +232,7 @@ public class Config
{ {
public string[]? GameDirectories; public string[]? GameDirectories;
public AskMode? RunUnsafeCommands; public AskMode? RunUnsafeCommands;
public bool? UseLocalModDirectories;
public bool Any() => typeof(Changes).GetFields().Any(x => x.GetValue(this) is not null); public bool Any() => typeof(Changes).GetFields().Any(x => x.GetValue(this) is not null);
} }