Merge remote-tracking branch 'refs/remotes/origin/main'

HosihikariAndMore · Mar 20, 2024 · ef1125d · ef1125d
2 parents d9e0f8e + 214dd56
commit ef1125d
Show file tree

Hide file tree

Showing 9 changed files with 453 additions and 458 deletions.
diff --git a/.gitignore b/.gitignore
diff --git a/Hosihikari.PluginManagement.sln b/Hosihikari.PluginManagement.sln
@@ -1,7 +1,7 @@
-
+
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 25.0.1706.0
+# Visual Studio Version 17
+VisualStudioVersion = 17.10.34707.107
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Hosihikari.PluginManagement", "src\Hosihikari.PluginManager.csproj", "{92BBCA93-08CB-4465-BA68-316A59FD8317}"
 EndProject

diff --git a/src/AssemblyPlugin.cs b/src/AssemblyPlugin.cs
@@ -1,5 +1,4 @@
-using System.Reflection;
-using System.Runtime.Loader;
+using System.Reflection;
 
 namespace Hosihikari.PluginManagement;
 
@@ -8,6 +7,8 @@ public sealed class AssemblyPlugin : Plugin
     internal const string PluginDirectoryPath = "plugins";
     internal static readonly List<AssemblyPlugin> Plugins = [];
     private Assembly? _assembly;
+    private EntryPointAttributeBase? _attribute;
+    private PluginLoadContext? _context;
 
     internal AssemblyPlugin(FileInfo file) : base(file)
     {
@@ -22,10 +23,17 @@ protected internal override void Load()
             return;
         }
 
-        PluginLoadContext context = new(_fileInfo);
-        _assembly = context.LoadFromAssemblyPath(_fileInfo.FullName);
-        AssemblyName name = _assembly.GetName();
+        _context = new(_fileInfo);
+        _assembly = _context.LoadFromAssemblyPath(_fileInfo.FullName);
         Plugins.Add(this);
+        _attribute = _assembly.GetCustomAttribute<EntryPointAttributeBase>();
+        if (_attribute is null)
+        {
+            Unload();
+            throw new EntryPointNotFoundException();
+        }
+
+        AssemblyName name = _assembly.GetName();
         if (string.IsNullOrWhiteSpace(name.Name) || name.Version is null)
         {
             Unload();
@@ -43,14 +51,7 @@ protected internal override void Initialize()
             throw new NullReferenceException();
         }
 
-        EntryPointAttributeBase? attribute = _assembly!.GetCustomAttribute<EntryPointAttributeBase>();
-        if (attribute is null)
-        {
-            Unload();
-            throw new EntryPointNotFoundException();
-        }
-
-        IEntryPoint entry = attribute.CreateInstance();
+        IEntryPoint entry = _attribute!.CreateInstance();
         entry.Initialize(this);
     }
 
@@ -61,10 +62,8 @@ protected internal override void Unload()
             throw new NullReferenceException();
         }
 
-        AssemblyLoadContext context =
-            AssemblyLoadContext.GetLoadContext(_assembly!) ?? throw new NullReferenceException();
         Unloading?.Invoke(this, EventArgs.Empty);
-        context.Unload();
+        _context!.Unload();
         Plugins.Remove(this);
     }
 }
diff --git a/src/EntryPointAttribute.cs b/src/EntryPointAttribute.cs
@@ -1,4 +1,4 @@
-namespace Hosihikari.PluginManagement;
+namespace Hosihikari.PluginManagement;
 
 public abstract class EntryPointAttributeBase : Attribute
 {

diff --git a/src/IEntryPoint.cs b/src/IEntryPoint.cs
@@ -1,4 +1,4 @@
-namespace Hosihikari.PluginManagement;
+namespace Hosihikari.PluginManagement;
 
 public interface IEntryPoint
 {

diff --git a/src/Main.cs b/src/Main.cs
@@ -1,4 +1,4 @@
-using System.Collections.Immutable;
+using System.Collections.Immutable;
 using System.Runtime.InteropServices;
 
 namespace Hosihikari.PluginManagement;

diff --git a/src/Manager.cs b/src/Manager.cs
@@ -1,4 +1,4 @@
-namespace Hosihikari.PluginManagement;
+namespace Hosihikari.PluginManagement;
 
 public static class Manager
 {
@@ -14,6 +14,14 @@ public static void Load(Plugin plugin)
         {
             return;
         }
+        catch (EntryPointNotFoundException)
+        {
+            return;
+        }
+        catch (FileLoadException)
+        {
+            return;
+        }
 
         if (s_plugins.TryAdd(plugin.Name, plugin))
         {
@@ -30,14 +38,7 @@ public static void Initialize(string name)
             throw new NullReferenceException();
         }
 
-        try
-        {
-            plugin.Initialize();
-        }
-        catch (EntryPointNotFoundException)
-        {
-            s_plugins.Remove(name);
-        }
+        plugin.Initialize();
     }
 
     public static void Unload(string name)

diff --git a/src/Plugin.cs b/src/Plugin.cs
@@ -1,4 +1,4 @@
-namespace Hosihikari.PluginManagement;
+namespace Hosihikari.PluginManagement;
 
 public abstract class Plugin(FileInfo fileInfo)
 {

diff --git a/src/PluginLoadContext.cs b/src/PluginLoadContext.cs
@@ -1,29 +1,35 @@
-using System.Reflection;
+using System.Reflection;
 using System.Runtime.Loader;
 
 namespace Hosihikari.PluginManagement;
 
-internal class PluginLoadContext(FileSystemInfo fileInfo) : AssemblyLoadContext(fileInfo.Name, true)
+internal class PluginLoadContext : AssemblyLoadContext
 {
     private static readonly Dictionary<string, Assembly> s_loadedAssembly = [];
 
-    private readonly AssemblyDependencyResolver _resolver = new(fileInfo.FullName);
+    private readonly AssemblyDependencyResolver _resolver;
 
-    protected override Assembly? Load(AssemblyName assemblyName)
+    public PluginLoadContext(FileSystemInfo fileInfo) : base(fileInfo.Name, true)
     {
+        _resolver = new(fileInfo.FullName);
+        Unloading += _ =>
+        {
+            foreach (Assembly assembly in Assemblies)
+            {
+                s_loadedAssembly.Remove(assembly.GetName().FullName);
+            }
+        };
+    }
 
+    protected override Assembly? Load(AssemblyName assemblyName)
+    {
         if (s_loadedAssembly.TryGetValue(assemblyName.FullName, out Assembly? assembly))
         {
             return assembly;
         }
 
         string? assemblyPath = _resolver.ResolveAssemblyToPath(assemblyName);
-        if (assemblyPath is not null)
-        {
-            return LoadFromAssemblyPath(assemblyPath);
-        }
-
-        return null;
+        return assemblyPath is not null ? LoadFromAssemblyPath(assemblyPath) : null;
     }
 
     public new Assembly LoadFromAssemblyPath(string assemblyPath)
@@ -32,14 +38,4 @@ internal class PluginLoadContext(FileSystemInfo fileInfo) : AssemblyLoadContext(
         s_loadedAssembly[assembly.GetName().FullName] = assembly;
         return assembly;
     }
-
-    public new void Unload()
-    {
-        foreach (Assembly assembly in Assemblies)
-        {
-            s_loadedAssembly.Remove(assembly.GetName().FullName);
-        }
-
-        base.Unload();
-    }
 }