Changeset 17194 for misc/tools/HeuristicLab.HiveDrain/HeuristicLab.HiveDrain/JobDownloader.cs

Timestamp:

08/07/19 14:44:13 (5 years ago)

Author:

mkommend

Message:

#2829: Updated HiveDrain to .Net version 4.6.1 and added handling of invalid characters in filenames.

File:

• misc/tools/HeuristicLab.HiveDrain/HeuristicLab.HiveDrain/JobDownloader.cs (modified) (2 diffs)

misc/tools/HeuristicLab.HiveDrain/HeuristicLab.HiveDrain/JobDownloader.cs

@@ -23 +23 @@
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using System.Threading;
 using HeuristicLab.Clients.Hive;
@@ -51 +52 @@
       Semaphore limitSemaphore = new Semaphore(HeuristicLabHiveDrainApplication.MaxParallelDownloads, HeuristicLabHiveDrainApplication.MaxParallelDownloads);
 
+      var invalidChars = Path.GetInvalidFileNameChars();
+
       foreach (Job j in jobsLoaded) {
         if (string.IsNullOrEmpty(NamePattern) || j.Name.Contains(NamePattern)) {
-          string jobPath = Path.Combine(RootLocation, String.Format("{0} - {1}", j.Name, j.Id));
           log.LogMessage(String.Format("\"{0}\": {1}", j.Name, j.Id));
+
+
+          var jobName = j.Name;
+          //handle invalid characters in fileNames
+          if (invalidChars.Any(c => jobName.Contains(c))) {
+            log.LogMessage("Job name contains characters that cannot be used as filename. Invalid characters are replaced with '_'.");
+            foreach (var c in invalidChars) {
+              jobName = jobName.Replace(c, '_');
+            }
+          }
+
+          string jobPath = Path.Combine(RootLocation, String.Format("{0} - {1}", jobName, j.Id));
+
 
           if (OneFile) {
             JobTaskOneFileDownloader taskDownloader = new JobTaskOneFileDownloader(jobPath, j, limitSemaphore, log);
             taskDownloader.Start();
-          } else {
+          }
+          else {
             JobTaskDownloader taskDownloader = new JobTaskDownloader(jobPath, j, limitSemaphore, log);
             taskDownloader.Start();
           }
-        } else {
+        }
+        else {
           log.LogMessage(String.Format("\"{0}\": {1} ---> ignored", j.Name, j.Id));
         }