From 4a7ea469d483e906bd032fd272e9047f52d3b207 Mon Sep 17 00:00:00 2001
From: j433866 <j433866@gmail.com>
Date: Thu, 7 Mar 2019 10:03:09 +0000
Subject: [PATCH] Add status messages for image operations

---
 src/core/operations/CropImage.mjs               |  2 ++
 src/core/operations/DitherImage.mjs             |  2 ++
 src/core/operations/FlipImage.mjs               |  2 ++
 src/core/operations/ImageBrightnessContrast.mjs | 12 ++++++++++--
 src/core/operations/ImageFilter.mjs             |  3 ++-
 src/core/operations/ImageOpacity.mjs            |  2 ++
 src/core/operations/InvertImage.mjs             |  2 ++
 src/core/operations/RotateImage.mjs             |  2 ++
 8 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/src/core/operations/CropImage.mjs b/src/core/operations/CropImage.mjs
index 9ccc5ec5..e29db631 100644
--- a/src/core/operations/CropImage.mjs
+++ b/src/core/operations/CropImage.mjs
@@ -99,6 +99,8 @@ class CropImage extends Operation {
         }
 
         const image = await jimp.read(Buffer.from(input));
+        if (ENVIRONMENT_IS_WORKER())
+            self.sendStatusMessage("Cropping image...");
         if (autocrop) {
             image.autocrop({
                 tolerance: (autoTolerance / 100),
diff --git a/src/core/operations/DitherImage.mjs b/src/core/operations/DitherImage.mjs
index 2cc9ac2d..e6856d4a 100644
--- a/src/core/operations/DitherImage.mjs
+++ b/src/core/operations/DitherImage.mjs
@@ -41,6 +41,8 @@ class DitherImage extends Operation {
 
         if (type && type.mime.indexOf("image") === 0){
             const image = await jimp.read(Buffer.from(input));
+            if (ENVIRONMENT_IS_WORKER())
+                self.sendStatusMessage("Applying dither to image...");
             image.dither565();
             const imageBuffer = await image.getBufferAsync(jimp.AUTO);
             return [...imageBuffer];
diff --git a/src/core/operations/FlipImage.mjs b/src/core/operations/FlipImage.mjs
index fa3054e2..3185df9f 100644
--- a/src/core/operations/FlipImage.mjs
+++ b/src/core/operations/FlipImage.mjs
@@ -51,6 +51,8 @@ class FlipImage extends Operation {
 
         const image = await jimp.read(Buffer.from(input));
 
+        if (ENVIRONMENT_IS_WORKER())
+            self.sendStatusMessage("Flipping image...");
         switch (flipAxis){
             case "Horizontal":
                 image.flip(true, false);
diff --git a/src/core/operations/ImageBrightnessContrast.mjs b/src/core/operations/ImageBrightnessContrast.mjs
index 51c61c70..7d8eca4f 100644
--- a/src/core/operations/ImageBrightnessContrast.mjs
+++ b/src/core/operations/ImageBrightnessContrast.mjs
@@ -59,8 +59,16 @@ class ImageBrightnessContrast extends Operation {
         }
 
         const image = await jimp.read(Buffer.from(input));
-        image.brightness(brightness / 100);
-        image.contrast(contrast / 100);
+        if (brightness !== 0) {
+            if (ENVIRONMENT_IS_WORKER())
+                self.sendStatusMessage("Changing image brightness...");
+            image.brightness(brightness / 100);
+        }
+        if (contrast !== 0) {
+            if (ENVIRONMENT_IS_WORKER())
+                self.sendStatusMessage("Changing image contrast...");
+            image.contrast(contrast / 100);
+        }
 
         const imageBuffer = await image.getBufferAsync(jimp.AUTO);
         return [...imageBuffer];
diff --git a/src/core/operations/ImageFilter.mjs b/src/core/operations/ImageFilter.mjs
index 370f5e6f..b756b9f2 100644
--- a/src/core/operations/ImageFilter.mjs
+++ b/src/core/operations/ImageFilter.mjs
@@ -53,7 +53,8 @@ class ImageFilter extends Operation {
         }
 
         const image = await jimp.read(Buffer.from(input));
-
+        if (ENVIRONMENT_IS_WORKER())
+            self.sendStatusMessage("Applying " + filterType.toLowerCase() + " filter to image...");
         if (filterType === "Greyscale") {
             image.greyscale();
         } else {
diff --git a/src/core/operations/ImageOpacity.mjs b/src/core/operations/ImageOpacity.mjs
index 11a364b8..090a8975 100644
--- a/src/core/operations/ImageOpacity.mjs
+++ b/src/core/operations/ImageOpacity.mjs
@@ -52,6 +52,8 @@ class ImageOpacity extends Operation {
         }
 
         const image = await jimp.read(Buffer.from(input));
+        if (ENVIRONMENT_IS_WORKER())
+            self.sendStatusMessage("Changing image opacity...");
         image.opacity(opacity / 100);
 
         const imageBuffer = await image.getBufferAsync(jimp.MIME_PNG);
diff --git a/src/core/operations/InvertImage.mjs b/src/core/operations/InvertImage.mjs
index 87da0156..99de9f0f 100644
--- a/src/core/operations/InvertImage.mjs
+++ b/src/core/operations/InvertImage.mjs
@@ -42,6 +42,8 @@ class InvertImage extends Operation {
             throw new OperationError("Invalid input file format.");
         }
         const image = await jimp.read(Buffer.from(input));
+        if (ENVIRONMENT_IS_WORKER())
+            self.sendStatusMessage("Inverting image...");
         image.invert();
         const imageBuffer = await image.getBufferAsync(jimp.AUTO);
         return [...imageBuffer];
diff --git a/src/core/operations/RotateImage.mjs b/src/core/operations/RotateImage.mjs
index bbeea5c5..76947037 100644
--- a/src/core/operations/RotateImage.mjs
+++ b/src/core/operations/RotateImage.mjs
@@ -48,6 +48,8 @@ class RotateImage extends Operation {
 
         if (type && type.mime.indexOf("image") === 0){
             const image = await jimp.read(Buffer.from(input));
+            if (ENVIRONMENT_IS_WORKER())
+                self.sendStatusMessage("Rotating image...");
             image.rotate(degrees);
             const imageBuffer = await image.getBufferAsync(jimp.AUTO);
             return [...imageBuffer];