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

separete parameters collection

Browse Source
This commit is contained in:
Pilzinsel64
2024-11-11 12:53:58 +01:00
parent bf2ec306cc
commit 96b6536a7a
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Pilz.Plugins/PluginManager{T,T}.cs
View File

@@ -167,9 +167,6 @@ public class PluginManager<TPluginInterface, TPluginRuntimeInfo> where TPluginIn
protected virtual void LoadPlugin(PluginLoadInfo<TPluginInterface, TPluginRuntimeInfo> result, Type type, params object?[]? parameters) protected virtual void LoadPlugin(PluginLoadInfo<TPluginInterface, TPluginRuntimeInfo> result, Type type, params object?[]? parameters)
{ {
if (parameters == null || parameters.Length == 0)
parameters = DefaultParameters;
if (loadedPlugins.Any(n => n.Plugin != null && n.Plugin.GetType() == type)) if (loadedPlugins.Any(n => n.Plugin != null && n.Plugin.GetType() == type))
result.Status = PluginLoadStatus.AlreadyLoaded; result.Status = PluginLoadStatus.AlreadyLoaded;
else if (type.IsAssignableTo(typeof(TPluginInterface))) else if (type.IsAssignableTo(typeof(TPluginInterface)))
@@ -180,7 +177,7 @@ public class PluginManager<TPluginInterface, TPluginRuntimeInfo> where TPluginIn
try try
{ {
if (Activator.CreateInstance(type, GetConstructorFlags(), null, parameters, null) is TPluginInterface plugin) if (Activator.CreateInstance(type, GetConstructorFlags(), null, GetParameters(type, parameters), null) is TPluginInterface plugin)
{ {
if (plugin is IPluginLateInitialization pluginLateInit) if (plugin is IPluginLateInitialization pluginLateInit)
pluginLateInit.LateInit(); pluginLateInit.LateInit();
@@ -200,6 +197,13 @@ public class PluginManager<TPluginInterface, TPluginRuntimeInfo> where TPluginIn
result.Status = PluginLoadStatus.NoValidPlugin; result.Status = PluginLoadStatus.NoValidPlugin;
} }
protected virtual object?[]? GetParameters(Type type, object?[]? parameters)
{
if (parameters == null || parameters.Length == 0)
return DefaultParameters;
return parameters;
}
protected virtual BindingFlags GetConstructorFlags() protected virtual BindingFlags GetConstructorFlags()
{ {
return BindingFlags.Instance | BindingFlags.Public | BindingFlags.CreateInstance; return BindingFlags.Instance | BindingFlags.Public | BindingFlags.CreateInstance;