mediac 1.7.1 → 1.7.5

package/cmd/cmd_compress.js

@@ -18,6 +18,7 @@ import { cpus } from "os"
 import pMap from 'p-map'
 import path from "path"
 import sharp from "sharp"
+import * as core from '../lib/core.js'
 import * as log from '../lib/debug.js'
 import * as mf from '../lib/file.js'
 import * as helper from '../lib/helper.js'
@@ -106,9 +107,9 @@ const handler = async function cmdCompress(argv) {
     const walkOpts = {
         needStats: true,
         entryFilter: (f) =>
-            f.stats.isFile()
+            f.isFile
             && !RE_THUMB.test(f.path)
-            && f.stats.size > minFileSize
+            && f.size > minFileSize
             && helper.isImageFile(f.path)
     }
     log.showGreen(logTag, `Walking files ...`)
@@ -176,7 +177,7 @@ const handler = async function cmdCompress(argv) {
     })
     log.show(logTag, `in ${helper.humanTime(startMs)} tasks:`)
     tasks.slice(-1).forEach(t => {
-        log.show(helper._omit(t, "stats", "bar1"))
+        log.show(core.omit(t, "stats", "bar1"))
     })
     log.info(logTag, argv)
     testMode && log.showYellow("++++++++++ TEST MODE (DRY RUN) ++++++++++")
@@ -360,8 +361,8 @@ async function purgeSrcFiles(results) {
 // 给定图片长宽，给定长边数值，计算缩放后的长宽，只缩小不放大
 function calculateImageScale(imgWidth, imgHeight, maxSide) {
     // 不需要缩放的情况
-    if (iw <= maxSide && ih <= maxSide) {
-        return { dstWidth: iw, dstHeight: ih }
+    if (imgWidth <= maxSide && imgHeight <= maxSide) {
+        return { dstWidth: imgWidth, dstHeight: imgHeight }
     }
     // 计算缩放比例
     let scaleFactor = maxSide / Math.max(imgWidth, imgHeight)