ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-05 17:05:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

add Util.GetFirstConfigVarFromSections<T>(..) While GetConfigVarFromSections<T> scans all sections and returns the last value found, this returns as soon a value is found. So sections should be order from high priority to lower

Browse Source
This commit is contained in:
UbitUmarov
2026-05-12 03:18:26 +01:00
parent 9db019b2cc
commit 88ef8a9dbe
3 changed files with 117 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

117
OpenSim/Framework/Util.cs
View File

@@ -2232,9 +2232,9 @@ namespace OpenSim.Framework
/// <returns></returns>
public static T GetConfigVarFromSections<T>(IConfigSource config, string varname, string[] sections, object val)
{
foreach (string section in sections.AsSpan())
for (int i = 0 ; i < sections.Length; i++)
{
IConfig cnf = config.Configs[section];
IConfig cnf = config.Configs[sections[i]];
if (cnf == null)
continue;
@@ -2252,6 +2252,119 @@ namespace OpenSim.Framework
return (T)val;
}
/// <summary>
/// Gets the value of a configuration variable by looking into
/// multiple sections in order. Returns as soon one is found, ignoring other sections
/// </summary>
/// <remarks>
/// If no value is found then the given default value is returned
/// </remarks>
/// <typeparam name="T">Type of the variable</typeparam>
/// <param name="config">The configuration object</param>
/// <param name="varname">The configuration variable</param>
/// <param name="sections">Ordered sequence of sections to look at</param>
/// <param name="val">Default value</param>
/// <returns></returns>
public static T GetFirstConfigVarFromSections<T>(IConfigSource config, string varname, string[] sections, object val)
{
for (int i = 0 ; i < sections.Length; i++)
{
IConfig cnf = config.Configs[sections[i]];
if (cnf == null)
continue;
string text = cnf.Get(varname);
if (!string.IsNullOrEmpty(text))
{
if (typeof(T) == typeof(string))
return Unsafe.As<string, T>(ref text);
if (typeof(T) == typeof(bool))
{
bool b = bool.Parse(text);
return Unsafe.As<bool, T>(ref b);
}
if (typeof(T) == typeof(int))
{
int ti = int.Parse(text);
return Unsafe.As<int, T>(ref ti);
}
if (typeof(T) == typeof(float))
{
float f = float.Parse(text);
return Unsafe.As<float, T>(ref f);
}
if (typeof(T) == typeof(double))
{
double d = double.Parse(text);
return Unsafe.As<double, T>(ref d);
}
}
}
return val == null ? default : (T) val;
}
/// <summary>
/// Gets the value of a configuration variable by looking into
/// multiple sections in order. Returns as soon one is found, ignoring other sections
/// </summary>
/// <remarks>
/// If no value is found then the default value of T is returned
/// </remarks>
/// <typeparam name="T">Type of the variable</typeparam>
/// <param name="config">The configuration object</param>
/// <param name="varname">The configuration variable</param>
/// <param name="sections">Ordered sequence of sections to look at</param>
/// <returns></returns>
public static T GetFirstConfigVarFromSections<T>(IConfigSource config, string varname, string[] sections)
{
for (int i = 0 ; i < sections.Length; i++)
{
IConfig cnf = config.Configs[sections[i]];
if (cnf == null)
continue;
string text = cnf.Get(varname);
if (!string.IsNullOrEmpty(text))
{
if (typeof(T) == typeof(string))
return Unsafe.As<string, T>(ref text);
if (typeof(T) == typeof(bool))
{
bool b = bool.Parse(text);
return Unsafe.As<bool, T>(ref b);
}
if (typeof(T) == typeof(int))
{
int ti = int.Parse(text);
return Unsafe.As<int, T>(ref ti);
}
if (typeof(T) == typeof(float))
{
float f = float.Parse(text);
return Unsafe.As<float, T>(ref f);
}
if (typeof(T) == typeof(double))
{
double d = double.Parse(text);
return Unsafe.As<double, T>(ref d);
}
}
}
return default;
}
public static void MergeEnvironmentToConfig(IConfigSource ConfigSource)
{
IConfig enVars = ConfigSource.Configs["Environment"];