Changeset 6413 for trunk/sources/HeuristicLab.PluginInfrastructure/3.3/Advanced

Timestamp:

06/14/11 18:59:42 (14 years ago)

Author:

gkronber

Message:

#1536 implemented feature that checks for plugin updates on each application start and allows to install plugin updates easily. Removed more advanced plugin management features for all users except if it is manually reenabled in the HeuristicLab.config file.

Location:

trunk/sources/HeuristicLab.PluginInfrastructure/3.3/Advanced

Files:

• AvailablePluginsView.cs (modified) (2 diffs)
• BasicUpdateView.cs (modified) (1 diff)
• InstallationManager.cs (modified) (4 diffs)
• InstalledPluginsView.cs (modified) (1 diff)
• PluginUpdaterForm.Designer.cs (added)
• PluginUpdaterForm.cs (added)
• Util.cs (modified) (1 diff)

trunk/sources/HeuristicLab.PluginInfrastructure/3.3/Advanced/AvailablePluginsView.cs

@@ -117 +117 @@
     void updateOrInstallPluginsBackgroundWorker_DoWork(object sender, DoWorkEventArgs e) {
       UpdateOrInstallPluginsBackgroundWorkerArgument info = (UpdateOrInstallPluginsBackgroundWorkerArgument)e.Argument;
+      bool cancelled = false;
       if (info.PluginsToInstall.Count() > 0)
-        installationManager.Install(info.PluginsToInstall);
+        installationManager.Install(info.PluginsToInstall, out cancelled);
       if (info.PluginsToUpdate.Count() > 0)
-        installationManager.Update(info.PluginsToUpdate);
-
-      if (info.PluginsToInstall.Count() > 0 || info.PluginsToUpdate.Count() > 0)
+        installationManager.Update(info.PluginsToUpdate, out cancelled);
+
+      if (!cancelled && (info.PluginsToInstall.Count() > 0 || info.PluginsToUpdate.Count() > 0))
         pluginManager.DiscoverAndCheckPlugins();
     }
@@ -176 +177 @@
       var pluginsToInstall = selectedProduct.Plugins.Except(pluginsToUpdate);
 
-      updateOrInstallInfo.PluginsToInstall = 
+      updateOrInstallInfo.PluginsToInstall =
         pluginsToInstall
         .Cast<IPluginDescription>()
         .ToList();
-      updateOrInstallInfo.PluginsToUpdate = 
+      updateOrInstallInfo.PluginsToUpdate =
         pluginsToUpdate
         .Cast<IPluginDescription>()

trunk/sources/HeuristicLab.PluginInfrastructure/3.3/Advanced/BasicUpdateView.cs

@@ -79 +79 @@
                             select remotePlugin;
       if (pluginsToUpdate.Count() > 0) {
-        installationManager.Update(pluginsToUpdate);
-        pluginManager.DiscoverAndCheckPlugins();
+        bool cancelled;
+        installationManager.Update(pluginsToUpdate, out cancelled);
+        if (!cancelled)
+          pluginManager.DiscoverAndCheckPlugins();
         e.Cancel = false;
       } else {

trunk/sources/HeuristicLab.PluginInfrastructure/3.3/Advanced/InstallationManager.cs

@@ -98 +98 @@
     /// </summary>
     /// <param name="plugins"></param>
-    public void Install(IEnumerable<IPluginDescription> plugins) {
+    public void Install(IEnumerable<IPluginDescription> plugins, out bool cancelled) {
       var args = new PluginInfrastructureCancelEventArgs(plugins);
       OnPreInstall(args);
       if (!args.Cancel) {
+        cancelled = false;
         var client = DeploymentService.UpdateServiceClientFactory.CreateClient();
         try {
@@ -123 +124 @@
           throw new InstallationManagerException("General communication exception in connection to server.", e);
         }
+      } else {
+        cancelled = true;
       }
     }
@@ -130 +133 @@
     /// </summary>
     /// <param name="plugins"></param>
-    public void Update(IEnumerable<IPluginDescription> plugins) {
+    public void Update(IEnumerable<IPluginDescription> plugins, out bool cancelled) {
       PluginInfrastructureCancelEventArgs args = new PluginInfrastructureCancelEventArgs(plugins);
       OnPreUpdate(args);
       if (!args.Cancel) {
+        cancelled = false;
         var client = DeploymentService.UpdateServiceClientFactory.CreateClient();
         try {
@@ -155 +159 @@
           throw new InstallationManagerException("General communication exception in connection to server.", e);
         }
+      } else {
+        cancelled = true;
       }
     }

trunk/sources/HeuristicLab.PluginInfrastructure/3.3/Advanced/InstalledPluginsView.cs

@@ -116 +116 @@
                             select remotePlugin;
       if (pluginsToUpdate.Count() > 0) {
-        installationManager.Update(pluginsToUpdate);
-      }
-      pluginManager.DiscoverAndCheckPlugins();
+        bool cancelled;
+        installationManager.Update(pluginsToUpdate, out cancelled);
+        if (!cancelled) pluginManager.DiscoverAndCheckPlugins();
+      }
     }
 

trunk/sources/HeuristicLab.PluginInfrastructure/3.3/Advanced/Util.cs

@@ -66 +66 @@
     }
 
+    // compares for two plugins with same major and minor version if plugin1 is newer than plugin2
+    internal static bool IsNewerThan(IPluginDescription plugin1, IPluginDescription plugin2) {
+      // newer: build version is higher, or if build version is the same revision is higher
+      return plugin1.Version.Build > plugin2.Version.Build ||
+        (plugin1.Version.Build == plugin2.Version.Build && plugin1.Version.Revision > plugin2.Version.Revision);
+    }
   }
 }