pepperdash/Essentials
1
0
Fork 0
mirror of https://github.com/PepperDash/Essentials.git synced 2026-02-16 13:15:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Plugin loading!

Browse Source
This commit is contained in:
Heath Volmer
2019-05-21 13:58:57 -06:00
parent 697b9109a3
commit 95c0f57000
3 changed files with 39 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
PepperDashEssentials/ControlSystem.cs
View File

@@ -11,7 +11,6 @@ using Crestron.SimplSharp.Reflection;
using PepperDash.Core; using PepperDash.Core;
using PepperDash.Essentials.Core; using PepperDash.Essentials.Core;
using PepperDash.Essentials.Core.Config; using PepperDash.Essentials.Core.Config;
using PepperDash.Essentials.Core.Factory;
using PepperDash.Essentials.Devices.Common; using PepperDash.Essentials.Devices.Common;
using PepperDash.Essentials.DM; using PepperDash.Essentials.DM;
using PepperDash.Essentials.Fusion; using PepperDash.Essentials.Fusion;
@@ -194,26 +193,38 @@ namespace PepperDash.Essentials
var dir = Global.FilePathPrefix + "plugins"; var dir = Global.FilePathPrefix + "plugins";
if (Directory.Exists(dir)) if (Directory.Exists(dir))
{ {
// TODO Clear out or create localPlugins folder (maybe in program slot folder)
Debug.Console(0, Debug.ErrorLogLevel.Notice, "Plugins directory found, checking for factory plugins"); Debug.Console(0, Debug.ErrorLogLevel.Notice, "Plugins directory found, checking for factory plugins");
var di = new DirectoryInfo(dir); var di = new DirectoryInfo(dir);
var files = di.GetFiles("*.dll"); var files = di.GetFiles("*.dll");
foreach (FileInfo fi in files) foreach (FileInfo fi in files)
{ {
Debug.Console(0, "Checking file '{0}' for factory", fi.Name); // TODO COPY plugin to loadedPlugins folder
// TODO LOAD that loadedPlugins dll file
var assy = Assembly.LoadFrom(fi.FullName); var assy = Assembly.LoadFrom(fi.FullName);
var type = assy.GetType("PepperDash.Essentials.Plugin.Factory"); var ver = assy.GetName().Version;
var factory = Crestron.SimplSharp.Reflection.Activator.CreateInstance(type); var verStr = string.Format("{0}.{1}.{2}.{3}", ver.Major, ver.Minor, ver.Build, ver.Revision);
if (factory is PepperDash.Essentials.Core.Factory.IGetCrestronDevice) Debug.Console(0, Debug.ErrorLogLevel.Notice, "Loaded plugin file '{0}', version {1}", fi.FullName, verStr);
// iteratate this assembly's classes, looking for "LoadPlugin()" methods
var types = assy.GetTypes();
foreach (var type in types)
{ {
Debug.Console(0, Debug.ErrorLogLevel.Notice, "Loaded '{0}' for Crestron device(s)", fi.Name); var methods = type.GetMethods(BindingFlags.Public | BindingFlags.Static);
FactoryObjects.Add(factory); var loadPlugin = methods.FirstOrDefault(m => m.Name.Equals("LoadPlugin"));
} if (loadPlugin != null)
else {
{ Debug.Console(0, Debug.ErrorLogLevel.Notice, "Adding type {0}", fi.FullName, type.FullName);
Debug.Console(0, Debug.ErrorLogLevel.Warning, loadPlugin.Invoke(null, null);
"Plugin '{0}' does not conform to any loadable types. DLL should be removed from plugins folder. Ignoring", }
fi.Name);
} }
// plugin dll will be loaded. Any classes in plugin should have a static constructor
// that registers that class with the Core.DeviceFactory
} }
} }
} }
@@ -318,7 +329,7 @@ namespace PepperDash.Essentials
try try
{ {
Debug.Console(0, Debug.ErrorLogLevel.Notice, "Creating device '{0}'", devConf.Key); Debug.Console(0, Debug.ErrorLogLevel.Notice, "Creating device '{0}', type '{1}'", devConf.Key, devConf.Type);
// Skip this to prevent unnecessary warnings // Skip this to prevent unnecessary warnings
if (devConf.Key == "processor") if (devConf.Key == "processor")
{ {
@@ -348,18 +359,18 @@ namespace PepperDash.Essentials
if (newDev == null) if (newDev == null)
newDev = PepperDash.Essentials.BridgeFactory.GetDevice(devConf); newDev = PepperDash.Essentials.BridgeFactory.GetDevice(devConf);
if (newDev == null) // might want to consider the ability to override an essentials "type" //if (newDev == null) // might want to consider the ability to override an essentials "type"
{ //{
// iterate plugin factories // // iterate plugin factories
foreach (var f in FactoryObjects) // foreach (var f in FactoryObjects)
{ // {
var cresFactory = f as IGetCrestronDevice; // var cresFactory = f as IGetCrestronDevice;
if (cresFactory != null) // if (cresFactory != null)
{ // {
newDev = cresFactory.GetDevice(devConf, this); // newDev = cresFactory.GetDevice(devConf, this);
} // }
} // }
} //}
if (newDev != null) if (newDev != null)
DeviceManager.AddDevice(newDev); DeviceManager.AddDevice(newDev);

2
PepperDashEssentials/Properties/AssemblyInfo.cs
View File

@@ -4,5 +4,5 @@
[assembly: AssemblyCompany("PepperDash Technology Corp")] [assembly: AssemblyCompany("PepperDash Technology Corp")]
[assembly: AssemblyProduct("PepperDashEssentials")] [assembly: AssemblyProduct("PepperDashEssentials")]
[assembly: AssemblyCopyright("Copyright © PepperDash Technology Corp 2018")] [assembly: AssemblyCopyright("Copyright © PepperDash Technology Corp 2018")]
[assembly: AssemblyVersion("1.3.2.*")] [assembly: AssemblyVersion("1.4.0.*")]

2
essentials-framework

Submodule essentials-framework updated: adc687ef86...15205a78cb