optimization cancellation

Author: izanhzh

src/MiniExcel/MiniExcelDataReaderBase.cs

@@ -219,7 +219,7 @@ public virtual Task<bool> NextResultAsync(CancellationToken cancellationToken)
         {
             if (cancellationToken.IsCancellationRequested)
             {
-                return MiniExcelTask.FromCanceled<bool>(new CancellationToken(true));
+                return MiniExcelTask.FromCanceled<bool>(cancellationToken);
             }
             else
             {
@@ -258,7 +258,7 @@ public virtual Task<string> GetNameAsync(int i, CancellationToken cancellationTo
         {
             if (cancellationToken.IsCancellationRequested)
             {
-                return MiniExcelTask.FromCanceled<string>(new CancellationToken(true));
+                return MiniExcelTask.FromCanceled<string>(cancellationToken);
             }
             else
             {
@@ -297,7 +297,7 @@ public virtual Task<object> GetValueAsync(int i, CancellationToken cancellationT
         {
             if (cancellationToken.IsCancellationRequested)
             {
-                return MiniExcelTask.FromCanceled<object>(new CancellationToken(true));
+                return MiniExcelTask.FromCanceled<object>(cancellationToken);
             }
             else
             {
@@ -333,7 +333,7 @@ public virtual Task<bool> ReadAsync(CancellationToken cancellationToken)
         {
             if (cancellationToken.IsCancellationRequested)
             {
-                return MiniExcelTask.FromCanceled<bool>(new CancellationToken(true));
+                return MiniExcelTask.FromCanceled<bool>(cancellationToken);
             }
             else
             {

src/MiniExcel/OpenXml/ExcelOpenXmlSheetWriter.Async.cs

@@ -56,7 +56,7 @@ private async Task CreateSheetXmlAsync(object value, string sheetPath, Cancellat
                     switch (value)
                     {
                         case IDataReader dataReader:
-                            await GenerateSheetByIDataReaderAsync(writer, dataReader);
+                            await GenerateSheetByIDataReaderAsync(writer, dataReader, cancellationToken);
                             break;
                         case IEnumerable enumerable:
                             await GenerateSheetByEnumerableAsync(writer, enumerable);
@@ -96,11 +96,11 @@ private async Task WriteDimensionAsync(MiniExcelAsyncStreamWriter writer, int ma
             writer.SetPosition(position);
         }
 
-        private async Task GenerateSheetByIDataReaderAsync(MiniExcelAsyncStreamWriter writer, IDataReader reader)
+        private async Task GenerateSheetByIDataReaderAsync(MiniExcelAsyncStreamWriter writer, IDataReader reader, CancellationToken cancellationToken)
         {
             if (reader is IMiniExcelDataReader miniExcelDataReader)
             {
-                await GenerateSheetByIMiniExcelDataReaderAsync(writer, miniExcelDataReader);
+                await GenerateSheetByIMiniExcelDataReaderAsync(writer, miniExcelDataReader, cancellationToken);
                 return;
             }
 
@@ -215,7 +215,7 @@ private async Task GenerateSheetByIDataReaderAsync(MiniExcelAsyncStreamWriter wr
             }
         }
 
-        private async Task GenerateSheetByIMiniExcelDataReaderAsync(MiniExcelAsyncStreamWriter writer, IMiniExcelDataReader reader)
+        private async Task GenerateSheetByIMiniExcelDataReaderAsync(MiniExcelAsyncStreamWriter writer, IMiniExcelDataReader reader, CancellationToken cancellationToken)
         {
             long dimensionPlaceholderPostition = 0;
             await writer.WriteAsync(WorksheetXml.StartWorksheet);
@@ -233,7 +233,7 @@ private async Task GenerateSheetByIMiniExcelDataReaderAsync(MiniExcelAsyncStream
                 var props = new List<ExcelColumnInfo>();
                 for (var i = 0; i < reader.FieldCount; i++)
                 {
-                    var columnName = await reader.GetNameAsync(i);
+                    var columnName = await reader.GetNameAsync(i, cancellationToken);
 
                     if (!_configuration.DynamicColumnFirst)
                     {
@@ -280,7 +280,7 @@ private async Task GenerateSheetByIMiniExcelDataReaderAsync(MiniExcelAsyncStream
                     }
                 }
 
-                while (await reader.ReadAsync())
+                while (await reader.ReadAsync(cancellationToken))
                 {
                     await writer.WriteAsync(WorksheetXml.StartRow(yIndex));
                     var xIndex = 1;
@@ -291,11 +291,11 @@ private async Task GenerateSheetByIMiniExcelDataReaderAsync(MiniExcelAsyncStream
                         if (_configuration.DynamicColumnFirst)
                         {
                             var columnIndex = reader.GetOrdinal(props[i].Key.ToString());
-                            cellValue = await reader.GetValueAsync(columnIndex);
+                            cellValue = await reader.GetValueAsync(columnIndex, cancellationToken);
                         }
                         else
                         {
-                            cellValue = await reader.GetValueAsync(i);
+                            cellValue = await reader.GetValueAsync(i, cancellationToken);
                         }
 
                         await WriteCellAsync(writer, yIndex, xIndex, cellValue, props[i], widths);