From 4b4ec85bc4f49e72244f7219539124b45b876d8e Mon Sep 17 00:00:00 2001
From: Michael Williamson <mike@zwobble.org>
Date: Wed, 12 Aug 2015 21:57:45 +0100
Subject: Open zip file before passing to readers

---
 lib/docx/docx-reader.js | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

(limited to 'lib/docx/docx-reader.js')

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) {
-- 
cgit v1.2.3