Skip to content

Fixes enum behaviour and adds support for DescriptionAttribute when saving by template #785

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

Merged
michelebastione merged 3 commits into from
May 18, 2025
Merged

Fixes enum behaviour and adds support for DescriptionAttribute when saving by template #785

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ac71d40
Fixed issue 527
michelebastione May 17, 2025
b99cd28
Moved redundant object initialization for new value from OpenXmlSheet…
michelebastione May 17, 2025
9162f51
Minor refactoring and code cleanup
michelebastione May 17, 2025
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
Binary file added samples/xlsx/Issue527Template.xlsx
View file
Open in desktop
Binary file not shown.
196 changes: 98 additions & 98 deletions src/MiniExcel/Csv/CsvReader.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,108 +7,108 @@
using System.Text.RegularExpressions;
using System.Threading;
using System.Threading.Tasks;
using MiniExcelLibs.Exceptions;

namespace MiniExcelLibs.Csv
{
internal class CsvReader : IExcelReader
{
private Stream _stream;
private CsvConfiguration _config;

public CsvReader(Stream stream, IConfiguration configuration)
{
this._stream = stream;
this._config = configuration == null ? CsvConfiguration.DefaultConfiguration : (CsvConfiguration)configuration;
_stream = stream;
_config = configuration == null ? CsvConfiguration.DefaultConfiguration : (CsvConfiguration)configuration;
}
public IEnumerable<IDictionary<string, object>> Query(bool useHeaderRow, string sheetName, string startCell)
{
if (startCell != "A1")
throw new NotImplementedException("CSV not Implement startCell");
throw new NotImplementedException("CSV does not implement parameter startCell");

if (_stream.CanSeek)
_stream.Position = 0;

var reader = _config.StreamReaderFunc(_stream);
var firstRow = true;
var headRows = new Dictionary<int, string>();

string row;
for (var rowIndex = 1; (row = reader.ReadLine()) != null; rowIndex++)
{
string[] read;
var firstRow = true;
Dictionary<int, string> headRows = new Dictionary<int, string>();
string row;
for (var rowIndex = 1; (row = reader.ReadLine()) != null; rowIndex++)
string finalRow = row;
if (_config.ReadLineBreaksWithinQuotes)
{

string finalRow = row;
if (_config.ReadLineBreaksWithinQuotes)
while (finalRow.Count(c => c == '"') % 2 != 0)
{
while (finalRow.Count(c => c == '"') % 2 != 0)
var nextPart = reader.ReadLine();
if (nextPart == null)
{
var nextPart = reader.ReadLine();
if (nextPart == null)
{
break;
}
finalRow = string.Concat(finalRow, _config.NewLine, nextPart);
break;
}
finalRow = string.Concat(finalRow, _config.NewLine, nextPart);
}
read = Split(finalRow);
}
var read = Split(finalRow);

// invalid row check
if (read.Length < headRows.Count)
{
var colIndex = read.Length;
var headers = headRows.ToDictionary(x => x.Value, x => x.Key);
var rowValues = read.Select((x, i) => new { Key = headRows[i], Value = x }).ToDictionary(x => x.Key, x => (object)x.Value);
throw new Exceptions.ExcelColumnNotFoundException(null,
headRows[colIndex], null, rowIndex, headers, rowValues, $"Csv read error, Column: {colIndex} not found in Row: {rowIndex}");
}
// invalid row check
if (read.Length < headRows.Count)
{
var colIndex = read.Length;
var headers = headRows.ToDictionary(x => x.Value, x => x.Key);
var rowValues = read
.Select((x, i) => new KeyValuePair<string, object>(headRows[i], x))
.ToDictionary(x => x.Key, x => x.Value);

throw new ExcelColumnNotFoundException(columnIndex: null, headRows[colIndex], null, rowIndex, headers, rowValues, $"Csv read error: Column {colIndex} not found in Row {rowIndex}");
}

//header
if (useHeaderRow)
//header
if (useHeaderRow)
{
if (firstRow)
{
if (firstRow)
{
firstRow = false;
for (int i = 0; i <= read.Length - 1; i++)
headRows.Add(i, read[i]);
continue;
}

var cell = CustomPropertyHelper.GetEmptyExpandoObject(headRows);
firstRow = false;
for (int i = 0; i <= read.Length - 1; i++)
cell[headRows[i]] = read[i];

yield return cell;
headRows.Add(i, read[i]);
continue;
}

var headCell = CustomPropertyHelper.GetEmptyExpandoObject(headRows);
for (int i = 0; i <= read.Length - 1; i++)
headCell[headRows[i]] = read[i];

//body
{
// record first row as reference
if (firstRow)
{
firstRow = false;
for (int i = 0; i <= read.Length - 1; i++)
headRows.Add(i, $"c{i + 1}");
}
yield return headCell;
continue;
}

var cell = CustomPropertyHelper.GetEmptyExpandoObject(read.Length - 1, 0);
if (_config.ReadEmptyStringAsNull)
{
for (int i = 0; i <= read.Length - 1; i++)
cell[ColumnHelper.GetAlphabetColumnName(i)] = read[i]?.Length == 0 ? null : read[i];
}
else
{
for (int i = 0; i <= read.Length - 1; i++)
cell[ColumnHelper.GetAlphabetColumnName(i)] = read[i];
}
//body
if (firstRow) // record first row as reference
{
firstRow = false;
for (int i = 0; i <= read.Length - 1; i++)
headRows.Add(i, $"c{i + 1}");
}

yield return cell;
}
var cell = CustomPropertyHelper.GetEmptyExpandoObject(read.Length - 1, 0);
if (_config.ReadEmptyStringAsNull)
{
for (int i = 0; i <= read.Length - 1; i++)
cell[ColumnHelper.GetAlphabetColumnName(i)] = read[i]?.Length == 0 ? null : read[i];
}
else
{
for (int i = 0; i <= read.Length - 1; i++)
cell[ColumnHelper.GetAlphabetColumnName(i)] = read[i];
}

yield return cell;
}
}
public IEnumerable<T> Query<T>(string sheetName, string startCell, bool hasHeader) where T : class, new()
{
return ExcelOpenXmlSheetReader.QueryImpl<T>(Query(false, sheetName, startCell), startCell, hasHeader, _config);
var dynamicRecords = Query(false, sheetName, startCell);
return ExcelOpenXmlSheetReader.QueryImpl<T>(dynamicRecords, startCell, hasHeader, _config);
}

private string[] Split(string row)
Expand All @@ -119,9 +119,10 @@ private string[] Split(string 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
return Regex.Split(row, $"[\t{_config.Seperator}](?=(?:[^\"]|\"[^\"]*\")*$)")
.Select(s => Regex.Replace(s.Replace("\"\"", "\""), "^\"|\"$", ""))
.ToArray();
}
}

Expand All @@ -143,56 +144,55 @@ public void Dispose()
public IEnumerable<IDictionary<string, object>> QueryRange(bool useHeaderRow, string sheetName, string startCell, string endCell)
{
if (startCell != "A1")
throw new NotImplementedException("CSV not Implement startCell");
throw new NotImplementedException("CSV does not implement parameter startCell");

if (_stream.CanSeek)
_stream.Position = 0;

var reader = _config.StreamReaderFunc(_stream);

string row;
var firstRow = true;
var headRows = new Dictionary<int, string>();

while ((row = reader.ReadLine()) != null)
{
var row = string.Empty;
string[] read;
var firstRow = true;
Dictionary<int, string> headRows = new Dictionary<int, string>();
while ((row = reader.ReadLine()) != null)
{
read = Split(row);
var read = Split(row);

//header
if (useHeaderRow)
//header
if (useHeaderRow)
{
if (firstRow)
{
if (firstRow)
{
firstRow = false;
for (int i = 0; i <= read.Length - 1; i++)
headRows.Add(i, read[i]);
continue;
}

var cell = CustomPropertyHelper.GetEmptyExpandoObject(headRows);
firstRow = false;
for (int i = 0; i <= read.Length - 1; i++)
cell[headRows[i]] = read[i];

yield return cell;
headRows.Add(i, read[i]);
continue;
}

var headCell = CustomPropertyHelper.GetEmptyExpandoObject(headRows);
for (int i = 0; i <= read.Length - 1; i++)
headCell[headRows[i]] = read[i];

//body
{
var cell = CustomPropertyHelper.GetEmptyExpandoObject(read.Length - 1, 0);
for (int i = 0; i <= read.Length - 1; i++)
cell[ColumnHelper.GetAlphabetColumnName(i)] = read[i];
yield return cell;
}
yield return headCell;
continue;
}

//body
var cell = CustomPropertyHelper.GetEmptyExpandoObject(read.Length - 1, 0);
for (int i = 0; i <= read.Length - 1; i++)
cell[ColumnHelper.GetAlphabetColumnName(i)] = read[i];

yield return cell;
}
}
public IEnumerable<T> QueryRange<T>(string sheetName, string startCell, string endCel) where T : class, new()
{
return ExcelOpenXmlSheetReader.QueryImplRange<T>(QueryRange(false, sheetName, startCell, endCel), startCell, endCel, this._config);
}
public Task<IEnumerable<IDictionary<string, object>>> QueryAsyncRange(bool UseHeaderRow, string sheetName, string startCell, string endCel, CancellationToken cancellationToken = default)
public Task<IEnumerable<IDictionary<string, object>>> QueryAsyncRange(bool useHeaderRow, string sheetName, string startCell, string endCel, CancellationToken cancellationToken = default)
{
return Task.Run(() => QueryRange(UseHeaderRow, sheetName, startCell, endCel), cancellationToken);
return Task.Run(() => QueryRange(useHeaderRow, sheetName, startCell, endCel), cancellationToken);
}

public Task<IEnumerable<T>> QueryAsyncRange<T>(string sheetName, string startCell, string endCel, bool hasHeader, CancellationToken cancellationToken = default) where T : class, new()
Expand Down
Loading
Loading