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

Options helper cleanup

Browse Source
This commit is contained in:
Matt Nadareski
2026-03-10 13:24:57 -04:00
parent eab0beb390
commit 8635b25978
3 changed files with 7 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELIST.md
View File

@@ -65,6 +65,7 @@
- Aaru Linux packages use xz now
- Repair incomplete SS files
- Cleanup of processing code
- Options helper cleanup
### 3.6.0 (2025-11-28)

64
MPF.Frontend/Options.cs
View File

@@ -1,5 +1,4 @@
using System;
using System.Collections.Generic;
using System.IO;
using Newtonsoft.Json;
using SabreTools.RedumpLib.Data;
@@ -170,69 +169,6 @@ namespace MPF.Frontend
}
#endregion
#region Helpers
/// <summary>
/// Get a Boolean setting from a settings, dictionary
/// </summary>
/// <param name="settings">Dictionary representing the settings</param>
/// <param name="key">Setting key to get a value for</param>
/// <param name="defaultValue">Default value to return if no value is found</param>
/// <returns>Setting value if possible, default value otherwise</returns>
internal static bool GetBooleanSetting(Dictionary<string, string?> settings, string key, bool defaultValue)
{
if (settings.ContainsKey(key))
{
if (bool.TryParse(settings[key], out bool value))
return value;
else
return defaultValue;
}
else
{
return defaultValue;
}
}
/// <summary>
/// Get an Int32 setting from a settings, dictionary
/// </summary>
/// <param name="settings">Dictionary representing the settings</param>
/// <param name="key">Setting key to get a value for</param>
/// <param name="defaultValue">Default value to return if no value is found</param>
/// <returns>Setting value if possible, default value otherwise</returns>
internal static int GetInt32Setting(Dictionary<string, string?> settings, string key, int defaultValue)
{
if (settings.ContainsKey(key))
{
if (int.TryParse(settings[key], out int value))
return value;
else
return defaultValue;
}
else
{
return defaultValue;
}
}
/// <summary>
/// Get a String setting from a settings, dictionary
/// </summary>
/// <param name="settings">Dictionary representing the settings</param>
/// <param name="key">Setting key to get a value for</param>
/// <param name="defaultValue">Default value to return if no value is found</param>
/// <returns>Setting value if possible, default value otherwise</returns>
internal static string? GetStringSetting(Dictionary<string, string?> settings, string key, string? defaultValue)
{
if (settings.ContainsKey(key))
return settings[key];
else
return defaultValue;
}
#endregion
}
#region Nested Option Types

12
MPF.Frontend/Tools/OptionsLoader.cs
View File

@@ -545,9 +545,9 @@ namespace MPF.Frontend.Tools
/// <returns>Setting value if possible, default value otherwise</returns>
private static bool GetBooleanSetting(Dictionary<string, string?> settings, string key, bool defaultValue)
{
if (settings.ContainsKey(key))
if (settings.TryGetValue(key, out string? strValue))
{
if (bool.TryParse(settings[key], out bool value))
if (bool.TryParse(strValue, out bool value))
return value;
else
return defaultValue;
@@ -567,9 +567,9 @@ namespace MPF.Frontend.Tools
/// <returns>Setting value if possible, default value otherwise</returns>
private static int GetInt32Setting(Dictionary<string, string?> settings, string key, int defaultValue)
{
if (settings.ContainsKey(key))
if (settings.TryGetValue(key, out string? strValue))
{
if (int.TryParse(settings[key], out int value))
if (int.TryParse(strValue, out int value))
return value;
else
return defaultValue;
@@ -589,8 +589,8 @@ namespace MPF.Frontend.Tools
/// <returns>Setting value if possible, default value otherwise</returns>
private static string? GetStringSetting(Dictionary<string, string?> settings, string key, string? defaultValue)
{
if (settings.ContainsKey(key))
return settings[key];
if (settings.TryGetValue(key, out string? strValue))
return strValue;
else
return defaultValue;
}