Skip to content

Changed how cells in a record is selected #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
chris-rp wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Changed how cells in a record is selected #40

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions src/CsvHelper.Excel/ExcelParser.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ public class ExcelParser : IParser
private int _rawRow = 1;
private string[] _currentRecord;
private readonly int _lastRow;
private readonly int _firstColumn;
private readonly int _lastColumn;

/// <summary>
/// Initializes a new instance of the <see cref="ExcelParser"/> class.
Expand Down Expand Up @@ -118,8 +120,9 @@ public ExcelParser(Stream stream, string sheetName, CsvConfiguration configurati
_lastRow = lastRowUsed.RowNumber();

var cellsUsed = _worksheet.CellsUsed();
Count = cellsUsed.Max(c => c.Address.ColumnNumber) -
cellsUsed.Min(c => c.Address.ColumnNumber) + 1;
_firstColumn = cellsUsed.Min(c => c.Address.ColumnNumber);
_lastColumn = cellsUsed.Max(c => c.Address.ColumnNumber);
Count = _lastColumn - _firstColumn + 1;
}

Context = new CsvContext(this);
Expand Down Expand Up @@ -204,7 +207,7 @@ public Task<bool> ReadAsync()
private string[] GetRecord()
{
var currentRow = _worksheet.Row(Row);
var cells = currentRow.Cells(1, Count);
var cells = currentRow.Cells(_firstColumn, _lastColumn);
var values = Configuration.TrimOptions.HasFlag(TrimOptions.Trim)
? cells.Select(x => x.Value.ToString()?.Trim()).ToArray()
: cells.Select(x => x.Value.ToString()).ToArray();
Expand Down