From 26f7cefe6379e9b76f5bb1963433a6832a55caa6 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Sat, 30 Mar 2013 22:01:09 +0000 Subject: Allow path to be passed into convertToHtml --- lib/web.js | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) (limited to 'lib/web.js') diff --git a/lib/web.js b/lib/web.js index 73e501d..1d10693 100644 --- a/lib/web.js +++ b/lib/web.js @@ -4,7 +4,6 @@ var url = require("url"); var fs = require("fs"); var q = require("q"); var mammoth = require("./"); -var ZipFile = require("zipfile").ZipFile; function startServer(options) { var app = connect() @@ -49,18 +48,8 @@ function handleConvert(request, response, next) { var converter = new mammoth.Converter(mammoth.standardOptions); var uploadedDocument = request.files.document; var documentPath = uploadedDocument.path - // TODO: remove duplication from index.js - var zipFile = new ZipFile(documentPath); - var docxFile = { - read: function(path) { - return q.ninvoke(zipFile, "readFile", path, "utf-8") - .then(function(value) { - return value.toString(); - }); - } - }; - converter.convertToHtml(docxFile) + converter.convertToHtml(documentPath) .then(function(result) { request.template = { name: "convert.html", -- cgit v1.2.3