mediac 1.7.5 → 1.8.0

package/cmd/cmd_compress.js

@@ -13,16 +13,21 @@ import * as cliProgress from "cli-progress"
 import dayjs from "dayjs"
 import exif from 'exif-reader'
 import fs from 'fs-extra'
+import imageSizeOfSync from 'image-size'
 import inquirer from "inquirer"
 import { cpus } from "os"
 import pMap from 'p-map'
 import path from "path"
 import sharp from "sharp"
+import util from 'util'
 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'
-import { compressImage } from "./cmd_shared.js"
+import tryfp from '../lib/tryfp.js'
+import { calculateScale, compressImage } from "./cmd_shared.js"
+
+//
 export { aliases, builder, command, describe, handler }
 
 const command = "compress <input> [output]"
@@ -34,18 +39,38 @@ const SIZE_DEFAULT = 2048 // in kbytes
 const WIDTH_DEFAULT = 6000
 
 const builder = function addOptions(ya, helpOrVersionSet) {
-    return ya.option("purge", {
-        alias: "p",
-        type: "boolean",
-        default: false,
-        description: "Purge original image files",
-    })
+    return ya
+        .option("purge", {
+            alias: "p",
+            type: "boolean",
+            default: false,
+            description: "Purge original image files",
+        })
+        // 输出目录，默认输出文件与原文件同目录
+        .option("output", {
+            alias: "o",
+            describe: "Folder store ouput files",
+            type: "string",
+        })
+        // 压缩后的文件后缀，默认为 _Z4K
+        .option("suffix", {
+            alias: "S",
+            describe: "filename suffix for compressed files",
+            type: "string",
+            default: "_Z4K",
+        })
         .option("purge-only", {
             type: "boolean",
             default: false,
             description: "Just delete original image files only",
         })
         // 是否覆盖已存在的压缩后文件
+        .option("force", {
+            type: "boolean",
+            default: false,
+            description: "Force compress all files",
+        })
+        // 是否覆盖已存在的压缩后文件
         .option("override", {
             type: "boolean",
             default: false,
@@ -72,6 +97,12 @@ const builder = function addOptions(ya, helpOrVersionSet) {
             default: WIDTH_DEFAULT,
             description: "Max width of long side of image thumb",
         })
+        // 并行操作限制，并发数，默认为 CPU 核心数
+        .option("jobs", {
+            alias: "j",
+            describe: "multi jobs running parallelly",
+            type: "number",
+        })
         // 确认执行所有系统操作，非测试模式，如删除和重命名和移动操作
         .option("doit", {
             alias: "d",
@@ -81,7 +112,10 @@ const builder = function addOptions(ya, helpOrVersionSet) {
         })
 }
 
-const handler = async function cmdCompress(argv) {
+
+const handler = cmdCompress
+
+async function cmdCompress(argv) {
     const testMode = !argv.doit
     const logTag = "cmdCompress"
     const root = path.resolve(argv.input)
@@ -102,15 +136,15 @@ const handler = async function cmdCompress(argv) {
     const purgeOnly = argv.purgeOnly || false
     const purgeSource = argv.purge || false
     log.show(`${logTag} input:`, root)
-
-    const RE_THUMB = /Z4K|P4K|M4K|feature|web|thumb$/i
+    // 如果有force标志，就不过滤文件名
+    const RE_THUMB = argv.force ? /@_@/ : /Z4K|P4K|M4K|feature|web|thumb$/i
     const walkOpts = {
         needStats: true,
         entryFilter: (f) =>
             f.isFile
+            && helper.isImageFile(f.path)
             && !RE_THUMB.test(f.path)
             && f.size > minFileSize
-            && helper.isImageFile(f.path)
     }
     log.showGreen(logTag, `Walking files ...`)
     let files = await mf.walk(root, walkOpts)
@@ -141,6 +175,9 @@ const handler = async function cmdCompress(argv) {
     const addArgsFunc = async (f, i) => {
         return {
             ...f,
+            force: argv.force || false,
+            suffix: argv.suffix,
+            output: argv.output,
             total: files.length,
             index: i,
             quality,
@@ -154,7 +191,7 @@ const handler = async function cmdCompress(argv) {
         t.needBar = needBar
     })
     needBar && bar1.start(files.length, 0)
-    let tasks = await pMap(files, preCompress, { concurrency: cpus().length * 4 })
+    let tasks = await pMap(files, preCompress, { concurrency: argv.jobs || cpus().length * 4 })
     needBar && bar1.update(files.length)
     needBar && bar1.stop()
     log.info(logTag, "before filter: ", tasks.length)
@@ -233,13 +270,20 @@ let compressLastUpdatedAt = 0
 const bar1 = new cliProgress.SingleBar({ etaBuffer: 300 }, cliProgress.Presets.shades_classic)
 // 文心一言注释 20231206
 // 准备压缩图片的参数，并进行相应的处理  
-async function preCompress(f, options = {}) {
+async function preCompress(f) {
     const logTag = 'PreCompress'
     const maxWidth = f.maxWidth || 6000 // 获取最大宽度限制，默认为6000  
     let fileSrc = path.resolve(f.path) // 解析源文件路径  
     const [dir, base, ext] = helper.pathSplit(fileSrc) // 将路径分解为目录、基本名和扩展名  
-    const fileDstTmp = path.join(dir, `_TMP_${base}.jpg`)
-    let fileDst = path.join(dir, `${base}_Z4K.jpg`) // 构建目标文件路径，添加压缩后的文件名后缀  
+    const suffix = f.suffix || "_Z4K"
+    log.info(logTag, 'Processing ', fileSrc, suffix)
+
+    let fileDstDir = f.output ? helper.pathRewrite(f.root, dir, f.output, false) : dir
+    const tempSuffix = `_tmp@${helper.textHash(fileSrc)}@tmp_`
+    const fileDstTmp = path.join(fileDstDir, `${base}${suffix}${tempSuffix}.jpg`)
+    // 构建目标文件路径，添加压缩后的文件名后缀 
+    let fileDst = path.join(fileDstDir, `${base}${suffix}.jpg`)
+
     fileSrc = path.resolve(fileSrc) // 解析源文件路径（再次确认）  
     fileDst = path.resolve(fileDst) // 解析目标文件路径（再次确认）  
 
@@ -264,17 +308,21 @@ async function preCompress(f, options = {}) {
             skipReason: 'DST EXISTS',
         }
     }
-    try {
-        const st = await fs.stat(fileSrc)
-        const m = await sharp(fileSrc).metadata()
-        try {
+    let [err, im] = await core.tryRunAsync(async () => {
+        return await sharp(fileSrc).metadata()
+    })
+
+    if (err) {
+        [err, im] = await tryfp.tryCatchAsync(util.promisify(imageSizeOfSync))(fileSrc)
+    } else {
+        if (im?.exif) {
+            log.info(logTag, "force:", fileDst)
+            const md = exif(im.exif)?.Image
             // 跳过以前由mediac压缩过的图片，避免重复压缩
-            // 可能需要添加一个命令行参数控制
-            if (m?.exif) {
-                const md = exif(m.exif)?.Image
+            if (!f.force) {
                 if (md.Copyright?.includes("mediac")
                     || md.Software?.includes("mediac")
-                    || md.Artist?.includes("mediac")) {
+                    || md.Artist?.includes("mediac") && !f.force) {
                     log.info(logTag, "skip:", fileDst)
                     return {
                         ...f,
@@ -287,33 +335,34 @@ async function preCompress(f, options = {}) {
                     }
                 }
             }
-        } catch (error) {
-            log.warn(logTag, "exif", error.message, fileSrc)
-            log.fileLog(`ExifErr: <${fileSrc}> ${error.message}`, logTag)
         }
+    }
 
-        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),
-                `${m.width}x${m.height}=>${dstWidth}x${dstHeight} ${helper.humanSize(st.size)}`
-            )
-        }
-        log.fileLog(`Pre: ${f.index}/${f.total} <${fileSrc}> ` +
-            `${dstWidth}x${dstHeight}) ${m.format} ${helper.humanSize(st.size)}`, logTag)
-        return {
-            ...f,
-            srcWidth: m.width,
-            srcHeight: m.height,
-            width: dstWidth,
-            height: dstHeight,
-            src: fileSrc,
-            dst: fileDst,
-            tmpDst: fileDstTmp,
-        }
-    } catch (error) {
+    if (err) {
         log.warn(logTag, "sharp", error.message, fileSrc)
         log.fileLog(`SharpErr: ${f.index} <${fileSrc}> sharp:${error.message}`, logTag)
+        return
+    }
+
+    const { dstWidth, dstHeight } = calculateImageScale(im.width, im.height, maxWidth)
+    if (f.total < 1000 || f.index > f.total - 1000) {
+        log.show(logTag, `${f.index}/${f.total}`,
+            helper.pathShort(fileSrc),
+            `${im.width}x${im.height}=>${dstWidth}x${dstHeight} ${im.format || im.type} ${helper.humanSize(f.size)}`
+        )
+        log.showGray(logTag, `${f.index}/${f.total} DST:`, fileDst)
+    }
+    log.fileLog(`Pre: ${f.index}/${f.total} <${fileSrc}> ` +
+        `${dstWidth}x${dstHeight}) ${helper.humanSize(f.size)}`, logTag)
+    return {
+        ...f,
+        srcWidth: im.width,
+        srcHeight: im.height,
+        width: dstWidth,
+        height: dstHeight,
+        src: fileSrc,
+        dst: fileDst,
+        tmpDst: fileDstTmp,
     }
 }
 
@@ -356,18 +405,4 @@ 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 }
 }