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

feature: plugin loader now checks against loaded assemblies

Browse Source
This commit is contained in:
Nick Genovese
2023-09-26 23:15:29 -04:00
parent b515077c8d
commit 0afe257ef3
1 changed files with 27 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
src/PepperDash.Essentials.Core/Plugins/PluginLoader.cs
View File

@@ -53,60 +53,25 @@ namespace PepperDash.Essentials
{ {
Debug.Console(2, "Getting Assemblies loaded with Essentials"); Debug.Console(2, "Getting Assemblies loaded with Essentials");
// Get the loaded assembly filenames // Get the loaded assembly filenames
var appDi = new DirectoryInfo(Global.ApplicationDirectoryPathPrefix); var assemblyFiles = AppDomain.CurrentDomain.GetAssemblies();
var assemblyFiles = appDi.GetFiles("*.dll");
Debug.Console(2, "Found {0} Assemblies", assemblyFiles.Length); Debug.Console(2, "Found {0} Assemblies", assemblyFiles.Length);
foreach (var fi in assemblyFiles) foreach (var assembly in assemblyFiles)
{ {
string version = string.Empty; var assemblyName = assembly.GetName();
Assembly assembly = null; LoadedAssemblies.Add(
new LoadedAssembly(assemblyName.Name, assemblyName.Version.ToString(), assembly));
switch (fi.Name)
{
case ("PepperDashEssentials.dll"):
{
version = Global.AssemblyVersion;
break;
}
case ("PepperDash_Essentials_Core.dll"):
{
version = Global.AssemblyVersion;
break;
}
case ("PepperDash_Essentials_DM.dll"):
{
version = Global.AssemblyVersion;
break;
}
case ("Essentials Devices Common.dll"):
{
version = Global.AssemblyVersion;
break;
}
case ("PepperDash_Core.dll"):
{
version = PepperDash.Core.Debug.PepperDashCoreVersion;
break;
}
}
LoadedAssemblies.Add(new LoadedAssembly(fi.Name, version, assembly));
} }
if (Debug.Level > 1) Debug.Console(2, "Loaded Assemblies:");
{
Debug.Console(2, "Loaded Assemblies:");
foreach (var assembly in LoadedAssemblies) foreach (var assembly in LoadedAssemblies)
{ {
Debug.Console(2, "Assembly: {0}", assembly.Name); Debug.Console(2, "Assembly: {0}", assembly.Name);
}
} }
} }
public static void SetEssentialsAssembly(string name, Assembly assembly) public static void SetEssentialsAssembly(string name, Assembly assembly)
{ {
var loadedAssembly = LoadedAssemblies.FirstOrDefault(la => la.Name.Equals(name)); var loadedAssembly = LoadedAssemblies.FirstOrDefault(la => la.Name.Equals(name));
@@ -124,23 +89,13 @@ namespace PepperDash.Essentials
static LoadedAssembly LoadAssembly(string filePath) static LoadedAssembly LoadAssembly(string filePath)
{ {
//Debug.Console(2, "Attempting to load {0}", filePath); //Debug.Console(2, "Attempting to load {0}", filePath);
var assembly = Assembly.LoadFrom(filePath); var assembly = Assembly.LoadFrom(filePath);
if (assembly != null) var assemblyName = assembly.GetName();
{
var assyVersion = GetAssemblyVersion(assembly);
var loadedAssembly = new LoadedAssembly(assembly.GetName().Name, assyVersion, assembly);
LoadedAssemblies.Add(loadedAssembly);
Debug.Console(0, Debug.ErrorLogLevel.Notice, "Loaded assembly '{0}', version {1}", loadedAssembly.Name, loadedAssembly.Version);
return loadedAssembly;
}
else
{
Debug.Console(0, Debug.ErrorLogLevel.Notice, "Unable to load assembly: '{0}'", filePath);
}
return null;
var loadedAssembly = new LoadedAssembly(assemblyName.Name, assemblyName.Version.ToString(), assembly);
LoadedAssemblies.Add(loadedAssembly);
Debug.Console(0, Debug.ErrorLogLevel.Notice, "Loaded assembly '{0}', version {1}", loadedAssembly.Name, loadedAssembly.Version);
return loadedAssembly;
} }
/// <summary> /// <summary>
@@ -174,7 +129,11 @@ namespace PepperDash.Essentials
public static bool CheckIfAssemblyLoaded(string name) public static bool CheckIfAssemblyLoaded(string name)
{ {
Debug.Console(2, "Checking if assembly: {0} is loaded...", name); Debug.Console(2, "Checking if assembly: {0} is loaded...", name);
var loadedAssembly = LoadedAssemblies.FirstOrDefault(s => s.Name.Equals(name)); var loadedAssembly = AppDomain
.CurrentDomain
.GetAssemblies()
.Select(asm => asm.GetName().Name)
.FirstOrDefault(name.Contains);
if (loadedAssembly != null) if (loadedAssembly != null)
{ {
@@ -338,8 +297,13 @@ namespace PepperDash.Essentials
foreach (var pluginFile in pluginFiles) foreach (var pluginFile in pluginFiles)
{ {
if (CheckIfAssemblyLoaded(pluginFile.Name))
{
Debug.Console(1, "Skipping {0} because it's already loaded", pluginFile.Name);
continue;
}
var loadedAssembly = LoadAssembly(pluginFile.FullName); var loadedAssembly = LoadAssembly(pluginFile.FullName);
LoadedPluginFolderAssemblies.Add(loadedAssembly); LoadedPluginFolderAssemblies.Add(loadedAssembly);
} }