Changeset 4269 for branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Core/3.3/PluginCache.cs

Timestamp:

08/20/10 09:54:05 (14 years ago)

Author:

cneumuel

Message:

fixed invalid plugin-directory (#1159)

File:

• branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Core/3.3/PluginCache.cs (modified) (7 diffs)

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Core/3.3/PluginCache.cs

@@ -9 +9 @@
 using HeuristicLab.PluginInfrastructure.Manager;
 using HeuristicLab.Tracing;
+using System.Reflection;
 
 namespace HeuristicLab.Hive.Slave.Core {
@@ -15 +16 @@
     private static PluginCache instance = null;
 
-    public const string PLUGIN_REPO = @"plugins\";
+    public string PluginRepositoryDir { get; set; }
 
     private List<PluginDescription> cachedPlugins = new List<PluginDescription>();
 
-    private PluginManager pm = new PluginManager(PLUGIN_REPO);
+    private PluginManager pm;
 
     public static PluginCache Instance {
@@ -28 +29 @@
       }
     }
+
     public PluginCache() {
+      PluginRepositoryDir = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "plugins");
+      
+      this.pm = new PluginManager(PluginRepositoryDir);
       DoUpdateRun();
     }
 
     private void DoUpdateRun() {
+      if (!Directory.Exists(PluginRepositoryDir)) {
+        Directory.CreateDirectory(PluginRepositoryDir);
+      }
       pm.DiscoverAndCheckPlugins();
       cachedPlugins = new List<PluginDescription>(pm.Plugins);
     }
 
-
     [MethodImpl(MethodImplOptions.Synchronized)]
     public bool CopyPluginsForJob(List<HivePluginInfoDto> requests, Guid jobId) {
-
-      String targetDir = PLUGIN_REPO + jobId.ToString() + "\\";
+      String targetDir = Path.Combine(PluginRepositoryDir, jobId.ToString());
 
       if (Directory.Exists(targetDir)) {
@@ -50 +56 @@
 
       foreach (HivePluginInfoDto requestedPlugin in requests) {
-        PluginDescription pd =
-          cachedPlugins.Where(
-            cp =>
-            cp.Name == requestedPlugin.Name &&
-            cp.Version.Major == requestedPlugin.Version.Major &&
-            cp.Version.Minor == requestedPlugin.Version.Minor &&
-            cp.Version.Revision >= requestedPlugin.Version.Revision).
-            SingleOrDefault();
+        PluginDescription pd = cachedPlugins.Where(cp =>
+          cp.Name == requestedPlugin.Name &&
+          cp.Version.Major == requestedPlugin.Version.Major &&
+          cp.Version.Minor == requestedPlugin.Version.Minor &&
+          cp.Version.Revision >= requestedPlugin.Version.Revision).
+          SingleOrDefault();
         if (pd == null) {
           return false;
@@ -63 +67 @@
 
         foreach (IPluginFile ipf in pd.Files) {
-          File.Copy(ipf.Name, targetDir + ipf.Name.Split('\\').Last());
+          string x = targetDir + ipf.Name.Split('\\').Last();
+          string y = Path.Combine(targetDir, Path.GetFileName(ipf.Name));
+
+          //File.Copy(ipf.Name, targetDir + ipf.Name.Split('\\').Last());
+          File.Copy(ipf.Name, Path.Combine(targetDir, Path.GetFileName(ipf.Name)));
         }
       }
@@ -113 +121 @@
         Logger.Debug("creating new files");
         foreach (HivePluginFile pf in updateablePlugin.PluginFiles) {
-          File.WriteAllBytes(PLUGIN_REPO + pf.Name.Split('\\').Last(), pf.BinaryFile);
+          string x = PluginRepositoryDir + pf.Name.Split('\\').Last();
+          string y = Path.Combine(PluginRepositoryDir, Path.GetFileName(pf.Name));
+          File.WriteAllBytes(Path.Combine(PluginRepositoryDir, Path.GetFileName(pf.Name)), pf.BinaryFile);
         }
 
@@ -124 +134 @@
       try {
         Logger.Debug("unloading...");
-        Directory.Delete(Path.Combine(PLUGIN_REPO, id.ToString()), true);
-      } catch (Exception ex) {
+        Directory.Delete(Path.Combine(PluginRepositoryDir, id.ToString()), true);
+      }
+      catch (Exception ex) {
         Logger.Debug("failed while unloading " + id + " with exception " + ex);
       }