Extract common code for image conversion

1 files changed, 6 insertions, 11 deletions

diff --git a/lib/main.js b/lib/main.js
index 1cb9632..a9ca14d 100644
--- a/lib/main.js
+++ b/lib/main.js
@@ -3,7 +3,7 @@ var path = require("path");
 
 var mammoth = require("./");
 var promises = require("./promises");
-var htmlPaths = require("./html-paths");
+var images = require("./images");
 
 function main(argv) {
     var docxPath = argv["docx-path"];
@@ -20,23 +20,18 @@ function main(argv) {
             var basename = path.basename(docxPath, ".docx");
             outputPath = path.join(outputDir, basename + ".html");
             var imageIndex = 0;
-            options.convertImage = function(element, html, messages, callback) {
+            options.convertImage = images.inline(function(element) {
                 imageIndex++;
                 var extension = element.contentType.split("/")[1];
                 var filename = imageIndex + "." + extension;
                 
-                element.read().then(function(imageBuffer) {
+                return element.read().then(function(imageBuffer) {
                     var imagePath = path.join(outputDir, filename);
                     return promises.nfcall(fs.writeFile, imagePath, imageBuffer);
                 }).then(function() {
-                    var attributes = {src: filename};
-                    if (element.altText) {
-                        attributes.alt = element.altText;
-                    }
-                    html.selfClosing(htmlPaths.element("img", attributes));
-                    callback();
-                }).fail(callback);
-            };
+                    return {src: filename};
+                });
+            });
         }
         
         return mammoth.convertToHtml({path: docxPath}, options)