- fix more duplication

Author: NinjaRocks

src/Parsley/Parser.cs

@@ -247,19 +247,39 @@ private string[] GetDelimiterSeparatedValues(string line)
             return list;
         }
 
-        public T[] Parse<T>(Stream stream, Encoding encoding = null) where T : IFileLine, new()
+        private async Task<List<string>> ReadLinesFromStreamAsync(Stream stream, ParseOptions options, Encoding encoding, Func<StreamReader, Task<string>> readLineFunc)
         {
-            return Parse<T>(stream, encoding, Options);
+            var lines = new List<string>();
+            using (var reader = new StreamReader(stream, encoding ?? Encoding.UTF8))
+            {
+                string line;
+                int lineNumber = 0;
+                while ((line = await readLineFunc(reader)) != null)
+                {
+                    // If it's the first line and we should skip header, skip it
+                    if (options.SkipHeaderLine && lineNumber == 0)
+                    {
+                        lineNumber++;
+                        continue;
+                    }
+
+                    var processedLine = options.TrimFieldValues ? line.Trim() : line;
+                    if (!options.IncludeEmptyLines && string.IsNullOrWhiteSpace(processedLine))
+                    {
+                        // Skip empty lines if not including them
+                    }
+                    else
+                    {
+                        lines.Add(processedLine);
+                    }
+                    lineNumber++;
+                }
+            }
+            return lines;
         }
 
-        public T[] Parse<T>(Stream stream, Encoding encoding, ParseOptions options) where T : IFileLine, new()
+        private List<string> ReadLinesFromStream(Stream stream, ParseOptions options, Encoding encoding)
         {
-            if (options == null)
-                options = new ParseOptions();
-
-            if (stream == null || stream.Length == 0)
-                return Array.Empty<T>();
-
             var lines = new List<string>();
             using (var reader = new StreamReader(stream, encoding ?? Encoding.UTF8))
             {
@@ -286,6 +306,23 @@ private string[] GetDelimiterSeparatedValues(string line)
                     lineNumber++;
                 }
             }
+            return lines;
+        }
+
+        public T[] Parse<T>(Stream stream, Encoding encoding = null) where T : IFileLine, new()
+        {
+            return Parse<T>(stream, encoding, Options);
+        }
+
+        public T[] Parse<T>(Stream stream, Encoding encoding, ParseOptions options) where T : IFileLine, new()
+        {
+            if (options == null)
+                options = new ParseOptions();
+
+            if (stream == null || stream.Length == 0)
+                return Array.Empty<T>();
+
+            var lines = ReadLinesFromStream(stream, options, encoding);
 
             return lines.Any() ? Parse<T>(lines.ToArray(), options) : Array.Empty<T>();
         }
@@ -348,32 +385,7 @@ private string[] GetDelimiterSeparatedValues(string line)
             if (stream.Length == 0)
                 return Array.Empty<T>();
 
-            var lines = new List<string>();
-            using (var reader = new StreamReader(stream, encoding ?? Encoding.UTF8))
-            {
-                string line;
-                int lineNumber = 0;
-                while ((line = await reader.ReadLineAsync()) != null)
-                {
-                    // If it's the first line and we should skip header, skip it
-                    if (options.SkipHeaderLine && lineNumber == 0)
-                    {
-                        lineNumber++;
-                        continue;
-                    }
-
-                    var processedLine = options.TrimFieldValues ? line.Trim() : line;
-                    if (!options.IncludeEmptyLines && string.IsNullOrWhiteSpace(processedLine))
-                    {
-                        // Skip empty lines if not including them
-                    }
-                    else
-                    {
-                        lines.Add(processedLine);
-                    }
-                    lineNumber++;
-                }
-            }
+            var lines = await ReadLinesFromStreamAsync(stream, options, encoding, (reader) => reader.ReadLineAsync());
 
             return lines.Any() ? await ParseAsync<T>(lines.ToArray(), options) : Array.Empty<T>();
         }