Add ReadNext(), extract ReadHeaders()

Bokonon79 · Jan 21, 2019 · ae7a4fd · ae7a4fd
1 parent e1cb5a3
commit ae7a4fd
Showing 1 changed file with 17 additions and 7 deletions.
diff --git a/CANLib/DataWithColumns.cs b/CANLib/DataWithColumns.cs
@@ -189,17 +189,12 @@ public void Read(StreamReader streamReader, Action<List<string>> callback, uint
       Thread.CurrentThread.CurrentCulture = CultureInfo.InvariantCulture;
       try
       {
-        ReadCustomHeader(streamReader);
-
-        if (HeaderRow)
-        {
-          ReadColumnHeader(streamReader);
-        }
+        ReadHeaders(streamReader);
 
         uint dataPointCount = 0;
         while ((dataPointLimit == 0) || (dataPointCount < dataPointLimit))
         {
-          List<string> row = ReadDataRow(streamReader);
+          List<string> row = ReadNext(streamReader);
           if (row == null)
           {
             break;
@@ -219,6 +214,21 @@ public void Read(StreamReader streamReader, Action<List<string>> callback, uint
       }
     }
 
+    public void ReadHeaders(StreamReader streamReader)
+    {
+        ReadCustomHeader(streamReader);
+
+        if (HeaderRow)
+        {
+            ReadColumnHeader(streamReader);
+        }
+    }
+
+    public List<string> ReadNext(StreamReader streamReader)
+    {
+        return ReadDataRow(streamReader);
+    }
+
     protected void ReadBlankLine(StreamReader streamReader)
     {
       ReadFixedString(streamReader, "");