🎉 Release: 0.2.4

Kuingsmile · Mar 4, 2023 · 52e2494 · 52e2494
1 parent a0a2e91
commit 52e2494
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 23 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "piclist",
-  "version": "0.2.3",
+  "version": "0.2.4",
   "description": "Modified PicGo core, A tool for picture uploading",
   "main": "dist/index.cjs.js",
   "module": "dist/index.esm.js",

diff --git a/src/utils/common.ts b/src/utils/common.ts
@@ -570,21 +570,21 @@ export async function imageProcess (img: Buffer, options: IBuildInCompressOption
     if (validParam(options.quality) && options.quality! < 100) {
       quality = options.quality!
     }
-    if (options.isReSize) {
-      if (options.isReSizeByPercent) {
-        if (validParam(options.reSizePercent)) {
-          const imageWidth = await image.metadata().then(metadata => metadata.width)
-          const imageHeight = await image.metadata().then(metadata => metadata.height)
-          if (imageWidth && imageHeight) {
-            image = image.resize(
-              Math.round(imageWidth * options.reSizePercent! / 100),
-              Math.round(imageHeight * options.reSizePercent! / 100),
-              {
-                fit: 'inside'
-              })
-          }
+    if (options.isReSizeByPercent) {
+      if (validParam(options.reSizePercent)) {
+        const imageWidth = await image.metadata().then(metadata => metadata.width)
+        const imageHeight = await image.metadata().then(metadata => metadata.height)
+        if (imageWidth && imageHeight) {
+          image = image.resize(
+            Math.round(imageWidth * options.reSizePercent! / 100),
+            Math.round(imageHeight * options.reSizePercent! / 100),
+            {
+              fit: 'inside'
+            })
         }
-      } else if (validParam(options.reSizeHeight, options.reSizeWidth)) {
+      }
+    } else if (options.isReSize) {
+      if (validParam(options.reSizeHeight, options.reSizeWidth)) {
         image = image.resize(
           options.reSizeWidth,
           options.reSizeHeight,
@@ -631,14 +631,11 @@ export const needCompress = (compressOptions: IBuildInCompressOptions | undefine
     if (validParam(compressOptions.quality) && compressOptions.quality! < 100) {
       return true
     }
-    if (compressOptions.isReSize) {
-      if (validParam(compressOptions.reSizeHeight, compressOptions.reSizeWidth)) {
-        return true
-      } else if (compressOptions.isReSizeByPercent) {
-        if (validParam(compressOptions.reSizePercent) && compressOptions.reSizePercent! <= 100) {
-          return true
-        }
-      }
+    if (compressOptions.isReSizeByPercent && validParam(compressOptions.reSizePercent)) {
+      return true
+    }
+    if (compressOptions.isReSize && validParam(compressOptions.reSizeHeight, compressOptions.reSizeWidth)) {
+      return true
     }
     if (compressOptions.isRotate && compressOptions.rotateDegree) {
       return true
@@ -647,6 +644,7 @@ export const needCompress = (compressOptions: IBuildInCompressOptions | undefine
       const newFormat = compressOptions.convertFormat || 'jpg'
       return fileExt !== newFormat
     }
+    return false
   }
   return false
 }