Merge pull request #117 from Atlas-Rhythm/feat/extra-plugin-folders

Support for multiple plugin folders
Atlas-Rhythm · Sep 7, 2023 · 3f74eca · 3f74eca
2 parents 29df75e + 6d1b264
commit 3f74eca
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 5 deletions.
diff --git a/docs/Hive.Plugins/Using.md b/docs/Hive.Plugins/Using.md
@@ -29,7 +29,10 @@ In the app configuration, the configuration key `Plugins` contains the configura
     //   A map of plugin name to plugin configuration objects. Defaults
     // to an empty map. This is only used when UsePluginSpecificConfig is
     // false.
-    "PluginConfigurations": Map<string, object>
+    "PluginConfigurations": Map<string, object>,
+    //   More directory paths to load plugins from, if necessary.
+    //  Defaults to an empty array.
+    "ExtraPluginPaths": string[]
 }
 ```
 

diff --git a/src/Hive.Plugins/Loading/PluginLoader.cs b/src/Hive.Plugins/Loading/PluginLoader.cs
@@ -34,6 +34,10 @@ private class LoaderConfig
             /// </summary>
             public Dictionary<string, ConfigurationSection> PluginConfigurations { get; set; } = new();
             */
+            /// <summary>
+            /// Alternative folders to also load plugins from.
+            /// </summary>
+            public string[] ExtraPluginPaths { get; set; } = Array.Empty<string>();
         }
 
         private readonly LoaderConfig config;
@@ -54,8 +58,12 @@ public PluginLoader(IConfigurationSection config, PluginLoaderOptionsBuilder opt
         public void LoadPlugins(IServiceCollection services, IHostEnvironment hostEnv)
         {
             var pluginDir = new DirectoryInfo(config.PluginPath);
+            var extraPluginDirs = config.ExtraPluginPaths.Select(path => new DirectoryInfo(path));
+
+            List<DirectoryInfo> pluginDirs = new() { pluginDir };
+            pluginDirs.AddRange(extraPluginDirs);
 
-            var pluginsToLoad = FindPluginsToLoad(pluginDir);
+            var pluginsToLoad = FindPluginsToLoad(pluginDirs);
 
             var exceptions = new List<(Exception Exception, string PluginName)>();
 
@@ -133,9 +141,9 @@ public void LoadPlugins(IServiceCollection services, IHostEnvironment hostEnv)
             }
         }
 
-        private IEnumerable<DirectoryInfo> FindPluginsToLoad(DirectoryInfo pluginDir)
-            => FindPotentialPluginsToLoad(pluginDir)
-                    .Where(d => !config.ExcludePlugins.Contains(d.Name));
+        private IEnumerable<DirectoryInfo> FindPluginsToLoad(IEnumerable<DirectoryInfo> pluginDirs)
+            => pluginDirs.SelectMany(dir => FindPotentialPluginsToLoad(dir)
+                    .Where(d => !config.ExcludePlugins.Contains(d.Name)));
 
         private IEnumerable<DirectoryInfo> FindPotentialPluginsToLoad(DirectoryInfo pluginDir)
         {