Auto trim headers with leading/trailing whitespace

ServiceStack · Nov 6, 2019 · 8e83147 · 8e83147
1 parent 6b32fb4
commit 8e83147
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/src/ServiceStack.Text/CsvReader.cs b/src/ServiceStack.Text/CsvReader.cs
@@ -59,7 +59,8 @@ public static List<string> ParseLines(string csv)
             return rows;
         }
 
-        public static List<string> ParseFields(string line)
+        public static List<string> ParseFields(string line) => ParseFields(line, null);
+        public static List<string> ParseFields(string line, Func<string,string> parseFn)
         {
             var to = new List<string>();
             if (string.IsNullOrEmpty(line))
@@ -70,7 +71,7 @@ public static List<string> ParseFields(string line)
             while (++i <= len)
             {
                 var value = EatValue(line, ref i);
-                to.Add(value.FromCsvField());
+                to.Add(parseFn != null ? parseFn(value.FromCsvField()) : value.FromCsvField());
             }
 
             return to;
@@ -355,7 +356,9 @@ public static List<T> Read(List<string> rows)
 
             List<string> headers = null;
             if (!CsvConfig<T>.OmitHeaders || Headers.Count == 0)
-                headers = CsvReader.ParseFields(rows[0]);
+            {
+                headers = CsvReader.ParseFields(rows[0], s => s.Trim());
+            }
 
             if (typeof(T).IsValueType || typeof(T) == typeof(string))
             {