!10 为 CsvConfiguration 增加 SplitFn

Merge pull request !10 from 韩严重/SplitFn
votoantrung · Jan 7, 2023 · 496cb48 · 496cb48
2 parents a319bdb + 49cb28c
commit 496cb48
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/src/MiniExcel/Csv/CsvConfiguration.cs b/src/MiniExcel/Csv/CsvConfiguration.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using System.Text;
 
@@ -9,7 +9,8 @@ public class CsvConfiguration : Configuration
         private static Encoding _defaultEncoding = new UTF8Encoding(true);
 
         public char Seperator { get; set; } = ',';
-        public string NewLine { get; set; } = "\r\n";
+        public string NewLine { get; set; } = "\r\n";        
+        public Func<string, string[]> SplitFn { get; set; }
         public Func<Stream, StreamReader> StreamReaderFunc { get; set; } = (stream) => new StreamReader(stream, _defaultEncoding);
         public Func<Stream, StreamWriter> StreamWriterFunc { get; set; } = (stream) => new StreamWriter(stream, _defaultEncoding);
 

diff --git a/src/MiniExcel/Csv/CsvReader.cs b/src/MiniExcel/Csv/CsvReader.cs
@@ -1,4 +1,4 @@
-using MiniExcelLibs.OpenXml;
+using MiniExcelLibs.OpenXml;
 using MiniExcelLibs.Utils;
 using System;
 using System.Collections.Generic;
@@ -73,9 +73,16 @@ public IEnumerable<IDictionary<string, object>> Query(bool useHeaderRow, string
 
         private string[] Split(string row)
         {
-            return Regex.Split(row, $"[\t{_config.Seperator}](?=(?:[^\"]|\"[^\"]*\")*$)")
-                .Select(s => Regex.Replace(s.Replace("\"\"", "\""), "^\"|\"$", "")).ToArray();
-            //this code from S.O : https://stackoverflow.com/a/11365961/9131476
+            if (_config.SplitFn != null)
+            {
+                return _config.SplitFn(row);
+            }
+            else
+            {
+                return Regex.Split(row, $"[\t{_config.Seperator}](?=(?:[^\"]|\"[^\"]*\")*$)")
+                    .Select(s => Regex.Replace(s.Replace("\"\"", "\""), "^\"|\"$", "")).ToArray();
+                //this code from S.O : https://stackoverflow.com/a/11365961/9131476
+            }
         }
 
         public Task<IEnumerable<IDictionary<string, object>>> QueryAsync(bool UseHeaderRow, string sheetName, string startCell,CancellationToken cancellationToken = default(CancellationToken))