diff options
author | Samy Pessé <samypesse@gmail.com> | 2015-01-28 12:22:26 +0100 |
---|---|---|
committer | Samy Pessé <samypesse@gmail.com> | 2015-01-28 12:22:26 +0100 |
commit | ee13b4bf75b05bf4814deffdfc9609ce7fa8922a (patch) | |
tree | 1667cf9fe1da1c160a098560ff003ed5d49a8405 /lib/utils | |
parent | 924006d508f79e8d0f6db27f74bc1e59672b7be1 (diff) | |
download | gitbook-ee13b4bf75b05bf4814deffdfc9609ce7fa8922a.zip gitbook-ee13b4bf75b05bf4814deffdfc9609ce7fa8922a.tar.gz gitbook-ee13b4bf75b05bf4814deffdfc9609ce7fa8922a.tar.bz2 |
Improve error message when imagemagick is not installed
Diffstat (limited to 'lib/utils')
-rw-r--r-- | lib/utils/images.js | 9 | ||||
-rw-r--r-- | lib/utils/page.js | 3 |
2 files changed, 10 insertions, 2 deletions
diff --git a/lib/utils/images.js b/lib/utils/images.js index 5a39927..5c2db69 100644 --- a/lib/utils/images.js +++ b/lib/utils/images.js @@ -18,7 +18,14 @@ var convert = function(source, dest, options) { if (options.resize) img = img.resize(options.resize.w, options.resize.h); img.noProfile() - .write(dest, d.makeNodeResolver()); + .write(dest, function(err) { + if (!err) return d.resolve(); + + if (err.code == "ENOENT") { + err = new Error("Need to install 'ImageMagick'"); + } + d.reject(err); + }); return d.promise; }; diff --git a/lib/utils/page.js b/lib/utils/page.js index e526afb..fa333f2 100644 --- a/lib/utils/page.js +++ b/lib/utils/page.js @@ -155,8 +155,9 @@ function convertImages(images, options) { return imgUtils.convert(imgin, imgout) .then(function() { options.book.log.debug.ok(); - }, function() { + }, function(err) { options.book.log.debug.fail(); + throw err; }); }); }, Q()); |