Changeset 8818 for trunk/sources/HeuristicLab.PluginInfrastructure/3.3/CommandLineArgumentHandling

Timestamp:

10/17/12 21:46:00 (12 years ago)

Author:

jkarder

Message:

#1926:

• added OpenArgument
• refactored argument handling infrastructure

Location:

trunk/sources/HeuristicLab.PluginInfrastructure/3.3/CommandLineArgumentHandling

Files:

• Arguments/HideStarterArgument.cs (modified) (1 diff)
• Arguments/OpenArgument.cs (added)
• Arguments/StartArgument.cs (modified) (1 diff)
• CommandLineArgument.cs (modified) (1 diff)
• CommandLineArgumentHandling.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.PluginInfrastructure/3.3/CommandLineArgumentHandling/Arguments/HideStarterArgument.cs

@@ -20 +20 @@
 #endregion
 
+using System;
+
 namespace HeuristicLab.PluginInfrastructure {
+  [Serializable]
   public class HideStarterArgument : CommandLineArgument<bool> {
     public const string TOKEN = "hideStarter";

trunk/sources/HeuristicLab.PluginInfrastructure/3.3/CommandLineArgumentHandling/Arguments/StartArgument.cs

@@ -20 +20 @@
 #endregion
 
+using System;
+
 namespace HeuristicLab.PluginInfrastructure {
+  [Serializable]
   public class StartArgument : CommandLineArgument<string> {
     public const string TOKEN = "start";

trunk/sources/HeuristicLab.PluginInfrastructure/3.3/CommandLineArgumentHandling/CommandLineArgument.cs

@@ -20 +20 @@
 #endregion
 
+using System;
+
 namespace HeuristicLab.PluginInfrastructure {
+  [Serializable]
   public abstract class CommandLineArgument<T> : ICommandLineArgument<T> {
     object ICommandLineArgument.Value { get { return Value; } }

trunk/sources/HeuristicLab.PluginInfrastructure/3.3/CommandLineArgumentHandling/CommandLineArgumentHandling.cs

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Text.RegularExpressions;
@@ -43 +44 @@
     private static ICommandLineArgument ParseArgument(string entry) {
       var regex = new Regex(@"^/[A-Za-z]+(:[A-Za-z0-9\s]+)?$");
-      if (!regex.IsMatch(entry)) return null;
-      entry = entry.Remove(0, 1);
-      var parts = entry.Split(':');
-      string key = parts[0].Trim();
-      string value = parts.Length == 2 ? parts[1].Trim() : string.Empty;
-      switch (key) {
-        case StartArgument.TOKEN: return new StartArgument(value);
-        case HideStarterArgument.TOKEN: return new HideStarterArgument(value);
-        default: return null;
-      }
+      bool isFile = File.Exists(entry);
+      if (!regex.IsMatch(entry) && !isFile) return null;
+      if (!isFile) {
+        entry = entry.Remove(0, 1);
+        var parts = entry.Split(':');
+        string key = parts[0].Trim();
+        string value = parts.Length == 2 ? parts[1].Trim() : string.Empty;
+        switch (key) {
+          case StartArgument.TOKEN: return new StartArgument(value);
+          case HideStarterArgument.TOKEN: return new HideStarterArgument(value);
+          default: return null;
+        }
+      } else return new OpenArgument(entry);
     }
   }