mirror of
https://github.com/MindWorkAI/AI-Studio.git
synced 2026-06-27 19:16:27 +00:00
fix settings_manager_issue
This commit is contained in:
parent
1c2d243c1f
commit
93ab5b51dd
@ -151,7 +151,7 @@ public record ConfigMeta<TClass, TValue> : ConfigMetaBase
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
private void Reset()
|
private void Reset()
|
||||||
{
|
{
|
||||||
var configInstance = this.ConfigSelection.Compile().Invoke(SETTINGS_MANAGER.ConfigurationData);
|
var configInstance = this.ConfigSelection.Compile().Invoke(CurrentSettingsManager.ConfigurationData);
|
||||||
var memberExpression = this.PropertyExpression.GetMemberExpression();
|
var memberExpression = this.PropertyExpression.GetMemberExpression();
|
||||||
if (memberExpression.Member is System.Reflection.PropertyInfo propertyInfo)
|
if (memberExpression.Member is System.Reflection.PropertyInfo propertyInfo)
|
||||||
propertyInfo.SetValue(configInstance, this.Default);
|
propertyInfo.SetValue(configInstance, this.Default);
|
||||||
@ -163,7 +163,7 @@ public record ConfigMeta<TClass, TValue> : ConfigMetaBase
|
|||||||
/// <param name="value">The value to set for the configuration property.</param>
|
/// <param name="value">The value to set for the configuration property.</param>
|
||||||
public void SetValue(TValue value)
|
public void SetValue(TValue value)
|
||||||
{
|
{
|
||||||
var configInstance = this.ConfigSelection.Compile().Invoke(SETTINGS_MANAGER.ConfigurationData);
|
var configInstance = this.ConfigSelection.Compile().Invoke(CurrentSettingsManager.ConfigurationData);
|
||||||
var memberExpression = this.PropertyExpression.GetMemberExpression();
|
var memberExpression = this.PropertyExpression.GetMemberExpression();
|
||||||
if (memberExpression.Member is System.Reflection.PropertyInfo propertyInfo)
|
if (memberExpression.Member is System.Reflection.PropertyInfo propertyInfo)
|
||||||
propertyInfo.SetValue(configInstance, value);
|
propertyInfo.SetValue(configInstance, value);
|
||||||
@ -174,7 +174,7 @@ public record ConfigMeta<TClass, TValue> : ConfigMetaBase
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public TValue GetValue()
|
public TValue GetValue()
|
||||||
{
|
{
|
||||||
var configInstance = this.ConfigSelection.Compile().Invoke(SETTINGS_MANAGER.ConfigurationData);
|
var configInstance = this.ConfigSelection.Compile().Invoke(CurrentSettingsManager.ConfigurationData);
|
||||||
var memberExpression = this.PropertyExpression.GetMemberExpression();
|
var memberExpression = this.PropertyExpression.GetMemberExpression();
|
||||||
if (memberExpression.Member is System.Reflection.PropertyInfo propertyInfo && propertyInfo.GetValue(configInstance) is TValue value)
|
if (memberExpression.Member is System.Reflection.PropertyInfo propertyInfo && propertyInfo.GetValue(configInstance) is TValue value)
|
||||||
return value;
|
return value;
|
||||||
|
|||||||
@ -2,5 +2,5 @@ namespace AIStudio.Settings;
|
|||||||
|
|
||||||
public abstract record ConfigMetaBase : IConfig
|
public abstract record ConfigMetaBase : IConfig
|
||||||
{
|
{
|
||||||
protected static readonly SettingsManager SETTINGS_MANAGER = Program.SERVICE_PROVIDER.GetRequiredService<SettingsManager>();
|
protected static SettingsManager CurrentSettingsManager => Program.SERVICE_PROVIDER.GetRequiredService<SettingsManager>();
|
||||||
}
|
}
|
||||||
@ -654,7 +654,7 @@ public static partial class ManagedConfiguration
|
|||||||
|
|
||||||
if (successful)
|
if (successful)
|
||||||
{
|
{
|
||||||
var configInstance = configSelection.Compile().Invoke(SETTINGS_MANAGER.ConfigurationData);
|
var configInstance = configSelection.Compile().Invoke(CurrentSettingsManager.ConfigurationData);
|
||||||
var currentValue = propertyExpression.Compile().Invoke(configInstance);
|
var currentValue = propertyExpression.Compile().Invoke(configInstance);
|
||||||
var merged = new HashSet<TValue>(currentValue);
|
var merged = new HashSet<TValue>(currentValue);
|
||||||
merged.UnionWith(configuredValue);
|
merged.UnionWith(configuredValue);
|
||||||
|
|||||||
@ -9,7 +9,7 @@ namespace AIStudio.Settings;
|
|||||||
public static partial class ManagedConfiguration
|
public static partial class ManagedConfiguration
|
||||||
{
|
{
|
||||||
private static readonly ConcurrentDictionary<string, IConfig> METADATA = new();
|
private static readonly ConcurrentDictionary<string, IConfig> METADATA = new();
|
||||||
private static readonly SettingsManager SETTINGS_MANAGER = Program.SERVICE_PROVIDER.GetRequiredService<SettingsManager>();
|
private static SettingsManager CurrentSettingsManager => Program.SERVICE_PROVIDER.GetRequiredService<SettingsManager>();
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Attempts to retrieve the configuration metadata for a given configuration selection and
|
/// Attempts to retrieve the configuration metadata for a given configuration selection and
|
||||||
@ -418,19 +418,19 @@ public static partial class ManagedConfiguration
|
|||||||
|
|
||||||
private static bool TryGetEditableDefaultState(string settingName, out ManagedEditableDefaultState editableDefaultState)
|
private static bool TryGetEditableDefaultState(string settingName, out ManagedEditableDefaultState editableDefaultState)
|
||||||
{
|
{
|
||||||
return SETTINGS_MANAGER.ConfigurationData.ManagedEditableDefaults.TryGetValue(settingName, out editableDefaultState!);
|
return CurrentSettingsManager.ConfigurationData.ManagedEditableDefaults.TryGetValue(settingName, out editableDefaultState!);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void SetEditableDefaultState(string settingName, Guid pluginId, string lastAppliedValue)
|
private static void SetEditableDefaultState(string settingName, Guid pluginId, string lastAppliedValue)
|
||||||
{
|
{
|
||||||
SETTINGS_MANAGER.ConfigurationData.ManagedEditableDefaults[settingName] = new()
|
CurrentSettingsManager.ConfigurationData.ManagedEditableDefaults[settingName] = new()
|
||||||
{
|
{
|
||||||
ConfigPluginId = pluginId,
|
ConfigPluginId = pluginId,
|
||||||
LastAppliedValue = lastAppliedValue,
|
LastAppliedValue = lastAppliedValue,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
private static bool ClearEditableDefaultState(string settingName) => SETTINGS_MANAGER.ConfigurationData.ManagedEditableDefaults.Remove(settingName);
|
private static bool ClearEditableDefaultState(string settingName) => CurrentSettingsManager.ConfigurationData.ManagedEditableDefaults.Remove(settingName);
|
||||||
|
|
||||||
private static bool CleanupEditableDefaultState<TClass, TValue>(
|
private static bool CleanupEditableDefaultState<TClass, TValue>(
|
||||||
ConfigMeta<TClass, TValue> configMeta,
|
ConfigMeta<TClass, TValue> configMeta,
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user