mediac 1.6.8 → 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) ++++++++++")
@@ -267,11 +268,13 @@ async function preCompress(f, options = {}) {
         const st = await fs.stat(fileSrc)
         const m = await sharp(fileSrc).metadata()
         try {
+            // 跳过以前由mediac压缩过的图片，避免重复压缩
+            // 可能需要添加一个命令行参数控制
             if (m?.exif) {
                 const md = exif(m.exif)?.Image
-                if (md && (md.Copyright?.includes("mediac")
+                if (md.Copyright?.includes("mediac")
                     || md.Software?.includes("mediac")
-                    || md.Artist?.includes("mediac"))) {
+                    || md.Artist?.includes("mediac")) {
                     log.info(logTag, "skip:", fileDst)
                     return {
                         ...f,
@@ -289,12 +292,7 @@ async function preCompress(f, options = {}) {
             log.fileLog(`ExifErr: <${fileSrc}> ${error.message}`, logTag)
         }
 
-        const newWidth =
-            m.width > m.height ? maxWidth : Math.round((maxWidth * m.width) / m.height)
-        const newHeight = Math.round((newWidth * m.height) / m.width)
-
-        const dstWidth = newWidth > m.width ? m.width : newWidth
-        const dstHeight = newHeight > m.height ? m.height : newHeight
+        const { dstWidth, dstHeight } = calculateImageScale(m.width, m.height, maxWidth)
         if (f.total < 1000 || f.index > f.total - 1000) {
             log.show(logTag, `${f.index}/${f.total}`,
                 helper.pathShort(fileSrc),
@@ -358,4 +356,18 @@ async function purgeSrcFiles(results) {
     const deleted = await pMap(toDelete, deletecFunc, { concurrency: cpus().length * 8 })
     log.showCyan(logTag, `${deleted.filter(Boolean).length} files are safely removed`)
 
+}
+
+// 给定图片长宽，给定长边数值，计算缩放后的长宽，只缩小不放大
+function calculateImageScale(imgWidth, imgHeight, maxSide) {
+    // 不需要缩放的情况
+    if (imgWidth <= maxSide && imgHeight <= maxSide) {
+        return { dstWidth: imgWidth, dstHeight: imgHeight }
+    }
+    // 计算缩放比例
+    let scaleFactor = maxSide / Math.max(imgWidth, imgHeight)
+    // 计算新的长宽
+    let dstWidth = Math.round(imgWidth * scaleFactor)
+    let dstHeight = Math.round(imgHeight * scaleFactor)
+    return { dstWidth, dstHeight }
 }