Changeset 37 for trunk/sources/HeuristicLab.PluginInfrastructure

Timestamp:

03/04/08 15:16:51 (17 years ago)

Author:

gkronber

Message:

• fixed #37. Assemblies that have missing references (wrong versions) are also listed in the disabled plugins.
• plugin-manager shows a message why a plugin has been disabled (see #8)

Location:

trunk/sources/HeuristicLab.PluginInfrastructure

Files:

• Loader.cs (modified) (7 diffs)
• PluginInfo.cs (modified) (1 diff)

trunk/sources/HeuristicLab.PluginInfrastructure/Loader.cs

@@ -75 +75 @@
 
     private IPlugin FindPlugin(PluginInfo plugin) {
-      return allPlugins[plugin];
+      if(allPlugins.ContainsKey(plugin)) {
+        return allPlugins[plugin];
+      } else return null;
     }
 
@@ -90 +92 @@
     /// </summary>
     internal void Init() {
-      AppDomain.CurrentDomain.ReflectionOnlyAssemblyResolve += delegate(object sender, ResolveEventArgs args) { return Assembly.ReflectionOnlyLoad(args.Name); };
+      AppDomain.CurrentDomain.ReflectionOnlyAssemblyResolve += delegate(object sender, ResolveEventArgs args) {
+        try {
+          return Assembly.ReflectionOnlyLoad(args.Name);
+        } catch(FileLoadException ex) {
+          return null;
+        }
+        };
       allPlugins.Clear();
       disabledPlugins.Clear();
@@ -150 +158 @@
             }
           }
-        } catch(FileNotFoundException) {
-          // when a referenced assembly cannot be loaded then ignore this assembly in the plugin discovery
+        } catch(FileNotFoundException ex) {
+          PluginInfo info = new PluginInfo();
+          AssemblyName name = assembly.GetName();
+          info.Name = name.Name;
+          info.Version = name.Version;
+          info.Assemblies.Add(assembly.FullName);
+          info.Files.Add(assembly.Location);
+          info.Message = "File not found: " + ex.FileName;
+          disabledPlugins.Add(info);
+        } catch(FileLoadException ex) {
+          PluginInfo info = new PluginInfo();
+          AssemblyName name = assembly.GetName();
+          info.Name = name.Name;
+          info.Version = name.Version;
+          info.Files.Add(assembly.Location);
+          info.Assemblies.Add(assembly.FullName);
+          info.Message = "Couldn't load file: " + ex.FileName;
+          disabledPlugins.Add(info);
         }
       }
@@ -208 +232 @@
         PluginInfo info = new PluginInfo();
         info.Name = pluginName;
+        info.Version = t.Assembly.GetName().Version;
         info.Assemblies = pluginAssemblies;
         info.Files.AddRange(pluginFiles);
@@ -226 +251 @@
         visitedDependencies.Clear();
         if(!CheckPluginDependencies(pluginInfo.Name)) {
+          PluginInfo matchingInfo = preloadedPluginInfos.Find(delegate(PluginInfo info) { return info.Name == pluginInfo.Name; });
+          if(matchingInfo == null) throw new InvalidProgramException(); // shouldn't happen
+          foreach(string dependency in pluginDependencies[matchingInfo]) {
+            PluginInfo dependencyInfo = new PluginInfo();
+            dependencyInfo.Name = dependency;
+            pluginInfo.Dependencies.Add(dependencyInfo);
+          }
+
+          pluginInfo.Message = "Disabled: missing plugin dependency.";
           disabledPlugins.Add(pluginInfo);
         }
@@ -325 +359 @@
       foreach(PluginInfo plugin in preloadedPluginInfos) {
         if(!CheckPluginFiles(plugin)) {
+          plugin.Message = "Disabled: missing plugin file.";
           disabledPlugins.Add(plugin);
         }
@@ -348 +383 @@
 
     internal void OnDelete(PluginInfo pluginInfo) {
-      FindPlugin(pluginInfo).OnDelete();
+      IPlugin plugin = FindPlugin(pluginInfo);
+      if(plugin!=null) plugin.OnDelete();
     }
 
     internal void OnInstall(PluginInfo pluginInfo) {
-      FindPlugin(pluginInfo).OnInstall();
+      IPlugin plugin = FindPlugin(pluginInfo);
+      if(plugin != null) plugin.OnInstall();
     }
 
     internal void OnPreUpdate(PluginInfo pluginInfo) {
-      FindPlugin(pluginInfo).OnPreUpdate();
+      IPlugin plugin = FindPlugin(pluginInfo);
+      if(plugin != null) plugin.OnPreUpdate();
     }
 
     internal void OnPostUpdate(PluginInfo pluginInfo) {
-      FindPlugin(pluginInfo).OnPostUpdate();
+      IPlugin plugin = FindPlugin(pluginInfo);
+      if(plugin != null) plugin.OnPostUpdate();
     }
   }

trunk/sources/HeuristicLab.PluginInfrastructure/PluginInfo.cs

@@ -68 +68 @@
     }
 
+
+    private string message;
+    public string Message {
+      get { return message; }
+      set { message = value; }
+    }
+
     public override string ToString() {
       return Name;