Changeset 37

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

Files:

• HeuristicLab.PluginInfrastructure.GUI/ManagerForm.cs (modified) (8 diffs)
• HeuristicLab.PluginInfrastructure.GUI/PluginTag.cs (modified) (3 diffs)
• HeuristicLab.PluginInfrastructure/Loader.cs (modified) (7 diffs)
• HeuristicLab.PluginInfrastructure/PluginInfo.cs (modified) (1 diff)

trunk/sources/HeuristicLab.PluginInfrastructure.GUI/ManagerForm.cs

@@ -310 +310 @@
       allAvailablePlugins.ForEach(delegate(PluginDescription availablePlugin) {
         List<PluginTag> oldPlugins = allTags.FindAll(delegate(PluginTag currentPlugin) {
-          return currentPlugin.PluginName == availablePlugin.Name && currentPlugin.State == (PluginState.Installed | PluginState.Disabled);
+          return currentPlugin.PluginName == availablePlugin.Name && 
+            (currentPlugin.State & (PluginState.Installed | PluginState.Disabled)) !=0;
         });
 
@@ -330 +331 @@
         });
 
-        if(currentPlugins.Count == 1) {
-          if(currentPlugins[0].PluginVersion < availablePlugin.Version) {
-            overrides.Add(availablePlugin);
-          }
+        if(currentPlugins.Count == 1 && currentPlugins[0].PluginVersion < availablePlugin.Version) {
+          overrides.Add(availablePlugin);
         }
       });
@@ -584 +583 @@
 
     private void UpdateActionButtons(PluginTag tag) {
-
       publishButton.Enabled = (tag.State & PluginState.Installed) == PluginState.Installed;
       installButton.Enabled = (tag.State & PluginState.Available) == PluginState.Available;
@@ -597 +595 @@
       installMenuItem.Checked = installButton.Checked;
       deleteMenuItem.Checked = deleteButton.Checked;
-
     }
 
@@ -634 +631 @@
       return nodes;
     }
-
-
-
     private void DisplayPluginInfo(string pluginInformation) {
       infoTextBox.Text = pluginInformation;
     }
-
-
     private void upgradeButton_Click(object sender, EventArgs args) {
       try {
@@ -683 +675 @@
       });
     }
-
-
     private List<string> upgradedPlugins = new List<string>();
     private void OnPreUpgradePlugins() {
@@ -697 +687 @@
       });
     }
-
     private void OnPostUpgradePlugins() {
       allTags.ForEach(delegate(PluginTag tag) {
@@ -706 +695 @@
       upgradedPlugins.Clear();
     }
-
     /// <summary>
     /// Deletes all files in the directories cacheDir, backupDir, tempDir

trunk/sources/HeuristicLab.PluginInfrastructure.GUI/PluginTag.cs

@@ -85 +85 @@
     }
 
+    private string message;
+    public string Message {
+      get { return message; }
+    }
+
     public List<PluginTag> hull = new List<PluginTag>();
 
@@ -94 +99 @@
       this.pluginName = plugin.Name;
       this.pluginVersion = plugin.Version;
+      this.message = plugin.Message;
       pluginDetails = GeneratePluginDetails(plugin);
       pluginDependencies = GeneratePluginDependencies(plugin);
@@ -125 +131 @@
         dependents += dependentPlugin.Name + " (" + dependentPlugin.Version + ")\n";
       });
-      return "plugin: " + plugin.Name + "\n" +
+      return "Plugin: " + plugin.Name + "\n" +
       "Version: " + plugin.Version + "\n\n" +
-      "Requires: \n" + dependencies + "\n" +
-      "Used by:\n" + dependents + "\n" +
-      "Files:\n" + filenames + "\n";
+      (dependencies.Length != 0 ? "Requires: \n" + dependencies + "\n" : "") +
+      (dependents.Length != 0 ? "Used by:\n" + dependents + "\n" : "") +
+      (filenames.Length != 0 ? "Files:\n" + filenames + "\n" : "") + message;
+      ;
     }
 

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;