Open zip file before passing to readers

2 files changed, 13 insertions, 29 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) {
diff --git a/lib/docx/style-map.js b/lib/docx/style-map.js
index dcc9f66..5020a87 100644
--- a/lib/docx/style-map.js
+++ b/lib/docx/style-map.js
@@ -1,5 +1,4 @@
 var promises = require("../promises");
-var unzip = require("../unzip");
 
 exports.writeStyleMap = writeStyleMap;
 exports.readStyleMap = readStyleMap;
@@ -7,25 +6,14 @@ exports.readStyleMap = readStyleMap;
 
 var styleMapPath = "mammoth/style-map";
 
-function writeStyleMap(options) {
-    return promises.when(unzip.openZip(options))
-        .then(function(zipFile) {
-            
-            zipFile.write(styleMapPath, options.styleMap);
-            
-            return {
-                toBuffer: zipFile.toBuffer
-            };
-        });
+function writeStyleMap(docxFile, styleMap) {
+    docxFile.write(styleMapPath, styleMap);
 }
 
-function readStyleMap(options) {
-    return promises.when(unzip.openZip(options))
-        .then(function(zipFile) {
-            if (zipFile.exists(styleMapPath)) {
-                return zipFile.read(styleMapPath, "utf8");
-            } else {
-                return promises.when(null);
-            }
-        });
+function readStyleMap(docxFile) {
+    if (docxFile.exists(styleMapPath)) {
+        return docxFile.read(styleMapPath, "utf8");
+    } else {
+        return promises.resolve(null);
+    }
 }