made all the Dictionary<string,string> case insensitive.

steveshortt · steveshortt · commit d380e90d347f · 2017-05-24T11:32:29.000-05:00
diff --git a/Synapse.Common/CmdLine/HttpApiCliBase.cs b/Synapse.Common/CmdLine/HttpApiCliBase.cs
@@ -61,8 +61,8 @@ protected virtual List<object> GetMethodParameters(string[] args, int cmdlineSta
                 for( int i = parmsStartIndex; i < parms.Length; i++ )
                 {
                     ParameterInfo parm = parms[i];
-                    if( options.Keys.Contains( parm.Name.ToLower() ) )
-                        parameters.Add( ParseInput( options[parm.Name.ToLower()], parm.ParameterType ) );
+                    if( options.Keys.Contains( parm.Name ) )  //.ToLower()
+                        parameters.Add( ParseInput( options[parm.Name], parm.ParameterType ) ); //.ToLower()
                     else
                         parameters.Add( null );
                 }
@@ -73,7 +73,7 @@ protected virtual List<object> GetMethodParameters(string[] args, int cmdlineSta
 
         protected virtual Dictionary<string, string> ParseCmdLine(string[] args, int startIndex, ref bool error, bool suppressErrorMessages = false)
         {
-            Dictionary<string, string> options = new Dictionary<string, string>();
+            Dictionary<string, string> options = new Dictionary<string, string>( StringComparer.OrdinalIgnoreCase );
 
             if( args.Length < (startIndex + 1) )
             {
@@ -90,7 +90,7 @@ protected virtual Dictionary<string, string> ParseCmdLine(string[] args, int sta
 
                     // If match not found, command line args are improperly formed.
                     if( match.Success )
-                        options[match.Groups["argname"].Value.ToLower()] = match.Groups["argvalue"].Value;  //.ToLower();
+                        options[match.Groups["argname"].Value] = match.Groups["argvalue"].Value;  //.ToLower();.ToLower()
                     else if( !suppressErrorMessages )
                         WriteHelpAndExit( "The command line arguments are not valid or are improperly formed. Use 'argname:argvalue' for extended arguments." );
                 }
@@ -231,7 +231,7 @@ public class CmdLineUtilities
     {
         public static Dictionary<string, string> ParseCmdLine(string[] args, int startIndex, ref bool error, ref string message, Action<string> onErrorMethod, bool suppressErrorMessages = false)
         {
-            Dictionary<string, string> options = new Dictionary<string, string>();
+            Dictionary<string, string> options = new Dictionary<string, string>( StringComparer.OrdinalIgnoreCase );
 
             if( args.Length < (startIndex + 1) )
             {
@@ -250,7 +250,7 @@ public static Dictionary<string, string> ParseCmdLine(string[] args, int startIn
                     // If match not found, command line args are improperly formed.
                     if( match.Success )
                     {
-                        options[match.Groups["argname"].Value.ToLower()] = match.Groups["argvalue"].Value.ToLower();
+                        options[match.Groups["argname"].Value] = match.Groups["argvalue"].Value;        //.ToLower();.ToLower()
                     }
                     else
                     {
diff --git a/Synapse.Common/Properties/AssemblyInfo.cs b/Synapse.Common/Properties/AssemblyInfo.cs
@@ -38,4 +38,4 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion( "0.1.0.0" )]
-[assembly: AssemblyFileVersion( "0.1.17143.0" )]
+[assembly: AssemblyFileVersion( "0.1.17144.0" )]
diff --git a/Synapse.Common/Utilities/Utilities.cs b/Synapse.Common/Utilities/Utilities.cs
@@ -39,7 +39,7 @@ public static string ToQueryString(this IDictionary<string, string> dynamicData,
         public static Dictionary<string, string> ParseQueryString(this Uri uri)
         {
             NameValueCollection nvc = HttpUtility.ParseQueryString( uri.Query );
-            Dictionary<string, string> d = new Dictionary<string, string>( nvc.Count );
+            Dictionary<string, string> d = new Dictionary<string, string>( nvc.Count, StringComparer.OrdinalIgnoreCase );
             foreach( string key in nvc.AllKeys )
                 d[key] = nvc[key];
             return d;
diff --git a/Synapse.Core/Properties/AssemblyInfo.cs b/Synapse.Core/Properties/AssemblyInfo.cs
@@ -37,4 +37,4 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion( "0.1.0.0" )]
-[assembly: AssemblyFileVersion( "0.1.17143.0" )]
+[assembly: AssemblyFileVersion( "0.1.17144.0" )]
diff --git a/Synapse.Core/Runtime/ParameterInfoRuntime.cs b/Synapse.Core/Runtime/ParameterInfoRuntime.cs
@@ -16,7 +16,7 @@ public partial class ParameterInfo : IParameterInfo
 
         public object Resolve(out List<object> forEachParms, Dictionary<string, string> dynamicData = null)
         {
-            _dynamicData = dynamicData ?? new Dictionary<string, string>();
+            _dynamicData = dynamicData ?? new Dictionary<string, string>( StringComparer.OrdinalIgnoreCase );
             forEachParms = new List<object>();
 
             object parms = null;
diff --git a/Synapse.cli/Program.cs b/Synapse.cli/Program.cs
@@ -330,9 +330,9 @@ public Arguments(string[] args)
 
             if( IsParsed )
             {
-                Dictionary<string, string> origcase = new Dictionary<string, string>();
-                Args = ParseCmdLine( args, ref origcase );
+                Args = ParseCmdLine( args );
 
+                #region known parms
                 #region Plan
                 if( Args.Keys.Contains( __plan ) )
                 {
@@ -498,12 +498,7 @@ public Arguments(string[] args)
                     Verbose = false;
                 }
                 #endregion
-
-                //this returns a colleection with original casing from the cmdline parms
-                Dictionary<string, string> newArgs = new Dictionary<string, string>();
-                foreach( string key in Args.Keys )
-                    newArgs.Add( origcase[key], Args[key] );
-                Args = newArgs;
+                #endregion
             }
 
             IsParsed &= string.IsNullOrWhiteSpace( Message );
@@ -530,10 +525,10 @@ public Arguments(string[] args)
         public bool IsSample { get { return !string.IsNullOrWhiteSpace( Sample ); } }
         public bool Verbose { get; internal set; }
 
-        Dictionary<string, string> ParseCmdLine(string[] args, ref Dictionary<string, string> origcase)
+        Dictionary<string, string> ParseCmdLine(string[] args)
         {
             IsParsed = true;
-            Dictionary<string, string> options = new Dictionary<string, string>();
+            Dictionary<string, string> options = new Dictionary<string, string>( StringComparer.OrdinalIgnoreCase );
 
             string pattern = "(?<argname>.*?):(?<argvalue>.*)";
             //string pattern = @"(?<argname>/\w+):(?<argvalue>.*)";
@@ -544,10 +539,8 @@ Dictionary<string, string> ParseCmdLine(string[] args, ref Dictionary<string, st
                 // If match not found, command line args are improperly formed.
                 if( match.Success )
                 {
-                    string orig = match.Groups["argname"].Value.TrimStart( '/' );
-                    string lcase = orig.ToLower();
-                    options[lcase] = match.Groups["argvalue"].Value;
-                    origcase[lcase] = orig;
+                    options[match.Groups["argname"].Value.TrimStart( '/' )] =       //.ToLower()
+                        match.Groups["argvalue"].Value;
                 }
                 else
                 {
diff --git a/Synapse.cli/Properties/AssemblyInfo.cs b/Synapse.cli/Properties/AssemblyInfo.cs
@@ -33,4 +33,4 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion( "0.1.0.0" )]
-[assembly: AssemblyFileVersion( "0.1.17143.0" )]
+[assembly: AssemblyFileVersion( "0.1.17144.0" )]

Original file line number	Diff line number	Diff line change
`@@ -61,8 +61,8 @@ protected virtual List<object> GetMethodParameters(string[] args, int cmdlineSta`
`61`	`61`	`for( int i = parmsStartIndex; i < parms.Length; i++ )`
`62`	`62`	`{`
`63`	`63`	`ParameterInfo parm = parms[i];`
`64`		`- if( options.Keys.Contains( parm.Name.ToLower() ) )`
`65`		`- parameters.Add( ParseInput( options[parm.Name.ToLower()], parm.ParameterType ) );`
	`64`	`+ if( options.Keys.Contains( parm.Name ) ) //.ToLower()`
	`65`	`+ parameters.Add( ParseInput( options[parm.Name], parm.ParameterType ) ); //.ToLower()`
`66`	`66`	`else`
`67`	`67`	`parameters.Add( null );`
`68`	`68`	`}`
`@@ -73,7 +73,7 @@ protected virtual List<object> GetMethodParameters(string[] args, int cmdlineSta`
`73`	`73`
`74`	`74`	`protected virtual Dictionary<string, string> ParseCmdLine(string[] args, int startIndex, ref bool error, bool suppressErrorMessages = false)`
`75`	`75`	`{`
`76`		`- Dictionary<string, string> options = new Dictionary<string, string>();`
	`76`	`+ Dictionary<string, string> options = new Dictionary<string, string>( StringComparer.OrdinalIgnoreCase );`
`77`	`77`
`78`	`78`	`if( args.Length < (startIndex + 1) )`
`79`	`79`	`{`
`@@ -90,7 +90,7 @@ protected virtual Dictionary<string, string> ParseCmdLine(string[] args, int sta`
`90`	`90`
`91`	`91`	`// If match not found, command line args are improperly formed.`
`92`	`92`	`if( match.Success )`
`93`		`- options[match.Groups["argname"].Value.ToLower()] = match.Groups["argvalue"].Value; //.ToLower();`
	`93`	`+ options[match.Groups["argname"].Value] = match.Groups["argvalue"].Value; //.ToLower();.ToLower()`
`94`	`94`	`else if( !suppressErrorMessages )`
`95`	`95`	`WriteHelpAndExit( "The command line arguments are not valid or are improperly formed. Use 'argname:argvalue' for extended arguments." );`
`96`	`96`	`}`
`@@ -231,7 +231,7 @@ public class CmdLineUtilities`
`231`	`231`	`{`
`232`	`232`	`public static Dictionary<string, string> ParseCmdLine(string[] args, int startIndex, ref bool error, ref string message, Action<string> onErrorMethod, bool suppressErrorMessages = false)`
`233`	`233`	`{`
`234`		`- Dictionary<string, string> options = new Dictionary<string, string>();`
	`234`	`+ Dictionary<string, string> options = new Dictionary<string, string>( StringComparer.OrdinalIgnoreCase );`
`235`	`235`
`236`	`236`	`if( args.Length < (startIndex + 1) )`
`237`	`237`	`{`
`@@ -250,7 +250,7 @@ public static Dictionary<string, string> ParseCmdLine(string[] args, int startIn`
`250`	`250`	`// If match not found, command line args are improperly formed.`
`251`	`251`	`if( match.Success )`
`252`	`252`	`{`
`253`		`- options[match.Groups["argname"].Value.ToLower()] = match.Groups["argvalue"].Value.ToLower();`
	`253`	`+ options[match.Groups["argname"].Value] = match.Groups["argvalue"].Value; //.ToLower();.ToLower()`
`254`	`254`	`}`
`255`	`255`	`else`
`256`	`256`	`{`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ public static string ToQueryString(this IDictionary<string, string> dynamicData,`
`39`	`39`	`public static Dictionary<string, string> ParseQueryString(this Uri uri)`
`40`	`40`	`{`
`41`	`41`	`NameValueCollection nvc = HttpUtility.ParseQueryString( uri.Query );`
`42`		`- Dictionary<string, string> d = new Dictionary<string, string>( nvc.Count );`
	`42`	`+ Dictionary<string, string> d = new Dictionary<string, string>( nvc.Count, StringComparer.OrdinalIgnoreCase );`
`43`	`43`	`foreach( string key in nvc.AllKeys )`
`44`	`44`	`d[key] = nvc[key];`
`45`	`45`	`return d;`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ public partial class ParameterInfo : IParameterInfo`
`16`	`16`
`17`	`17`	`public object Resolve(out List<object> forEachParms, Dictionary<string, string> dynamicData = null)`
`18`	`18`	`{`
`19`		`- _dynamicData = dynamicData ?? new Dictionary<string, string>();`
	`19`	`+ _dynamicData = dynamicData ?? new Dictionary<string, string>( StringComparer.OrdinalIgnoreCase );`
`20`	`20`	`forEachParms = new List<object>();`
`21`	`21`
`22`	`22`	`object parms = null;`
Original file line number	Diff line number	Diff line change
`@@ -330,9 +330,9 @@ public Arguments(string[] args)`
`330`	`330`
`331`	`331`	`if( IsParsed )`
`332`	`332`	`{`
`333`		`- Dictionary<string, string> origcase = new Dictionary<string, string>();`
`334`		`- Args = ParseCmdLine( args, ref origcase );`
	`333`	`+ Args = ParseCmdLine( args );`
`335`	`334`
	`335`	`+ #region known parms`
`336`	`336`	`#region Plan`
`337`	`337`	`if( Args.Keys.Contains( __plan ) )`
`338`	`338`	`{`
`@@ -498,12 +498,7 @@ public Arguments(string[] args)`
`498`	`498`	`Verbose = false;`
`499`	`499`	`}`
`500`	`500`	`#endregion`
`501`		`-`
`502`		`- //this returns a colleection with original casing from the cmdline parms`
`503`		`- Dictionary<string, string> newArgs = new Dictionary<string, string>();`
`504`		`- foreach( string key in Args.Keys )`
`505`		`- newArgs.Add( origcase[key], Args[key] );`
`506`		`- Args = newArgs;`
	`501`	`+ #endregion`
`507`	`502`	`}`
`508`	`503`
`509`	`504`	`IsParsed &= string.IsNullOrWhiteSpace( Message );`
`@@ -530,10 +525,10 @@ public Arguments(string[] args)`
`530`	`525`	`public bool IsSample { get { return !string.IsNullOrWhiteSpace( Sample ); } }`
`531`	`526`	`public bool Verbose { get; internal set; }`
`532`	`527`
`533`		`- Dictionary<string, string> ParseCmdLine(string[] args, ref Dictionary<string, string> origcase)`
	`528`	`+ Dictionary<string, string> ParseCmdLine(string[] args)`
`534`	`529`	`{`
`535`	`530`	`IsParsed = true;`
`536`		`- Dictionary<string, string> options = new Dictionary<string, string>();`
	`531`	`+ Dictionary<string, string> options = new Dictionary<string, string>( StringComparer.OrdinalIgnoreCase );`
`537`	`532`
`538`	`533`	`string pattern = "(?<argname>.?):(?<argvalue>.)";`
`539`	`534`	`//string pattern = @"(?<argname>/\w+):(?<argvalue>.*)";`
`@@ -544,10 +539,8 @@ Dictionary<string, string> ParseCmdLine(string[] args, ref Dictionary<string, st`
`544`	`539`	`// If match not found, command line args are improperly formed.`
`545`	`540`	`if( match.Success )`
`546`	`541`	`{`
`547`		`- string orig = match.Groups["argname"].Value.TrimStart( '/' );`
`548`		`- string lcase = orig.ToLower();`
`549`		`- options[lcase] = match.Groups["argvalue"].Value;`
`550`		`- origcase[lcase] = orig;`
	`542`	`+ options[match.Groups["argname"].Value.TrimStart( '/' )] = //.ToLower()`
	`543`	`+ match.Groups["argvalue"].Value;`
`551`	`544`	`}`
`552`	`545`	`else`
`553`	`546`	`{`