array handling, more easiness

Author: neuecc

sandbox/SingleContainedApp/Program.cs

@@ -6,6 +6,7 @@
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Reflection;
 using System.Text;
@@ -114,9 +115,9 @@ public void Help()
 
     public class ComplexArgTest : BatchBase
     {
-        public void Foo(int[] array, Person person)
+        public void Foo(string[] array, Person person)
         {
-            Console.WriteLine(string.Join(", ", array));
+            Console.WriteLine(array.Length + ":" + string.Join(", ", array));
             Console.WriteLine(person.Age + ":" + person.Name);
         }
     }
@@ -131,7 +132,7 @@ class Program
     {
         static async Task Main(string[] args)
         {
-            args =  @"-array [10,20,30] -person {""Age"":10,""Name"":""foo""}".Split(' ');
+            args = new[] { "-array", "foo bar baz", "-person", @"{""Age"":10,""Name"":""foo""}" };
 
             await BatchHost.CreateDefaultBuilder()
                 .ConfigureServices((hostContext, services) =>

src/MicroBatchFramework/BatchEngine.cs

@@ -249,7 +249,22 @@ static bool TryGetInvokeArguments(ParameterInfo[] parameters, string?[] args, in
                             var v = value.Value;
                             if (!(v.StartsWith("[") && v.EndsWith("]")))
                             {
-                                v = "[" + v + "]";
+                                var elemType = UnwrapCollectionElementType(parameters[i].ParameterType);
+                                if (elemType == typeof(string))
+                                {
+                                    if (!(v.StartsWith("\"") && v.EndsWith("\"")))
+                                    {
+                                        v = "[" + string.Join(",", v.Split(' ').Select(x => "\"" + x + "\"")) + "]";
+                                    }
+                                    else
+                                    {
+                                        v = "[" + v + "]";
+                                    }
+                                }
+                                else
+                                {
+                                    v = "[" + string.Join(",", v.Trim('\'', '\"').Split(' ')) + "]";
+                                }
                             }
                             try
                             {
@@ -284,7 +299,12 @@ static bool TryGetInvokeArguments(ParameterInfo[] parameters, string?[] args, in
                 }
                 else
                 {
-                    errorMessage = "Required parameter \"" + item.Name + "\"" + " not found in argument.";
+                    var name = item.Name;
+                    if (option?.ShortName != null)
+                    {
+                        name = item.Name + "(" + "-" + option.ShortName + ")";
+                    }
+                    errorMessage = "Required parameter \"" + name + "\"" + " not found in argument.";
                     return false;
                 }
             }
@@ -293,6 +313,24 @@ static bool TryGetInvokeArguments(ParameterInfo[] parameters, string?[] args, in
             return true;
         }
 
+        static Type? UnwrapCollectionElementType(Type collectionType)
+        {
+            if (collectionType.IsArray)
+            {
+                return collectionType.GetElementType();
+            }
+
+            foreach (var i in collectionType.GetInterfaces())
+            {
+                if (i.IsGenericType && (i.GetGenericTypeDefinition() == typeof(IEnumerable<>)))
+                {
+                    return i.GetGenericArguments()[0];
+                }
+            }
+
+            return null;
+        }
+
         static ReadOnlyDictionary<string, OptionParameter> ParseArgument(string?[] args, int argsOffset)
         {
             var dict = new Dictionary<string, OptionParameter>(args.Length, StringComparer.OrdinalIgnoreCase);