Pilz.NET/Pilz
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rename IChildSettings to ISettingsNode & update Settings.Get<T>()

Browse Source
This commit is contained in:
Pilzinsel64
2025-07-10 06:31:43 +02:00
parent bdeb098dc4
commit 542467ccea
4 changed files with 43 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Pilz.Configuration/IChildSettings.cs
View File

@@ -1,6 +0,0 @@
namespace Pilz.Configuration;
public interface IChildSettings
{
void Reset();
}

4
Pilz.Configuration/ISettings.cs
View File

@@ -5,8 +5,8 @@ namespace Pilz.Configuration;
public interface ISettings public interface ISettings
{ {
IReadOnlyCollection<IChildSettings> Childs { get; } IReadOnlyCollection<ISettingsNode> Childs { get; }
T Get<T>() where T : IChildSettings, ISettingsIdentifier; T Get<T>() where T : ISettingsNode, ISettingsIdentifier;
void Reset(); void Reset();
string Save(JsonSerializerSettings serializer); string Save(JsonSerializerSettings serializer);
bool Load(JsonSerializerSettings serializer, string raw); bool Load(JsonSerializerSettings serializer, string raw);

11
Pilz.Configuration/ISettingsNode.cs Normal file
View File

@@ -0,0 +1,11 @@
using System;
namespace Pilz.Configuration;
public interface ISettingsNode
{
void Reset();
}
[Obsolete("Use ISettingsNode instead!")]
public interface IChildSettings : ISettingsNode;

44
Pilz.Configuration/Settings.cs
View File

@@ -8,32 +8,48 @@ namespace Pilz.Configuration;
public class Settings : ISettings public class Settings : ISettings
{ {
protected readonly Dictionary<string, JObject> settingsJson = []; protected readonly Dictionary<string, JObject> settingsJson = [];
protected readonly Dictionary<string, IChildSettings> settings = []; protected readonly Dictionary<string, ISettingsNode> settings = [];
protected JsonSerializerSettings serializerSettings; protected JsonSerializerSettings serializerSettings;
public virtual IReadOnlyCollection<IChildSettings> Childs => settings.Values; public virtual IReadOnlyCollection<ISettingsNode> Childs => settings.Values;
public virtual T Get<T>() where T : IChildSettings, ISettingsIdentifier public virtual T Get<T>() where T : ISettingsNode, ISettingsIdentifier
{ {
// Find existing one
if (settings.TryGetValue(T.Identifier, out var valueExisting) && valueExisting is T settingsExisting) if (settings.TryGetValue(T.Identifier, out var valueExisting) && valueExisting is T settingsExisting)
return settingsExisting; return settingsExisting;
if (settingsJson.TryGetValue(T.Identifier, out var valueRaw) // Create new & reset
&& valueRaw.ToObject<T>(JsonSerializer.CreateDefault(serializerSettings)) is T settingsDeserialized) T instance = default;
{
if (!settings.TryAdd(T.Identifier, settingsDeserialized))
settings[T.Identifier] = settingsDeserialized;
return settingsDeserialized;
}
if (Activator.CreateInstance<T>() is T settingsNew) if (Activator.CreateInstance<T>() is T settingsNew)
{ {
settingsNew.Reset(); settingsNew.Reset();
settings.Add(T.Identifier, settingsNew); settings[T.Identifier] = settingsNew;
return settingsNew; instance = settingsNew;
}
else
settingsNew = default;
// Try deserialize
if (settingsJson.TryGetValue(T.Identifier, out var valueRaw))
{
var serializer = JsonSerializer.CreateDefault(serializerSettings);
// Populate
if (settingsNew != null)
serializer.Populate(valueRaw.CreateReader(), instance);
// Deserialize (fallback)
else if (valueRaw.ToObject<T>() is T settingsDeserialized)
settingsNew = settingsDeserialized;
} }
return default; // Remember
if (settingsNew != null)
settings[T.Identifier] = settingsNew;
// Return
return settingsNew;
} }
public void Reset() public void Reset()