mediac 1.8.0 → 1.8.5

package/cmd/cmd_compress.js

@@ -24,8 +24,8 @@ 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 tryfp from '../lib/tryfp.js'
-import { calculateScale, compressImage } from "./cmd_shared.js"
+import * as tryfp from '../lib/tryfp.js'
+import { applyFileNameRules, calculateScale, compressImage } from "./cmd_shared.js"
 
 //
 export { aliases, builder, command, describe, handler }
@@ -40,11 +40,11 @@ const WIDTH_DEFAULT = 6000
 
 const builder = function addOptions(ya, helpOrVersionSet) {
     return ya
-        .option("purge", {
+        .option("delete-source-files", {
             alias: "p",
             type: "boolean",
             default: false,
-            description: "Purge original image files",
+            description: "Delete original image files after compress",
         })
         // 输出目录，默认输出文件与原文件同目录
         .option("output", {
@@ -52,6 +52,32 @@ const builder = function addOptions(ya, helpOrVersionSet) {
             describe: "Folder store ouput files",
             type: "string",
         })
+        // 正则，包含文件名规则
+        .option("include", {
+            alias: "I",
+            type: "string",
+            description: "filename include pattern",
+        })
+        //字符串或正则，不包含文件名规则
+        // 如果是正则的话需要转义
+        .option("exclude", {
+            alias: "E",
+            type: "string",
+            description: "filename exclude pattern ",
+        })
+        // 默认启用正则模式，禁用则为字符串模式
+        .option("regex", {
+            alias: 're',
+            type: "boolean",
+            default: true,
+            description: "match filenames by regex pattern",
+        })
+        // 需要处理的扩展名列表，默认为常见视频文件
+        .option("extensions", {
+            alias: "e",
+            type: "string",
+            describe: "include files by extensions (eg. .wav|.flac)",
+        })
         // 压缩后的文件后缀，默认为 _Z4K
         .option("suffix", {
             alias: "S",
@@ -59,10 +85,10 @@ const builder = function addOptions(ya, helpOrVersionSet) {
             type: "string",
             default: "_Z4K",
         })
-        .option("purge-only", {
+        .option("delete-source-files-only", {
             type: "boolean",
             default: false,
-            description: "Just delete original image files only",
+            description: "Just delete original image files only, no compression",
         })
         // 是否覆盖已存在的压缩后文件
         .option("force", {
@@ -118,12 +144,7 @@ const handler = cmdCompress
 async function cmdCompress(argv) {
     const testMode = !argv.doit
     const logTag = "cmdCompress"
-    const root = path.resolve(argv.input)
-    assert.strictEqual("string", typeof root, "root must be string")
-    if (!root || !(await fs.pathExists(root))) {
-        log.error(logTag, `Invalid Input: '${root}'`)
-        throw new Error(`Invalid Input: ${root}`)
-    }
+    const root = await helper.validateInput(argv.input)
     if (!testMode) {
         log.fileLog(`Root:${root}`, logTag)
         log.fileLog(`Argv:${JSON.stringify(argv)}`, logTag)
@@ -133,8 +154,8 @@ async function cmdCompress(argv) {
     const quality = argv.quality || QUALITY_DEFAULT
     const minFileSize = (argv.size || SIZE_DEFAULT) * 1024
     const maxWidth = argv.width || WIDTH_DEFAULT
-    const purgeOnly = argv.purgeOnly || false
-    const purgeSource = argv.purge || false
+    const purgeOnly = argv.deleteSourceFilesOnly || false
+    const purgeSource = argv.deleteSourceFiles || false
     log.show(`${logTag} input:`, root)
     // 如果有force标志，就不过滤文件名
     const RE_THUMB = argv.force ? /@_@/ : /Z4K|P4K|M4K|feature|web|thumb$/i
@@ -152,8 +173,10 @@ async function cmdCompress(argv) {
         log.showYellow(logTag, "no files found, abort.")
         return
     }
+    // 应用文件名过滤规则
+    files = await applyFileNameRules(files, argv)
     log.show(logTag, `total ${files.length} files found (all)`)
-    if (files.length === 0) {
+    if (!files || files.length === 0) {
         log.showYellow("Nothing to do, abort.")
         return
     }
@@ -317,10 +340,11 @@ async function preCompress(f) {
     } else {
         if (im?.exif) {
             log.info(logTag, "force:", fileDst)
-            const md = exif(im.exif)?.Image
+            const [err, iexif] = tryfp.tryCatch(exif)(im.exif)
             // 跳过以前由mediac压缩过的图片，避免重复压缩
-            if (!f.force) {
-                if (md.Copyright?.includes("mediac")
+            if (!f.force && iexif?.Image) {
+                const md = iexif?.Image
+                if (md?.Copyright?.includes("mediac")
                     || md.Software?.includes("mediac")
                     || md.Artist?.includes("mediac") && !f.force) {
                     log.info(logTag, "skip:", fileDst)
@@ -339,12 +363,12 @@ async function preCompress(f) {
     }
 
     if (err) {
-        log.warn(logTag, "sharp", error.message, fileSrc)
-        log.fileLog(`SharpErr: ${f.index} <${fileSrc}> sharp:${error.message}`, logTag)
+        log.warn(logTag, "sharp", err.message, fileSrc)
+        log.fileLog(`SharpErr: ${f.index} <${fileSrc}> sharp:${err.message}`, logTag)
         return
     }
 
-    const { dstWidth, dstHeight } = calculateImageScale(im.width, im.height, maxWidth)
+    const { dstWidth, dstHeight } = calculateScale(im.width, im.height, maxWidth)
     if (f.total < 1000 || f.index > f.total - 1000) {
         log.show(logTag, `${f.index}/${f.total}`,
             helper.pathShort(fileSrc),

package/cmd/cmd_dcim.js

@@ -11,7 +11,7 @@ import fs from 'fs-extra'
 import inquirer from "inquirer"
 import path from "path"
 
-import { renameFiles } from "./cmd_shared.js"
+import { addEntryProps, renameFiles } from "./cmd_shared.js"
 
 import * as log from '../lib/debug.js'
 import * as exif from '../lib/exif.js'
@@ -136,6 +136,7 @@ const handler = async function cmdRename(argv) {
         log.showYellow(LOG_TAG, "Nothing to do, exit now.")
         return
     }
+    files = addEntryProps(files)
     log.show(
         LOG_TAG,
         `Total ${files.length} media files ready to rename by exif`,

package/cmd/cmd_decode.js

@@ -60,7 +60,7 @@ const handler = async function cmdDecode(argv) {
     }
     const fromEnc = argv.fromEnc?.length > 0 ? [argv.fromEnc] : ENC_LIST
     const toEnc = argv.toEnc?.length > 0 ? [argv.toEnc] : ENC_LIST
-    const threhold = log.isVerbose() ? 1 : 50
+    const threhold = log.isVerbose() ? 0 : 50
     log.show(logTag, `Input:`, strArgs)
     log.show(logTag, `fromEnc:`, JSON.stringify(fromEnc))
     log.show(logTag, `toEnc:`, JSON.stringify(toEnc))
@@ -88,19 +88,19 @@ function showResults(r) {
     let cr = chardet.analyse(Buffer.from(str))
     cr = cr.filter(ct => ct.confidence >= 70)
     cr?.length > 0 && print('Encoding', cr)
-    print('String', Array.from(str))
-    print('Unicode', Array.from(str).map(c => c.codePointAt(0).toString(16)))
-    const badUnicode = enc.checkBadUnicode(str)
+    // print('String', Array.from(str))
+    // print('Unicode', Array.from(str).map(c => c.codePointAt(0).toString(16)))
+    const badUnicode = enc.checkBadUnicode(str, true)
     badUnicode?.length > 0 && log.show('badUnicode:', badUnicode)
-    log.info(`MESSY_UNICODE=${enc.REGEX_MESSY_UNICODE.test(str)}`,
-        `MESSY_CJK=${enc.REGEX_MESSY_CJK.test(str)}`)
-    log.info(`OnlyJapanese=${unicode.strOnlyJapanese(str)}`,
-        `OnlyJpHan=${unicode.strOnlyJapaneseHan(str)}`,
-        `HasHiraKana=${unicode.strHasHiraKana(str)}`
-    )
-    log.info(`HasHangul=${unicode.strHasHangul(str)}`,
-        `OnlyHangul=${unicode.strOnlyHangul(str)}`)
-    log.info(`HasChinese=${unicode.strHasChinese(str)}`,
-        `OnlyChinese=${unicode.strOnlyChinese(str)}`,
-        `OnlyChn3500=${enc.RE_CHARS_MOST_USED.test(str)}`)
+    // log.info(`MESSY_UNICODE=${enc.REGEX_MESSY_UNICODE.test(str)}`,
+    //     `MESSY_CJK=${enc.REGEX_MESSY_CJK.test(str)}`)
+    // log.info(`OnlyJapanese=${unicode.strOnlyJapanese(str)}`,
+    //     `OnlyJpHan=${unicode.strOnlyJapaneseHan(str)}`,
+    //     `HasHiraKana=${unicode.strHasHiraKana(str)}`
+    // )
+    // log.info(`HasHangul=${unicode.strHasHangul(str)}`,
+    //     `OnlyHangul=${unicode.strOnlyHangul(str)}`)
+    // log.info(`HasChinese=${unicode.strHasChinese(str)}`,
+    //     `OnlyChinese=${unicode.strOnlyChinese(str)}`,
+    //     `OnlyChn3500=${enc.RE_CHARS_MOST_USED.test(str)}`)
 }