Skip to content

Commit 1ea6c51

Browse files
michelebastionemichelebastione
committed
Added configuration to MiniExcelDataReaderBase fetching methods and fixed sample data
1 parent d9037d8 commit 1ea6c51

4 files changed

Lines changed: 27 additions & 21 deletions

File tree

‎src/MiniExcel.Core/MiniExcelDataReaderBase.cs‎

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
public abstract class MiniExcelDataReaderBase : IMiniExcelDataReader
44
{
55
protected readonly IMiniExcelReader MiniExcelReader;
6+
protected readonly MiniExcelBaseConfiguration MiniExcelConfiguration;
67

78
protected IEnumerator<IDictionary<string, object?>>? Source;
89
protected IAsyncEnumerator<IDictionary<string, object?>>? AsyncSource;
@@ -32,11 +33,12 @@ public virtual object this[string name]
3233
public bool IsClosed { get; protected set; }
3334

3435

35-
protected MiniExcelDataReaderBase(IMiniExcelReader miniExcelReader, bool hasHeaderRow, bool isAsyncSource)
36+
protected MiniExcelDataReaderBase(IMiniExcelReader miniExcelReader, bool hasHeaderRow, bool isAsyncSource, MiniExcelBaseConfiguration configuration)
3637
{
3738
MiniExcelReader = miniExcelReader;
3839
HasHeaderRow = hasHeaderRow;
3940
IsAsyncSource = isAsyncSource;
41+
MiniExcelConfiguration = configuration;
4042
}
4143

4244
public virtual bool Read()
@@ -110,47 +112,47 @@ public virtual long GetChars(int i, long fieldoffset, char[]? buffer, int buffer
110112
{
111113
bool b => b,
112114
null => throw new InvalidOperationException("The value is null"),
113-
var value => Convert.ToBoolean(value)
115+
var value => Convert.ToBoolean(value, MiniExcelConfiguration.Culture)
114116
};
115117

116118
public virtual byte GetByte(int i) => GetValue(i) is { } value
117-
? Convert.ToByte(value)
119+
? Convert.ToByte(value, MiniExcelConfiguration.Culture)
118120
: throw new InvalidOperationException("The value is null");
119121

120122
public virtual char GetChar(int i) => GetValue(i) switch
121123
{
122124
char c => c,
123125
null => throw new InvalidOperationException("The value is null"),
124-
var value => Convert.ToChar(value)
126+
var value => Convert.ToChar(value, MiniExcelConfiguration.Culture)
125127
};
126128

127129
public virtual DateTime GetDateTime(int i) => GetValue(i) switch
128130
{
129131
DateTime dt => dt,
130132
double d => DateTime.FromOADate(d),
131133
null => throw new InvalidOperationException("The value is null"),
132-
var value => Convert.ToDateTime(value)
134+
var value => Convert.ToDateTime(value, MiniExcelConfiguration.Culture)
133135
};
134136

135137
public virtual decimal GetDecimal(int i) => GetValue(i) switch
136138
{
137139
decimal d => d,
138140
null => throw new InvalidOperationException("The value is null"),
139-
var value => Convert.ToDecimal(value)
141+
var value => Convert.ToDecimal(value, MiniExcelConfiguration.Culture)
140142
};
141143

142144
public virtual float GetFloat(int i) => GetValue(i) switch
143145
{
144146
float f => f,
145147
null => throw new InvalidOperationException("The value is null"),
146-
var value => Convert.ToSingle(value)
148+
var value => Convert.ToSingle(value, MiniExcelConfiguration.Culture)
147149
};
148150

149151
public virtual double GetDouble(int i) => GetValue(i) switch
150152
{
151153
double d => d,
152154
null => throw new InvalidOperationException("The value is null"),
153-
var value => Convert.ToDouble(value)
155+
var value => Convert.ToDouble(value, MiniExcelConfiguration.Culture)
154156
};
155157

156158
public virtual Guid GetGuid(int i) => GetValue(i) switch
@@ -166,27 +168,27 @@ public virtual byte GetByte(int i) => GetValue(i) is { } value
166168
{
167169
short s => s,
168170
null => throw new InvalidOperationException("The value is null"),
169-
var value => Convert.ToInt16(value)
171+
var value => Convert.ToInt16(value, MiniExcelConfiguration.Culture)
170172
};
171173

172174
public virtual int GetInt32(int i) => GetValue(i) switch
173175
{
174176
int s => s,
175177
null => throw new InvalidOperationException("The value is null"),
176-
var value => Convert.ToInt32(value)
178+
var value => Convert.ToInt32(value, MiniExcelConfiguration.Culture)
177179
};
178180

179181
public virtual long GetInt64(int i) => GetValue(i) switch
180182
{
181183
long l => l,
182184
null => throw new InvalidOperationException("The value is null"),
183-
var value => Convert.ToInt64(value)
185+
var value => Convert.ToInt64(value ,MiniExcelConfiguration.Culture)
184186
};
185187

186188
public virtual string GetString(int i) => GetValue(i) switch
187189
{
188190
string s => s,
189-
var value => Convert.ToString(value) ?? ""
191+
var value => Convert.ToString(value, MiniExcelConfiguration.Culture) ?? ""
190192
};
191193

192194
public virtual object GetValue(int i)

‎src/MiniExcel.Csv/CsvDataReader.cs‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,21 @@ namespace MiniExcelLib.Csv;
44

55
public sealed class CsvDataReader : MiniExcelDataReaderBase
66
{
7-
private CsvDataReader(CsvReader reader, bool hasHeaderRow, bool isAsyncSource)
8-
: base(reader, hasHeaderRow, isAsyncSource)
7+
private CsvDataReader(CsvReader reader, bool hasHeaderRow, bool isAsyncSource, CsvConfiguration configuration)
8+
: base(reader, hasHeaderRow, isAsyncSource, configuration)
99
{
1010
}
1111

1212
internal static CsvDataReader Create(Stream stream, bool hasHeaderRow = false, CsvConfiguration? configuration = null, bool leaveOpen = false)
1313
{
1414
CsvReader? reader = null;
1515
CsvDataReader? dataReader = null;
16+
configuration ??= CsvConfiguration.Default;
1617

1718
try
1819
{
1920
reader = new CsvReader(stream, configuration, leaveOpen);
20-
dataReader = new CsvDataReader(reader, hasHeaderRow, isAsyncSource: false)
21+
dataReader = new CsvDataReader(reader, hasHeaderRow, isAsyncSource: false, configuration)
2122
{
2223
Source = reader.Query(hasHeaderRow, null, "A1").GetEnumerator(),
2324
};
@@ -53,11 +54,12 @@ internal static async Task<CsvDataReader> CreateAsync(Stream stream, bool hasHea
5354
{
5455
CsvReader? reader = null;
5556
CsvDataReader? dataReader = null;
57+
configuration ??= CsvConfiguration.Default;
5658

5759
try
5860
{
5961
reader = new CsvReader(stream, configuration, leaveOpen);
60-
dataReader = new CsvDataReader(reader, hasHeaderRow, isAsyncSource: true)
62+
dataReader = new CsvDataReader(reader, hasHeaderRow, isAsyncSource: true, configuration)
6163
{
6264
AsyncSource = reader.QueryAsync(hasHeaderRow, null, "A1", cancellationToken).GetAsyncEnumerator(cancellationToken)
6365
};

‎src/MiniExcel.OpenXml/OpenXmlDataReader.cs‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ public sealed class OpenXmlDataReader : MiniExcelDataReaderBase
1313
private string _startCell;
1414

1515

16-
private OpenXmlDataReader(OpenXmlReader reader, string sheetName, bool hasHeaderRow, string startCell, bool isAsyncSource, bool expectsSingleResult, string[] sheetNames)
17-
: base(reader, hasHeaderRow, isAsyncSource)
16+
private OpenXmlDataReader(OpenXmlReader reader, string sheetName, bool hasHeaderRow, string startCell, bool isAsyncSource, bool expectsSingleResult, string[] sheetNames, OpenXmlConfiguration configuration)
17+
: base(reader, hasHeaderRow, isAsyncSource, configuration)
1818
{
1919
_startCell = startCell;
2020
_expectsSingleResult = expectsSingleResult;
@@ -26,6 +26,7 @@ internal static OpenXmlDataReader Create(Stream stream, bool hasHeaderRow = fals
2626
{
2727
OpenXmlReader? reader = null;
2828
OpenXmlDataReader? dataReader = null;
29+
configuration ??= OpenXmlConfiguration.Default;
2930

3031
try
3132
{
@@ -43,7 +44,7 @@ internal static OpenXmlDataReader Create(Stream stream, bool hasHeaderRow = fals
4344
isSingleResult = true;
4445
}
4546

46-
dataReader = new OpenXmlDataReader(reader, sheetName ?? sheetNames[0], hasHeaderRow, startCell, isAsyncSource: false, isSingleResult, sheetNames)
47+
dataReader = new OpenXmlDataReader(reader, sheetName ?? sheetNames[0], hasHeaderRow, startCell, isAsyncSource: false, isSingleResult, sheetNames, configuration)
4748
{
4849
Source = reader.Query(hasHeaderRow, sheetName, startCell).GetEnumerator(),
4950
};
@@ -79,7 +80,8 @@ internal static async Task<OpenXmlDataReader> CreateAsync(Stream stream, bool ha
7980
{
8081
OpenXmlReader? reader = null;
8182
OpenXmlDataReader? dataReader = null;
82-
83+
configuration ??= OpenXmlConfiguration.Default;
84+
8385
try
8486
{
8587
reader = await OpenXmlReader.CreateAsync(stream, configuration, leaveOpen, cancellationToken).ConfigureAwait(false);
@@ -96,7 +98,7 @@ internal static async Task<OpenXmlDataReader> CreateAsync(Stream stream, bool ha
9698
isSingleResult = true;
9799
}
98100

99-
dataReader = new OpenXmlDataReader(reader, sheetName ?? sheetNames[0], hasHeaderRow, startCell, isAsyncSource: true, isSingleResult, sheetNames)
101+
dataReader = new OpenXmlDataReader(reader, sheetName ?? sheetNames[0], hasHeaderRow, startCell, isAsyncSource: true, isSingleResult, sheetNames, configuration)
100102
{
101103
AsyncSource = reader.QueryAsync(hasHeaderRow, sheetName, startCell, cancellationToken).GetAsyncEnumerator(cancellationToken),
102104
};

‎tests/data/xlsx/TestTypeMapping.xlsx‎

-70 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)