quartznet/pulsar
2
0
Fork 0
mirror of https://github.com/9ParsonsB/Pulsar.git synced 2025-04-05 17:39:39 -04:00
Code Actions

Alter assembly loading.

Browse Source
This commit is contained in:
Xjph 2021-06-06 18:22:01 -02:30
parent 4dda74f251
commit bbfcc98b97
1 changed files with 4 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
ObservatoryCore/PluginManagement/PluginManager.cs
View File

@ -37,7 +37,6 @@ namespace Observatory.PluginManagement
private PluginManager() private PluginManager()
{ {
AppDomain.CurrentDomain.AssemblyResolve += CurrentDomain_AssemblyResolve;
errorList = LoadPlugins(out workerPlugins, out notifyPlugins); errorList = LoadPlugins(out workerPlugins, out notifyPlugins);
foreach (var error in errorList) foreach (var error in errorList)
@ -143,26 +142,6 @@ namespace Observatory.PluginManagement
return configDirectory.FullName + "\\" + plugin.Name + ".json"; return configDirectory.FullName + "\\" + plugin.Name + ".json";
} }
private static Assembly CurrentDomain_AssemblyResolve(object sender, ResolveEventArgs args)
{
AppDomain appDomain = (AppDomain)sender;
var assemblies = appDomain.GetAssemblies();
if (args.Name.ToLower().Contains(".resources"))
{
return null;
}
if (assemblies.FirstOrDefault(x => x.FullName == args.Name) == null)
{
AssemblyName assemblyName = new AssemblyName(args.Name);
System.Runtime.Loader.AssemblyLoadContext.Default.LoadFromAssemblyName(assemblyName);
}
var assembly = assemblies.FirstOrDefault(x => x.FullName == args.Name);
return assembly;
}
private static List<string> LoadPlugins(out List<(IObservatoryWorker plugin, PluginStatus signed)> observatoryWorkers, out List<(IObservatoryNotifier plugin, PluginStatus signed)> observatoryNotifiers) private static List<string> LoadPlugins(out List<(IObservatoryWorker plugin, PluginStatus signed)> observatoryWorkers, out List<(IObservatoryNotifier plugin, PluginStatus signed)> observatoryNotifiers)
{ {
observatoryWorkers = new(); observatoryWorkers = new();
@ -229,6 +208,7 @@ namespace Observatory.PluginManagement
var pluginAssembly = System.Runtime.Loader.AssemblyLoadContext.Default.LoadFromAssemblyPath(new FileInfo(dllPath).FullName); var pluginAssembly = System.Runtime.Loader.AssemblyLoadContext.Default.LoadFromAssemblyPath(new FileInfo(dllPath).FullName);
Type[] types; Type[] types;
string err = string.Empty; string err = string.Empty;
int pluginCount = 0;
try try
{ {
types = pluginAssembly.GetTypes(); types = pluginAssembly.GetTypes();
@ -248,6 +228,7 @@ namespace Observatory.PluginManagement
ConstructorInfo constructor = worker.GetConstructor(Array.Empty<Type>()); ConstructorInfo constructor = worker.GetConstructor(Array.Empty<Type>());
object instance = constructor.Invoke(Array.Empty<object>()); object instance = constructor.Invoke(Array.Empty<object>());
workers.Add((instance as IObservatoryWorker, PluginStatus.Signed)); workers.Add((instance as IObservatoryWorker, PluginStatus.Signed));
pluginCount++;
} }
var notifyTypes = types.Where(t => t.IsAssignableTo(typeof(IObservatoryNotifier))); var notifyTypes = types.Where(t => t.IsAssignableTo(typeof(IObservatoryNotifier)));
@ -256,9 +237,10 @@ namespace Observatory.PluginManagement
ConstructorInfo constructor = notifier.GetConstructor(Array.Empty<Type>()); ConstructorInfo constructor = notifier.GetConstructor(Array.Empty<Type>());
object instance = constructor.Invoke(Array.Empty<object>()); object instance = constructor.Invoke(Array.Empty<object>());
notifiers.Add((instance as IObservatoryNotifier, PluginStatus.Signed)); notifiers.Add((instance as IObservatoryNotifier, PluginStatus.Signed));
pluginCount++;
} }
if (workerTypes.Count() + notifyTypes.Count() == 0) if (pluginCount == 0)
{ {
err += $"ERROR: Library '{dllPath}' contains no suitable interfaces."; err += $"ERROR: Library '{dllPath}' contains no suitable interfaces.";
LoadPlaceholderPlugin(dllPath, PluginStatus.InvalidPlugin, notifiers); LoadPlaceholderPlugin(dllPath, PluginStatus.InvalidPlugin, notifiers);