diff options
| author | Michael Williamson <mike@zwobble.org> | 2015-08-12 21:57:45 +0100 |
|---|---|---|
| committer | Michael Williamson <mike@zwobble.org> | 2015-08-12 21:57:45 +0100 |
| commit | 4b4ec85bc4f49e72244f7219539124b45b876d8e (patch) | |
| tree | 0aa4c2005526fa5130bccbfd26f3a9cab6f8d4cb /lib/docx/docx-reader.js | |
| parent | 5f5217a4e16f7be697b24a46cf58e47753967d95 (diff) | |
Open zip file before passing to readers
Diffstat (limited to 'lib/docx/docx-reader.js')
| -rw-r--r-- | lib/docx/docx-reader.js | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/lib/docx/docx-reader.js b/lib/docx/docx-reader.js index a976ef3..9b1ec9a 100644 --- a/lib/docx/docx-reader.js +++ b/lib/docx/docx-reader.js @@ -1,7 +1,6 @@ exports.read = read; var promises = require("../promises"); -var unzip = require("../unzip"); var documents = require("../documents"); var Result = require("../results").Result; @@ -15,15 +14,12 @@ var stylesReader = require("./styles-reader"); var notesReader = require("./notes-reader"); -function read(options) { +function read(docxFile) { return promises.props({ - docxFile: unzip.openZip(options) - }).also(function(result) { - return { - contentTypes: readContentTypesFromZipFile(result.docxFile), - numbering: readNumberingFromZipFile(result.docxFile), - styles: readStylesFromZipFile(result.docxFile) - }; + contentTypes: readContentTypesFromZipFile(docxFile), + numbering: readNumberingFromZipFile(docxFile), + styles: readStylesFromZipFile(docxFile), + docxFile: docxFile }).also(function(result) { return { footnotes: readXmlFileWithBody("footnotes", result, function(bodyReader, xml) { |
