aboutsummaryrefslogtreecommitdiff
path: root/lib/docx-reader.js
diff options
context:
space:
mode:
authorMichael Williamson <mike@zwobble.org>2014-01-06 22:10:58 +0000
committerMichael Williamson <mike@zwobble.org>2014-01-06 22:10:58 +0000
commit06a8f7548e480b3f46e979c52629601b611b5b78 (patch)
tree088492793cb6c6b53f75a0e7a3c77c86e95f5d54 /lib/docx-reader.js
parentee556262e602d2903c5b8d92193295a42291f09d (diff)
Move zip reading into unzip.js
Diffstat (limited to 'lib/docx-reader.js')
-rw-r--r--lib/docx-reader.js12
1 files changed, 1 insertions, 11 deletions
diff --git a/lib/docx-reader.js b/lib/docx-reader.js
index 2215b35..e21f847 100644
--- a/lib/docx-reader.js
+++ b/lib/docx-reader.js
@@ -3,7 +3,6 @@ exports.read = read;
var q = require("q");
var unzip = require("./unzip");
var path = require("path");
-var fs = require("fs");
var readXmlFromZipFile = require("./office-xml-reader").readXmlFromZipFile;
var documents = require("./documents");
@@ -15,16 +14,7 @@ var Result = require("./results").Result;
function read(options) {
- var docxFile;
- if (options.path) {
- docxFile = unzip.unzipStream(fs.createReadStream(options.path));
- } else if (options.file) {
- docxFile = options.file;
- } else if (options.uint8Array) {
- docxFile = unzip.unzipUint8Array(options.uint8Array);
- } else {
- return q.reject(new Error("Could not find file in options"));
- }
+ var docxFile = unzip.openZip(options);
return q.when(docxFile, function(docxFile) {
return q.all([
readRelationshipsFromZipFile(docxFile),