1 files changed, 39 insertions, 32 deletions

diff --git a/lib/utils/images.js b/lib/utils/images.js
index a82b0a1..e387d6b 100644
--- a/lib/utils/images.js
+++ b/lib/utils/images.js
@@ -1,37 +1,44 @@
-var _ = require("lodash");
-var Q = require("q");
-var fs = require("./fs");
-var spawn = require("spawn-cmd").spawn;
-
-// Convert a svg file
-var convertSVG = function(source, dest, options) {
-    if (!fs.existsSync(source)) return Q.reject(new Error("File doesn't exist: "+source));
-    var d = Q.defer();
-
-    options = _.defaults(options || {}, {
-
-    });
-
-    //var command = shellescape(["svgexport", source, dest]);
-    var child = spawn("svgexport", [source, dest]);
+var Promise = require('./promise');
+var command = require('./command');
+var fs = require('./fs');
+var error = require('./error');
+
+// Convert a svg file to a pmg
+function convertSVGToPNG(source, dest, options) {
+    if (!fs.existsSync(source)) return Promise.reject(new error.FileNotFoundError({ filename: source }));
+
+    return command.spawn('svgexport', [source, dest])
+    .fail(function(err) {
+        if (err.code == 'ENOENT') {
+            err = error.RequireInstallError({
+                cmd: 'svgexport',
+                install: 'Install it using: "npm install svgexport -g"'
+            });
+        }
+        throw err;
+    })
+    .then(function() {
+        if (fs.existsSync(dest)) return;
 
-    child.on("error", function(error) {
-        if (error.code == "ENOENT") error = new Error("Need to install \"svgexport\" using \"npm install svgexport -g\"");
-        return d.reject(error);
+        throw new Error('Error converting '+source+' into '+dest);
     });
-
-    child.on("close", function(code) {
-        if (code === 0 && fs.existsSync(dest)) {
-            d.resolve();
-        } else {
-            d.reject(new Error("Error converting "+source+" into "+dest));
-        }
+}
+
+// Convert a svg buffer to a png file
+function convertSVGBufferToPNG(buf, dest) {
+    // Create a temporary SVG file to convert
+    return fs.tmpFile({
+        postfix: '.svg'
+    })
+    .then(function(tmpSvg) {
+        return fs.writeFile(tmpSvg, buf)
+        .then(function() {
+            return convertSVGToPNG(tmpSvg, dest);
+        });
     });
-
-    return d.promise;
-};
+}
 
 module.exports = {
-    convertSVG: convertSVG,
-    INVALID: [".svg"]
-};
+    convertSVGToPNG: convertSVGToPNG,
+    convertSVGBufferToPNG: convertSVGBufferToPNG
+};
\ No newline at end of file