Skip to content

Fix some xlsx stream read xlsx not in guaranteed order problem #578

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
guyonroche merged 3 commits into from
Nov 7, 2018
Merged

Fix some xlsx stream read xlsx not in guaranteed order problem #578

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2b8ace1
Fix some xlsx stream read get sharedstring index problem
May 30, 2018
7f18928
read xml in guaranteed order
May 30, 2018
286836b
fix
May 30, 2018
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
Next Next commit
Fix some xlsx stream read get sharedstring index problem
  • Loading branch information
methodchen committed May 30, 2018
commit 2b8ace189ae52e4aaf3ab58f64dca92b8b75248f
55 changes: 50 additions & 5 deletions lib/stream/xlsx/workbook-reader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ var WorkbookPropertiesManager = require('../../xlsx/xform/book/workbook-properti
var WorksheetReader = require('./worksheet-reader');
var HyperlinkReader = require('./hyperlink-reader');

var Temp = require('temp');

var WorkbookReader = module.exports = function(options) {
this.options = options = options || {};

Expand All @@ -40,6 +42,9 @@ var WorkbookReader = module.exports = function(options) {

// end of stream check
this.atEnd = false;

Temp.track();
this.waitingWorkSheets = [];
};

utils.inherits(WorkbookReader, events.EventEmitter, {
Expand Down Expand Up @@ -91,7 +96,13 @@ utils.inherits(WorkbookReader, events.EventEmitter, {
if (entry.path.match(/xl\/worksheets\/sheet\d+[.]xml/)) {
match = entry.path.match(/xl\/worksheets\/sheet(\d+)[.]xml/);
sheetNo = match[1];
this._parseWorksheet(entry, sheetNo, options);
if (this.sharedStrings) {
this._parseWorksheet(entry, sheetNo, options);
} else {
var stream = Temp.createWriteStream();
this.waitingWorkSheets.push({sheetNo: sheetNo, options: options, path: stream.path});
entry.pipe(stream);
}
} else if (entry.path.match(/xl\/worksheets\/_rels\/sheet\d+[.]xml.rels/)) {
match = entry.path.match(/xl\/worksheets\/_rels\/sheet(\d+)[.]xml.rels/);
sheetNo = match[1];
Expand All @@ -104,11 +115,44 @@ utils.inherits(WorkbookReader, events.EventEmitter, {
});

zip.on('close', () => {
this.emit('end');
this.atEnd = true;
if (!this.readers) {
this.emit('finished');
if (this.waitingWorkSheets.length) {
var currentBook = 0;

var processBooks = function () {
var worksheetInfo = this.waitingWorkSheets[currentBook];
var entry = fs.createReadStream(worksheetInfo.path);

var sheetNo = worksheetInfo.sheetNo;
var options = worksheetInfo.options;
var worksheet = this._parseWorksheet(entry, sheetNo, options);

worksheet.on('finished', function (node) {
++currentBook;
if (currentBook == this.waitingWorkSheets.length) {
Temp.cleanupSync();
// setImmediate(this.emit.bind(this), 'finished');

this.emit('end');
this.atEnd = true;
if (!this.readers) {
this.emit('finished');
}
} else {
setImmediate(processBooks);
}
})
setImmediate(this.emit.bind(this),'worksheet',worksheet);
}
setImmediate(processBooks);
} else {
this.emit('end');
this.atEnd = true;
if (!this.readers) {
this.emit('finished');
}
}


});

zip.on('error', err => {
Expand Down Expand Up @@ -204,6 +248,7 @@ utils.inherits(WorkbookReader, events.EventEmitter, {
this.emit('worksheet', worksheetReader);
}
worksheetReader.read(entry, options, this.hyperlinkReaders[sheetNo]);
return worksheetReader;
},
_parseHyperlinks: function(entry, sheetNo, options) {
this._emitEntry(options, {type: 'hyerlinks', id: sheetNo});
Expand Down
3 changes: 2 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,8 @@
"moment": ">=2.19.3",
"node-unzip-2": "^0.2.7",
"promish": ">=5.0.2",
"sax": "^1.2.2"
"sax": "^1.2.2",
"temp": "0.8.3"
},
"devDependencies": {
"@types/node": "*",
Expand Down