Changeset 17013 for branches/2924_DotNetCoreMigration/HeuristicLab.CommandLineInterface

Timestamp:

06/17/19 10:40:41 (5 years ago)

Author:

dpiringe

Message:

#2924:

• some changes in CLIApplication.cs to reduce unnecessary allocation of string objects
• renamed AppTest to ConsoleOptimizer and fixed race condition
• replaced enum RunnerJob with class RunnerMessage for more control of saved data
• changed usage of BinaryFormatter with HEAL.Attic, following types are now Storable:
  • ConsoleOptimizer
  • InspectApplication
  • ApplicationBase
  • ApplicationRunner
  • AssemblyInfo
  • Runner
  • UniPath
  • RunnerMessage
• switched QuietMode from ApplicationRunner to IRunner
• DockerRunnerHost can now automatically build docker images for linux and windows containers (also identifies which container type is active) -> removes the condition to have the image preinstalled
  • to achieve this, there are two new folders DockerLinuxBuild and DockerWindowsBuild included in build output, which include Dockerfiles to build images for linux and windows container
• added NuGet package System.CodeDom to project HeuristicLab.Scripting-3.3
• added method Send(RunnerMessage) to IRunnerHost and transferred methods Pause and Resume to IRunner
• added internal reference of RunnerHost in Runner
• added abstract method SendMessage(RunnerMessage) in RunnerHost which gets called from method Send(RunnerMessage)
• because of a Google.Protobuf "bug", RunnerMessages cannot get serialized/deserialized directly on stream -> workaround with a byte array, which gets written and read
  • additionally, the length of the array gets sent first (length as integer -> 4 bytes)
  • static method in RunnerMessage to read a message from a stream
  • the method SendMessage(RunnerMessage) in RunnerHost implements this functionality

File:

• branches/2924_DotNetCoreMigration/HeuristicLab.CommandLineInterface/CLIApplication.cs (modified) (6 diffs)

branches/2924_DotNetCoreMigration/HeuristicLab.CommandLineInterface/CLIApplication.cs

@@ -51 +51 @@
           SetOption(cmdData, option, (i + 1 < args.Length) ? args[++i] : "");
         // else check if arg is valid command, then jump to next command
-        else if (IsValidCommand(args[i], cmdData, out CommandData next)) {          
+        else if (IsValidCommand(args[i], cmdData, out CommandData next)) {
           CheckRequirements(cmdData);
           valueIndex = 0; // reset value index for new command
@@ -163 +163 @@
     /// Returns true when the given argument can be identified as help option (--help).
     /// </summary>
-    private static bool IsHelpRequest(string arg) => arg.ToLower().Equals("--help");
+    private static bool IsHelpRequest(string arg) => arg.Equals("--help", StringComparison.InvariantCultureIgnoreCase);
 
     /// <summary>
@@ -185 +185 @@
     private static bool IsValidCommand(string arg, CommandData cmdData, out CommandData next) {
       foreach (var cmd in cmdData.Commands) {
-        if (arg.ToLower().Equals(cmd.Identifier.ToLower())) {
+        if (cmd.Identifier.Equals(arg, StringComparison.InvariantCultureIgnoreCase)) {
           next = cmd;
           return true;
@@ -213 +213 @@
     /// </summary>
     private static ICommand GetInstance(CommandData cmdData) {
-      if (cmdData.Instance == null) 
+      if (cmdData.Instance == null)
         cmdData.Instance = (ICommand)Activator.CreateInstance(cmdData.CommandType);
       return cmdData.Instance;
@@ -226 +226 @@
           IList list = (IList)CreateGenericType(typeof(List<>), targetType);
           string[] elements = nextArg.Split(',');
-          foreach(var elem in elements) list.Add(ParseString(elem, targetType));
+          foreach (var elem in elements) list.Add(ParseString(elem, targetType));
           property.SetValue(GetInstance(cmdData), list);
         } else property.SetValue(GetInstance(cmdData), ParseString(nextArg, property.PropertyType));
@@ -318 +318 @@
     /// Valid = it implements ICommand and has a parameterless constructor.
     /// </summary>
-    private static bool IsInstancableCommand(Type type) => 
-      type.GetInterface(nameof(ICommand)) != null && 
-      !type.IsAbstract && 
-      !type.IsInterface && 
+    private static bool IsInstancableCommand(Type type) =>
+      type.GetInterface(nameof(ICommand)) != null &&
+      !type.IsAbstract &&
+      !type.IsInterface &&
       type.GetConstructors().Any(info => info.GetParameters().Length == 0);