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

wrapper for features & reduce dup code

Browse Source
This commit is contained in:
Pascal
2023-12-06 07:40:32 +01:00
parent 0ecbde3fd7
commit d2c8986d51
2 changed files with 42 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Pilz.Plugins.Advanced/Pilz.Plugins.Advanced.csproj
View File

@@ -9,7 +9,7 @@
<PropertyGroup>
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
<Version>2.1.0</Version>
<Version>2.2.0</Version>
</PropertyGroup>
<ItemGroup>

59
Pilz.Plugins.Advanced/PluginFeatureController.cs
View File

@@ -17,14 +17,15 @@ namespace Pilz.Plugins.Advanced
private readonly List<PluginFeature> features = new();
/// <summary>
/// Returns a collection of all registred <see cref="PluginFeature"/> instances.
/// A wrapper of all registred <see cref="PluginFeature"/> instances.
/// </summary>
public IReadOnlyList<PluginFeature> Features => features.AsReadOnly();
public FeatureController Features { get; init; }
/// <summary>
/// A wrapper for all registred <see cref="PluginModule"/> instances.
/// </summary>
public ModuleController Modules { get; init; }
/// <summary>
/// A wrapper for all registred <see cref="PluginFunction"/> instances.
/// </summary>
@@ -32,6 +33,7 @@ namespace Pilz.Plugins.Advanced
public PluginFeatureController()
{
Features = new(this);
Functions = new(this);
Modules = new(this);
}
@@ -47,43 +49,64 @@ namespace Pilz.Plugins.Advanced
features.Remove(module);
}
public class ModuleController
public class FeatureController
{
private readonly PluginFeatureController controller;
protected readonly PluginFeatureController controller;
public ModuleController(PluginFeatureController controller)
public FeatureController(PluginFeatureController controller)
{
this.controller = controller;
}
public IEnumerable<PluginModule> GetAll()
public virtual IEnumerable<PluginFeature> GetAll()
{
return controller.features.OfType<PluginModule>();
return controller.features.AsReadOnly();
}
public IEnumerable<PluginModule> Get(string moduleType)
public virtual IEnumerable<PluginFeature> Get(string moduleType)
{
return GetAll().Where(n => n.Type == moduleType);
return controller.features.Where(n => n.Type == moduleType);
}
public virtual PluginFeature? GetFirst(string moduleType)
{
return controller.features.FirstOrDefault(n => n.Type == moduleType);
}
}
public class FunctionController
public class FeatureController<T> : FeatureController where T : PluginFeature
{
private readonly PluginFeatureController controller;
public FunctionController(PluginFeatureController controller)
public FeatureController(PluginFeatureController controller) : base(controller)
{
this.controller = controller;
}
public IEnumerable<PluginFunction> GetAll()
public override IEnumerable<T> GetAll()
{
return controller.features.OfType<PluginFunction>();
return controller.features.OfType<T>();
}
public IEnumerable<PluginFunction> Get(string functionType)
public override IEnumerable<T> Get(string moduleType)
{
return GetAll().Where(n => n.Type == moduleType);
}
public override T? GetFirst(string moduleType)
{
return GetAll().FirstOrDefault(n => n.Type == moduleType);
}
}
public class ModuleController : FeatureController<PluginModule>
{
public ModuleController(PluginFeatureController controller) : base(controller)
{
}
}
public class FunctionController : FeatureController<PluginFunction>
{
public FunctionController(PluginFeatureController controller) : base(controller)
{
return GetAll().Where(n => n.Type == functionType);
}
public void ExecuteAll(string functionType)