Tidying 'Remove EXIF'

gchq · Jun 8, 2017 · 369d213 · 369d213
1 parent e92775e
commit 369d213
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/src/core/config/Categories.js b/src/core/config/Categories.js
@@ -210,7 +210,6 @@ const Categories = [
             "XPath expression",
             "CSS selector",
             "Extract EXIF",
-            "Remove EXIF",
         ]
     },
     {
@@ -289,6 +288,8 @@ const Categories = [
             "Scan for Embedded Files",
             "Generate UUID",
             "Render Image",
+            "Remove EXIF",
+            "Extract EXIF",
             "Numberwang",
         ]
     },

diff --git a/src/core/config/OperationConfig.js b/src/core/config/OperationConfig.js
@@ -3370,7 +3370,7 @@ const OperationConfig = {
             "<br><br>",
             "EXIF data from photos usually contains information about the image file itself as well as the device used to create it.",
         ].join("\n"),
-        run: Image.runEXIF,
+        run: Image.runExtractEXIF,
         inputType: "byteArray",
         outputType: "string",
         args: [],
@@ -3392,11 +3392,9 @@ const OperationConfig = {
         description: [
             "Removes EXIF data from a JPEG image.",
             "<br><br>",
-            "EXIF data is metadata embedded in JPEGs.",
-            "<br><br>",
-            "EXIF data from photos usually contains information about the image file itself as well as the device used to create it.",
+            "EXIF data embedded in photos usually contains information about the image file itself as well as the device used to create it.",
         ].join("\n"),
-        run: Image.removeEXIF,
+        run: Image.runRemoveEXIF,
         inputType: "byteArray",
         outputType: "byteArray",
         args: [],

diff --git a/src/core/operations/Image.js b/src/core/operations/Image.js
@@ -24,7 +24,7 @@ const Image = {
      * @param {Object[]} args
      * @returns {string}
      */
-    runEXIF(input, args) {
+    runExtractEXIF(input, args) {
         try {
             const bytes = Uint8Array.from(input);
             const parser = ExifParser.create(bytes.buffer);
@@ -44,6 +44,7 @@ const Image = {
         }
     },
 
+
     /**
      * Remove EXIF operation.
      *
@@ -54,7 +55,7 @@ const Image = {
      * @param {Object[]} args
      * @returns {string}
      */
-    removeEXIF(input, args) {
+    runRemoveEXIF(input, args) {
         // Do nothing if input is empty
         if (input.length === 0) return input;
 
@@ -67,6 +68,7 @@ const Image = {
         }
     },
 
+
     /**
      * @constant
      * @default