@mfgames-writing/format 4.2.5 → 4.2.6

package/lib/image.js

@@ -123,61 +123,40 @@ function getFormatImageRequest(content, href, imagePath) {
     };
     return results;
 }
-function processImage(content, imageRequest) {
+async function processImage(content, imageRequest) {
     // Make a little noise.
-    content.logger.debug(`Processing image: ${imageRequest.imagePath}`);
+    content.logger.debug(`${content.source}: processing image: ${imageRequest.imagePath}`);
     // Start by reading in the image.
-    var promise = jimp.Jimp.read(imageRequest.imagePath);
-    promise = promise.then((image) => {
-        return image;
-    });
-    // Grayscaling the image.
-    if (imageRequest.grayscale) {
-        promise = promise.then((image) => {
-            return image.greyscale();
-        });
-    }
-    // Making the image opaque.
-    if (imageRequest.opaque) {
-        promise = promise.then((image) => {
+    try {
+        let image = await jimp.Jimp.read(imageRequest.imagePath);
+        // Grayscaling the image.
+        if (imageRequest.grayscale) {
+            content.logger.trace(`${content.source}: making image grayscale`);
+            image.greyscale();
+        }
+        // Making the image opaque.
+        if (imageRequest.opaque) {
+            content.logger.trace(`${content.source}: adding white background`);
             var width = image.bitmap.width;
             var height = image.bitmap.height;
             var color = 0xffffff;
             var background = new jimp.Jimp({ width, height, color });
-            return background.composite(image, 0, 0);
-        });
-    }
-    // Scaling images.
-    if (imageRequest.scale !== 1.0) {
-        promise = promise.then((image) => {
-            return image.scale(imageRequest.scale);
-        });
-    }
-    // After we're done processing, pull it out and return it.
-    promise = promise.then((image) => {
-        return new Promise((resolve, reject) => {
-            let buffer = image.getBuffer(imageRequest.mime, (err, buffer) => {
-                if (err)
-                    reject(err);
-                resolve(buffer);
-            });
-        });
-    });
-    promise = promise.then((buffer) => {
+            image = background.composite(image, 0, 0);
+        }
+        // Scaling images.
+        if (imageRequest?.scale && imageRequest.scale !== 1.0) {
+            content.logger.trace(`${content.source}: scaling image to ${imageRequest.scale}`);
+            image.scale(imageRequest.scale);
+        }
+        // After we're done processing, pull it out and return it.
+        content.logger.trace(`${content.source}: generating image for ${imageRequest.mime}`);
+        let buffer = await image.getBuffer(imageRequest.mime);
         imageRequest.buffer = buffer;
         return imageRequest;
-    });
-    return promise;
+    }
+    catch (exception) {
+        content.logger.error(`${content.source}: could not process image`, exception);
+        throw exception;
+    }
 }
-/*
-return jimp.read(data.buffer)
-    .then((image: any) => {
-        if (data.scale !== 1.00) {
-            image = image.scale(data.scale);
-                }
-                return image;
-            })
-            .then((image: any) => {
-                let buffer = image.getBuffer(data.mime, (err, buffer) => {
-*/
 //# sourceMappingURL=image.js.map

package/lib/image.js.map

@@ -1 +1 @@
-{"version":3,"file":"image.js","sourceRoot":"","sources":["../src/image.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"image.js","sourceRoot":"","sources":["../src/image.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mfgames-writing/format",
-  "version": "4.2.5",
+  "version": "4.2.6",
   "description": "A command-line framework for formatting books into a variety of formats and themes.",
   "keywords": [
     "ebook",