#724 Fixed splitting of possible glob patterns (contributed by @karl-sjogren)

Author: danielpalme

src/Readme.txt

@@ -67,6 +67,10 @@ For further details take a look at LICENSE.txt.
 
 CHANGELOG
 
+5.4.5.0
+
+    * Fix: #724  Fixed splitting of possible glob patterns (contributed by @karl-sjogren)
+
 5.4.4.0
 
     * New: #714 Improved AoT support

src/ReportGenerator.Core.Test/Common/StringExtensionsTest.cs

@@ -13,5 +13,15 @@ public void ParseLargeInteger_CorrectResultReturned()
             Assert.Equal(1000, "1000".ParseLargeInteger());
             Assert.Equal(int.MaxValue, "2147483649".ParseLargeInteger());
         }
+
+        [Theory]
+        [InlineData("a,b,c", new[] { "a", "b", "c" })]
+        [InlineData("a,{b,c};d", new[] { "a", "{b,c}", "d" })]
+        [InlineData("a,{b,c;d", new[] { "a", "{b", "c", "d" })]
+        public void SplitThatEnsuresGlobsAreSafe_CorrectResultReturned(string input, string[] expectedParts)
+        {
+            var result = input.SplitThatEnsuresGlobsAreSafe(',', ';');
+            Assert.Equal(expectedParts, result);
+        }
     }
 }

src/ReportGenerator.Core/Common/StringExtensions.cs

@@ -1,4 +1,6 @@
+using System.Collections.Generic;
 using System.Globalization;
+using System.Linq;
 
 namespace Palmmedia.ReportGenerator.Core.Common
 {
@@ -24,5 +26,53 @@ public static int ParseLargeInteger(this string input)
                 return int.MaxValue;
             }
         }
+
+        /// <summary>
+        /// Splits the string at the specified separator, but ensures that globs are not split.
+        /// </summary>
+        /// <param name="input">The input string.</param>
+        /// <param name="separators">List of separators.</param>
+        /// <returns>The parts.</returns>
+        public static string[] SplitThatEnsuresGlobsAreSafe(this string input, params char[] separators)
+        {
+            if (separators == null || separators.Length == 0)
+            {
+                return new string[] { input };
+            }
+
+            var parts = new List<string>();
+            var braceCount = 0;
+            var start = 0;
+
+            for (int i = 0; i < input.Length; i++)
+            {
+                if (input[i] == '{')
+                {
+                    braceCount++;
+                }
+                else if (input[i] == '}')
+                {
+                    braceCount--;
+                }
+
+                if (braceCount > 0 && input.IndexOf('}', i + 1) == -1)
+                {
+                    braceCount = 0;
+                }
+
+                if (separators.Contains(input[i]) && braceCount == 0)
+                {
+                    parts.Add(input.Substring(start, i - start).Trim());
+                    start = i + 1;
+                }
+            }
+
+            if (start < input.Length)
+            {
+                parts.Add(input.Substring(start).Trim());
+            }
+
+            return parts.ToArray();
+        }
     }
 }

src/ReportGenerator.Core/ReportConfigurationBuilder.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using DotNetConfig;
+using Palmmedia.ReportGenerator.Core.Common;
 using Palmmedia.ReportGenerator.Core.Logging;
 using Palmmedia.ReportGenerator.Core.Properties;
 
@@ -53,11 +54,11 @@ public ReportConfiguration Create(Dictionary<string, string> cliArguments)
 
             if (namedArguments.TryGetValue(CommandLineArgumentNames.Reports, out value))
             {
-                reportFilePatterns = value.Split(ArgumentSeparators, StringSplitOptions.RemoveEmptyEntries);
+                reportFilePatterns = value.SplitThatEnsuresGlobsAreSafe(ArgumentSeparators);
             }
             else if (config.TryGetString(DotNetConfigSettingNames.Reports, out value))
             {
-                reportFilePatterns = value.Split(ArgumentSeparators, StringSplitOptions.RemoveEmptyEntries);
+                reportFilePatterns = value.SplitThatEnsuresGlobsAreSafe(ArgumentSeparators);
             }
             else
             {

src/ReportGenerator.MSBuild/ReportGenerator.cs

@@ -5,6 +5,7 @@
 using Microsoft.Build.Framework;
 using Microsoft.Build.Utilities;
 using Palmmedia.ReportGenerator.Core;
+using Palmmedia.ReportGenerator.Core.Common;
 
 namespace Palmmedia.ReportGenerator.MSBuild
 {
@@ -190,7 +191,7 @@ public override bool Execute()
             }
             else if (config.TryGetString(DotNetConfigSettingNames.Reports, out value))
             {
-                reportFilePatterns = value.Split(ArgumentSeparators, StringSplitOptions.RemoveEmptyEntries);
+                reportFilePatterns = value.SplitThatEnsuresGlobsAreSafe(ArgumentSeparators);
             }
             else
             {