Fix file with extension

thinknathan · Dec 19, 2023 · 9423c42 · 9423c42
1 parent b28715c
commit 9423c42
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 28 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "node-simple-pixelate",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "Pixelizes images to create pixel art.",
   "repository": {
     "type": "git",

diff --git a/px.cjs b/px.cjs
@@ -216,10 +216,10 @@ const options = yargs
       return Math.round(value);
     },
   }).argv;
-if (options.filename !== undefined) {
+if (options.filename) {
   // Process a single image
   (0, processImage_1.processImage)(options);
-} else if (options.folderPath !== undefined) {
+} else if (options.folderPath) {
   // Process all images in a folder, splitting the task into threads
   let numCores = 2;
   try {

diff --git a/src/px.ts b/src/px.ts
@@ -220,10 +220,10 @@ const options = yargs
     },
   }).argv as unknown as Options;
 
-if (options.filename !== undefined) {
+if (options.filename) {
   // Process a single image
   processImage(options);
-} else if (options.folderPath !== undefined) {
+} else if (options.folderPath) {
   // Process all images in a folder, splitting the task into threads
   let numCores = 2;
   try {

diff --git a/src/utils/processImage.ts b/src/utils/processImage.ts
@@ -42,34 +42,42 @@ export function processImage(options: Options, skipExtCheck?: boolean): void {
     height,
   } = options;
 
-  if (filename && skipExtCheck) {
+  if (filename) {
     Jimp.read(filename, (err, image) => {
-      if (err) {
+      if (err && skipExtCheck) {
         console.error(err);
       } else {
-        continueProcessing(
-          image,
-          scale,
-          pixelSize,
-          ditherAlgo,
-          alphaThreshold,
-          colorLimit,
-          palette,
-          customPalette,
-          randomColor,
-          lowPass,
-          normalize,
-          grayScale,
-          contrast,
-          width,
-          height,
-          filename,
-        );
+        // Continue if image is successfully read
+        if (image) {
+          continueProcessing(
+            image,
+            scale,
+            pixelSize,
+            ditherAlgo,
+            alphaThreshold,
+            colorLimit,
+            palette,
+            customPalette,
+            randomColor,
+            lowPass,
+            normalize,
+            grayScale,
+            contrast,
+            width,
+            height,
+            filename,
+          );
+          return;
+        }
       }
     });
+  }
+
+  if (skipExtCheck) {
     return;
   }
 
+  // Check for supported image formats if skipExtCheck is false
   const supportedFormats = [".png", ".gif", ".jpg", ".jpeg"];
   let foundImage = false;
 

diff --git a/utils/processImage.js b/utils/processImage.js
@@ -24,17 +24,24 @@ const definedPalettes = definedPalettes_1.definedPalettesImport;
  */
 function processImage(options, skipExtCheck) {
     const { filename, scale, pixelSize, ditherAlgo, alphaThreshold, colorLimit, palette, customPalette, randomColor, lowPass, normalize, grayScale, contrast, width, height, } = options;
-    if (filename && skipExtCheck) {
+    if (filename) {
         Jimp.read(filename, (err, image) => {
-            if (err) {
+            if (err && skipExtCheck) {
                 console.error(err);
             }
             else {
-                continueProcessing(image, scale, pixelSize, ditherAlgo, alphaThreshold, colorLimit, palette, customPalette, randomColor, lowPass, normalize, grayScale, contrast, width, height, filename);
+                // Continue if image is successfully read
+                if (image) {
+                    continueProcessing(image, scale, pixelSize, ditherAlgo, alphaThreshold, colorLimit, palette, customPalette, randomColor, lowPass, normalize, grayScale, contrast, width, height, filename);
+                    return;
+                }
             }
         });
+    }
+    if (skipExtCheck) {
         return;
     }
+    // Check for supported image formats if skipExtCheck is false
     const supportedFormats = [".png", ".gif", ".jpg", ".jpeg"];
     let foundImage = false;
     // Attempt to read the image with different extensions