[storage-resize-images] Fix bug where resized images sometimes get resized again.

Author: Salakar

storage-resize-images/functions/lib/index.js

@@ -48,17 +48,16 @@ exports.generateResizedImage = functions.storage.object().onFinalize((object) =>
         logs.contentTypeInvalid(contentType);
         return;
     }
+    if (object.metadata && object.metadata.resizedImage === "true") {
+        logs.imageAlreadyResized();
+        return;
+    }
     const bucket = admin.storage().bucket(object.bucket);
     const filePath = object.name; // File path in the bucket.
     const fileDir = path.dirname(filePath);
     const fileName = path.basename(filePath);
     const fileExtension = path.extname(filePath);
     const fileNameWithoutExtension = fileName.slice(0, -fileExtension.length);
-    const isResizedImage = validators.isResizedImage(fileNameWithoutExtension);
-    if (isResizedImage) {
-        logs.imageAlreadyResized();
-        return;
-    }
     let originalFile;
     try {
         originalFile = path.join(os.tmpdir(), filePath);
@@ -117,6 +116,9 @@ const resizeImage = ({ bucket, originalFile, fileDir, fileNameWithoutExtension,
         // Cloud Storage files.
         const metadata = {
             contentType: contentType,
+            metadata: {
+                resizedImage: "true",
+            },
         };
         if (config_1.default.cacheControlHeader) {
             metadata.cacheControl = config_1.default.cacheControlHeader;

storage-resize-images/functions/lib/validators.js

@@ -15,6 +15,4 @@
  * limitations under the License.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-const suffixRegex = /_\d+x\d+$/;
 exports.isImage = (contentType) => contentType.startsWith("image/");
-exports.isResizedImage = (fileName) => suffixRegex.test(fileName);

storage-resize-images/functions/src/index.ts

@@ -52,19 +52,18 @@ export const generateResizedImage = functions.storage.object().onFinalize(
       return;
     }
 
+    if (object.metadata && object.metadata.resizedImage === "true") {
+      logs.imageAlreadyResized();
+      return;
+    }
+
     const bucket = admin.storage().bucket(object.bucket);
     const filePath = object.name; // File path in the bucket.
     const fileDir = path.dirname(filePath);
     const fileName = path.basename(filePath);
     const fileExtension = path.extname(filePath);
     const fileNameWithoutExtension = fileName.slice(0, -fileExtension.length);
 
-    const isResizedImage = validators.isResizedImage(fileNameWithoutExtension);
-    if (isResizedImage) {
-      logs.imageAlreadyResized();
-      return;
-    }
-
     let originalFile;
     try {
       originalFile = path.join(os.tmpdir(), filePath);
@@ -150,6 +149,9 @@ const resizeImage = async ({
     // Cloud Storage files.
     const metadata: any = {
       contentType: contentType,
+      metadata: {
+        resizedImage: "true",
+      },
     };
     if (config.cacheControlHeader) {
       metadata.cacheControl = config.cacheControlHeader;

storage-resize-images/functions/src/validators.ts

@@ -14,10 +14,5 @@
  * limitations under the License.
  */
 
-const suffixRegex = /_\d+x\d+$/;
-
 export const isImage = (contentType: string): boolean =>
   contentType.startsWith("image/");
-
-export const isResizedImage = (fileName: string): boolean =>
-  suffixRegex.test(fileName);