-
Notifications
You must be signed in to change notification settings - Fork 236
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.
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
Replace Tabular with EPPlus and CsvHelper #672
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| using System.Collections.Generic; | ||
| using System.IO; | ||
| using CsvHelper; | ||
| using CsvHelper.Configuration; | ||
|
|
||
| namespace Wyam.Tables | ||
| { | ||
| internal static class CsvFile | ||
| { | ||
| public static IEnumerable<IEnumerable<string>> GetAllRecords(Stream stream, string delimiter = null) | ||
| { | ||
| using (var reader = new StreamReader(stream)) | ||
| { | ||
| return GetAllRecords(reader, delimiter); | ||
| } | ||
| } | ||
|
|
||
| public static IEnumerable<IEnumerable<string>> GetAllRecords(TextReader reader, string delimiter = null) | ||
| { | ||
| List<IEnumerable<string>> records = new List<IEnumerable<string>>(); | ||
| var configuration = delimiter == null ? new Configuration { HasHeaderRecord = false } : new Configuration { HasHeaderRecord = false, Delimiter = delimiter }; | ||
|
|
||
| using (var csv = new CsvReader(reader, configuration)) | ||
| { | ||
| while (csv.Read()) | ||
| { | ||
| var currentRecord = csv.Context.Record; | ||
| records.Add(currentRecord); | ||
| } | ||
| } | ||
|
|
||
| return records; | ||
| } | ||
|
|
||
| public static void WriteAllRecords(IEnumerable<IEnumerable<string>> records, Stream stream) | ||
| { | ||
| var writer = new StreamWriter(stream); | ||
| WriteAllRecords(records, writer); | ||
| writer.Flush(); | ||
| } | ||
|
|
||
| public static void WriteAllRecords(IEnumerable<IEnumerable<string>> records, TextWriter writer) | ||
| { | ||
| if (records == null) | ||
| { | ||
| return; | ||
| } | ||
|
|
||
| var csv = new CsvWriter(writer, new Configuration { QuoteAllFields = true }); | ||
| { | ||
| foreach (var row in records) | ||
| { | ||
| foreach (var cell in row) | ||
| { | ||
| csv.WriteField(cell ?? string.Empty); | ||
| } | ||
| csv.NextRecord(); | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| using System.Collections.Generic; | ||
| using System.IO; | ||
| using System.Linq; | ||
| using OfficeOpenXml; | ||
|
|
||
| namespace Wyam.Tables | ||
| { | ||
| internal static class ExcelFile | ||
| { | ||
| public static IEnumerable<IEnumerable<string>> GetAllRecords(Stream stream, int sheetNumber = 0) | ||
| { | ||
| using (var excel = new ExcelPackage(stream)) | ||
| { | ||
| excel.Compatibility.IsWorksheets1Based = false; | ||
| if (sheetNumber > excel.Workbook.Worksheets.Count) | ||
| { | ||
| return null; | ||
| } | ||
|
|
||
| var sheet = excel.Workbook.Worksheets[sheetNumber]; | ||
|
|
||
| return GetAllRecords(sheet); | ||
| } | ||
| } | ||
|
|
||
| public static IEnumerable<IEnumerable<string>> GetAllRecords(ExcelWorksheet sheet) | ||
| { | ||
| var dimension = sheet.Dimension; | ||
|
|
||
| if (dimension == null) | ||
| { | ||
| return null; | ||
| } | ||
|
|
||
| var rowList = new List<List<string>>(); | ||
| int rowCount = dimension.Rows; | ||
| int columnCount = dimension.Columns; | ||
|
|
||
| for (var r = 1; r <= rowCount; r++) | ||
| { | ||
| var rowValues = new List<string>(columnCount); | ||
| for (var c = 1; c <= columnCount; c++) | ||
| { | ||
| var cell = sheet.Cells[r, c].FirstOrDefault(); | ||
| rowValues.Add(cell?.Value?.ToString()); | ||
| } | ||
|
|
||
| rowList.Add(rowValues); | ||
| } | ||
|
|
||
| return rowList; | ||
| } | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looked through the EPPlus source and it doesn't look like
ExcelPackagecloses external streams. That means we need to make sure the input document stream gets disposed from the call site (IDocument.GetStream()requires the stream be closed as soon as possible since it locks some resources). I'll fix it up, just FYI.