Changeset 12425 for branches/HiveStatistics/sources/HeuristicLab.Services.WebApp/Controllers/WebAppControllerSelector.cs

Timestamp:

06/10/15 14:05:24 (9 years ago)

Author:

dglaser

Message:

#2388: Added PluginManager and updated WebApp project

File:

• branches/HiveStatistics/sources/HeuristicLab.Services.WebApp/Controllers/WebAppControllerSelector.cs (modified) (3 diffs)

branches/HiveStatistics/sources/HeuristicLab.Services.WebApp/Controllers/WebAppControllerSelector.cs

@@ -2 +2 @@
 using System.Collections.Concurrent;
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
 using System.Net.Http;
 using System.Reflection;
-using System.Web;
 using System.Web.Http;
 using System.Web.Http.Controllers;
@@ -14 +12 @@
   public class WebAppHttpControllerSelector : DefaultHttpControllerSelector {
     private readonly HttpConfiguration configuration;
-    private readonly IDictionary<string, IDictionary<string, HttpControllerDescriptor>> plugins;
+    private readonly IDictionary<string, HttpControllerDescriptor> controllers;
+    private readonly PluginManager pluginManager = PluginManager.Instance;
 
     public WebAppHttpControllerSelector(HttpConfiguration configuration)
       : base(configuration) {
       this.configuration = configuration;
-      plugins = new ConcurrentDictionary<string, IDictionary<string, HttpControllerDescriptor>>();
+      pluginManager.Configuration = configuration;
+      controllers = new ConcurrentDictionary<string, HttpControllerDescriptor>();
+      LoadAppControllers();
+    }
+
+    private void LoadAppControllers() {
+      var assembly = Assembly.GetExecutingAssembly();
+      var assemblyTypes = assembly.GetTypes();
+      var apiControllers = assemblyTypes.Where(c => typeof(ApiController).IsAssignableFrom(c)).ToList();
+      foreach (var apiController in apiControllers) {
+        var apiControllerName = apiController.Name.Remove(apiController.Name.Length - 10).ToLower();
+        controllers.Add(apiControllerName, new HttpControllerDescriptor(configuration, apiControllerName, apiController));
+      }
     }
 
@@ -31 +42 @@
         throw new ArgumentException("invalid request path");
       }
-      string pluginName = parts[startIndex + 1];
+      string pluginName = parts[startIndex + 1].ToLower();
       string controllerName = parts[startIndex + 2].ToLower();
-      IDictionary<string, HttpControllerDescriptor> controllers;
-      if (!plugins.TryGetValue(pluginName, out controllers)) {
-        var assembly = Assembly.GetExecutingAssembly();
-        try {
-          if (pluginName != "App") {
-            string directory = string.Format(@"{0}WebApp\plugins\{1}\", HttpRuntime.AppDomainAppPath, pluginName);
-            string[] assemblies = Directory.GetFiles(directory, string.Format("HeuristicLab.Services.WebApp.{0}*.dll", pluginName));
-            if (assemblies.Length < 1) {
-              throw new ArgumentException("invalid plugin '{0}'", pluginName);
-            }
-            assembly = Assembly.Load(File.ReadAllBytes(assemblies.First()));
-          }
-          var assemblyTypes = assembly.GetTypes();
-          var apiControllers = assemblyTypes.Where(c => typeof(ApiController).IsAssignableFrom(c)).ToList();
-          if (apiControllers.Any()) {
-            controllers = new ConcurrentDictionary<string, HttpControllerDescriptor>();
-            foreach (var apiController in apiControllers) {
-              var apiControllerName = apiController.Name.Remove(apiController.Name.Length - 10).ToLower();
-              controllers.Add(apiControllerName, new HttpControllerDescriptor(configuration, apiControllerName, apiController));
-            }
-            plugins.Add(pluginName, controllers);
-          }
-        }
-        catch (Exception) {
-          throw new ArgumentException("error loading plugin '{0}'", pluginName);
-        }
+      // load controller
+      if (pluginName == "app") {
+        // from main app
+        HttpControllerDescriptor controller;
+        controllers.TryGetValue(controllerName, out controller);
+        return controller;
       }
-      if (controllers == null) {
-        throw new ArgumentException("invalid plugin '{0}'", pluginName);
+      // from plugin
+      var plugin = pluginManager.GetPlugin(pluginName);
+      if (plugin == null) {
+        throw new ArgumentException(string.Format("invalid plugin '{0}'", pluginName));
       }
-      HttpControllerDescriptor controller;
-      controllers.TryGetValue(controllerName, out controller);
-      return controller;
+      return plugin.GetController(controllerName);
     }
   }