Changeset 2783 for trunk/sources/HeuristicLab.PluginInfrastructure/Advanced/InstallationManager.cs

Timestamp:

02/12/10 10:16:02 (14 years ago)

Author:

gkronber

Message:

Refreshed service reference in plugin infrastructure. #860 (Deployment server for plugin installation from web locations)

File:

• trunk/sources/HeuristicLab.PluginInfrastructure/Advanced/InstallationManager.cs (modified) (3 diffs)

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

@@ -27 +27 @@
 using System.IO;
 using System.ComponentModel;
-using HeuristicLab.PluginInfrastructure.UpdateLocationReference;
+using UpdateService = HeuristicLab.PluginInfrastructure.PluginUpdateService;
 using System.Reflection;
 
@@ -185 +185 @@
       var pluginDescriptions = from name in pluginNames
                                select GetPluginDescription(name);
-      Dictionary<PluginInformation, string> matchingPlugins = new Dictionary<PluginInformation, string>();
+      Dictionary<UpdateService.PluginDescription, string> matchingPlugins = new Dictionary<UpdateService.PluginDescription, string>();
       foreach (var updateLocation in HeuristicLab.PluginInfrastructure.Properties.Settings.Default.UpdateLocations) {
-        using (UpdateLocationClient client = new UpdateLocationClient("", updateLocation)) {
+        using (var client = new UpdateService.UpdateClient("", updateLocation)) {
           var updateLocationMatchingPlugins = from desc in pluginDescriptions
-                                              from info in client.GetAvailablePluginsByName(desc.Name)
+                                              from info in client.GetPlugins()
+                                              where desc.Name == info.Name
                                               select info;
-          foreach (PluginInformation info in updateLocationMatchingPlugins) {
-            // keep only the highest version and most recent build of any plugin
+          foreach (UpdateService.PluginDescription info in updateLocationMatchingPlugins) {
+            // keep only the highest version of any plugin
             var existingPlugin = matchingPlugins.Keys.FirstOrDefault(x => x.Name == info.Name);
-            if (existingPlugin == null || existingPlugin.Version < info.Version || (existingPlugin.Version == info.Version && existingPlugin.BuildDate < info.BuildDate)) {
+            if (existingPlugin == null || existingPlugin.Version < info.Version) {
               matchingPlugins.Remove(existingPlugin);
               matchingPlugins.Add(info, updateLocation);
@@ -206 +207 @@
         var groupedInfos = matchingPlugins.GroupBy(x => x.Value);
         foreach (var group in groupedInfos) {
-          using (UpdateLocationClient client = new UpdateLocationClient(group.Key)) {
+          using (var client = new UpdateService.UpdateClient(group.Key)) {
             foreach (var info in group) {
-              client.GetPluginFiles(info.Key);
+              client.GetPlugin(info.Key);
             }
           }