Added CmdArgumentsBuilder.QuoteBatArgument

Author: AbelCheng

sample/PSWebApi.OwinSample/CmdArgumentResolver.cs

@@ -18,16 +18,10 @@ public string Quote(string rawArg, bool forceQuote = false)
 
 			switch (_fileExtension)
 			{
-				case ".EXE": return CmdArgumentsBuilder.EscapeExeArgument(rawArg, forceQuote);
-				case ".BAT": return EscapeBatArgument(rawArg);
+				case ".EXE": return CmdArgumentsBuilder.QuoteExeArgument(rawArg, forceQuote);
+				case ".BAT": return CmdArgumentsBuilder.QuoteBatArgument(rawArg, forceQuote);
 				default: return rawArg;
 			}
 		}
-
-		protected virtual string EscapeBatArgument(string rawArg)
-		{
-			// todo
-			return rawArg;
-		}
 	}
 }

sample/PSWebApi.OwinSample/PSWebApi.OwinSample.csproj

@@ -40,8 +40,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="DataBooster.PSWebApi, Version=1.0.12.0, Culture=neutral, PublicKeyToken=ee1eb06d9feeb8dc, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\DataBooster.PSWebApi.1.0.12-alpha\lib\net45\DataBooster.PSWebApi.dll</HintPath>
+    <Reference Include="DataBooster.PSWebApi, Version=1.0.13.0, Culture=neutral, PublicKeyToken=ee1eb06d9feeb8dc, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\DataBooster.PSWebApi.1.0.13-alpha\lib\net45\DataBooster.PSWebApi.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.CSharp" />

sample/PSWebApi.OwinSample/Properties/AssemblyInfo.cs

@@ -31,5 +31,5 @@
 //
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.12.0")]
-[assembly: AssemblyFileVersion("1.0.12.0")]
+[assembly: AssemblyVersion("1.0.13.0")]
+[assembly: AssemblyFileVersion("1.0.13.0")]

sample/PSWebApi.OwinSample/packages.config

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="DataBooster.PSWebApi" version="1.0.12-alpha" targetFramework="net45" />
+  <package id="DataBooster.PSWebApi" version="1.0.13-alpha" targetFramework="net45" />
   <package id="Microsoft.AspNet.Cors" version="5.2.3" targetFramework="net45" />
   <package id="Microsoft.AspNet.WebApi.Client" version="5.2.3" targetFramework="net45" />
   <package id="Microsoft.AspNet.WebApi.Core" version="5.2.3" targetFramework="net45" />

sample/PSWebApi.OwinSample/scripts-root/bat-scripts/test-args.bat

@@ -9,11 +9,7 @@ SET /A args_cnt=0
 :LOOP
 	IF [%1]==[] GOTO END
 	SET /A args_cnt+=1
-	IF [%1]==[%~1] (
-		ECHO arg[%args_cnt%]: (%1)
-	) ELSE (
-		ECHO arg[%args_cnt%]: quoted->(%1); dequoted->(%~1)
-	)
+	ECHO arg[%args_cnt%]:{%1}
 	SHIFT
 	GOTO LOOP
 

sample/Test-Args/Program.cs

@@ -10,7 +10,7 @@ static int Main(string[] args)
 			Console.OutputEncoding = Encoding.UTF8;
 
 			for (int i = 0; i < args.Length; i++)
-				Console.WriteLine("args[{0}]:({1})", i, args[i]);
+				Console.WriteLine("args[{0}]:{{{1}}}", i, args[i]);
 
 			return 0;
 		}

src/DataBooster.PSWebApi/CmdArgumentsBuilder.cs

@@ -16,6 +16,7 @@ public class CmdArgumentsBuilder
 		private const string _argSeparator = " ";
 		private static readonly Regex _rgxNoneedQuotes_Exe = new Regex(@"^((\\\S|\\$|[^""\s\\])|(""(\\.|""""|[^""\\])*""))+$");
 		private static readonly Regex _rgxEscapeBackslash_Exe = new Regex(@"(\\+)(?=""|$)");
+		private static readonly Regex _rgxNoneedQuotes_Bat = new Regex(@"^([^""\s&|<>()^]|\^[&|<>()^]|(""[^""]*""))+$");
 		private readonly List<string> _rawArguments;
 		public Collection<string> RawArguments { get; private set; }
 
@@ -116,19 +117,30 @@ public string ToString(Func<string, string> escapeArgument)
 
 		// https://msdn.microsoft.com/en-us/library/17w5ykft.aspx
 		// https://msdn.microsoft.com/en-us/library/a1y7w461.aspx
-		public static string EscapeExeArgument(string arg, bool forceQuote)
+		public static string QuoteExeArgument(string rawArg, bool forceQuote)
 		{
-			if (string.IsNullOrWhiteSpace(arg))
-				return "\"" + (arg ?? string.Empty) + "\"";
+			if (string.IsNullOrWhiteSpace(rawArg))
+				return "\"" + (rawArg ?? string.Empty) + "\"";
 
-			if (forceQuote == false && _rgxNoneedQuotes_Exe.IsMatch(arg))
-				return arg;
+			if (forceQuote == false && _rgxNoneedQuotes_Exe.IsMatch(rawArg))
+				return rawArg;
 
-			string escArg = _rgxEscapeBackslash_Exe.Replace(arg, m => m.Groups[1].Value + m.Groups[1].Value);
+			string escArg = _rgxEscapeBackslash_Exe.Replace(rawArg, m => m.Groups[1].Value + m.Groups[1].Value);
 
 			return "\"" + escArg.Replace("\"", "\\\"") + "\"";
 		}
 
+		public static string QuoteBatArgument(string rawArg, bool forceQuote)
+		{
+			if (string.IsNullOrWhiteSpace(rawArg))
+				return "\"" + (rawArg ?? string.Empty) + "\"";
+
+			if (forceQuote == false && _rgxNoneedQuotes_Bat.IsMatch(rawArg))
+				return rawArg;
+
+			return "\"" + rawArg.Replace("\"", "\"\"") + "\"";
+		}
+
 		public override string ToString()
 		{
 			return ToString(null);