DarthAffe/Artemis
1
0
Fork 0
mirror of https://github.com/Artemis-RGB/Artemis synced 2025-12-13 05:48:35 +00:00
Code Issues Releases Wiki Activity

Dynamic data models - Fixed data model paths not handling inheritance very well

Browse Source
This commit is contained in:
Robert 2021-04-20 00:29:48 +02:00
parent 6904a137e1
commit f3a823644e
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/Artemis.Core/Plugins/DataModelExpansions/DataModel.cs
View File

@ -134,12 +134,16 @@ namespace Artemis.Core.DataModelExpansions
if (key.Contains('.')) if (key.Contains('.'))
throw new ArtemisCoreException("The provided key contains an illegal character (.)"); throw new ArtemisCoreException("The provided key contains an illegal character (.)");
if (_dynamicChildren.ContainsKey(key)) if (_dynamicChildren.ContainsKey(key))
{
throw new ArtemisCoreException($"Cannot add a dynamic child with key '{key}' " + throw new ArtemisCoreException($"Cannot add a dynamic child with key '{key}' " +
"because the key is already in use on by another dynamic property this data model."); "because the key is already in use on by another dynamic property this data model.");
}
if (GetType().GetProperty(key) != null) if (GetType().GetProperty(key) != null)
{
throw new ArtemisCoreException($"Cannot add a dynamic child with key '{key}' " + throw new ArtemisCoreException($"Cannot add a dynamic child with key '{key}' " +
"because the key is already in use by a static property on this data model."); "because the key is already in use by a static property on this data model.");
}
// Make sure a name is on the attribute or funny things might happen // Make sure a name is on the attribute or funny things might happen
attribute.Name ??= key.Humanize(); attribute.Name ??= key.Humanize();
@ -155,7 +159,7 @@ namespace Artemis.Core.DataModelExpansions
OnDynamicDataModelAdded(new DynamicDataModelChildEventArgs(dynamicChild, key)); OnDynamicDataModelAdded(new DynamicDataModelChildEventArgs(dynamicChild, key));
return dynamicChild; return dynamicChild;
} }
/// <summary> /// <summary>
/// Gets a previously added dynamic child by its key /// Gets a previously added dynamic child by its key
/// </summary> /// </summary>
@ -208,7 +212,8 @@ namespace Artemis.Core.DataModelExpansions
/// <param name="key">The key of the dynamic child</param> /// <param name="key">The key of the dynamic child</param>
/// <param name="dynamicChild"> /// <param name="dynamicChild">
/// When this method returns, the <see cref="DynamicChild{T}" /> associated with the specified /// When this method returns, the <see cref="DynamicChild{T}" /> associated with the specified
/// key, if the key is found; otherwise, <see langword="null" />. This parameter is passed uninitialized. /// key, if the key is found and the type matches; otherwise, <see langword="null" />. This parameter is passed
/// uninitialized.
/// </param> /// </param>
/// <returns> /// <returns>
/// <see langword="true" /> if the data model contains the dynamic child; otherwise <see langword="false" /> /// <see langword="true" /> if the data model contains the dynamic child; otherwise <see langword="false" />
@ -267,7 +272,9 @@ namespace Artemis.Core.DataModelExpansions
// Used a runtime by data model paths only // Used a runtime by data model paths only
internal T? GetDynamicChildValue<T>(string key) internal T? GetDynamicChildValue<T>(string key)
{ {
return TryGetDynamicChild(key, out DynamicChild<T>? dynamicChild) ? dynamicChild.Value : default; if (TryGetDynamicChild(key, out DynamicChild? dynamicChild) && dynamicChild.BaseValue != null)
return (T) dynamicChild.BaseValue;
return default;
} }
#endregion #endregion