Skip to content
Open
Changes from all commits
Commits
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
18 changes: 16 additions & 2 deletions FastExcel/Worksheet.cs
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public class Worksheet
/// </summary>
public int ExistingHeadingRows { get; set; }
private int? InsertAfterIndex { get; set; }

/// <summary>
/// Template
/// </summary>
Expand Down Expand Up @@ -71,6 +71,7 @@ internal static string GetFileName(int index)

private const string DEFAULT_HEADERS = "<?xml version=\"1.0\" encoding=\"UTF-8\" ?><worksheet xmlns=\"http://schemas.openxmlformats.org/spreadsheetml/2006/main\"><sheetData>";
private const string DEFAULT_FOOTERS = "</sheetData></worksheet>";
private const string SINGLE_SHEET = "worksheets/sheet.xml";

/// <summary>
/// Constructor
Expand Down Expand Up @@ -355,7 +356,8 @@ public void Read(int existingHeadingRows = 0)
IEnumerable<Row> rows = null;

var headings = new List<string>();
using (Stream stream = FastExcel.Archive.GetEntry(FileName).Open())
string filename = DecideFilename();
using (Stream stream = FastExcel.Archive.GetEntry(filename).Open())
{
var document = XDocument.Load(stream);
int skipRows = 0;
Expand All @@ -379,6 +381,18 @@ public void Read(int existingHeadingRows = 0)
Rows = rows;
}

/// <summary>
/// Check if single sheet exists, and use that name accordingly.
/// </summary>
/// <returns>Filename</returns>
private string DecideFilename()
{
var filename = FastExcel.Archive.Entries.FirstOrDefault(x => x.FullName.Contains(SINGLE_SHEET))?.FullName;
if (filename == null)
filename = FileName;
return filename;
}

/// <summary>
/// Returns cells using provided range
/// </summary>
Expand Down