xw-devtool-cli 1.0.35 → 1.0.36

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xw-devtool-cli",
-  "version": "1.0.35",
+  "version": "1.0.36",
   "type": "module",
   "description": "基于node的开发者助手cli",
   "main": "index.js",

package/src/commands/imgCompress.js

@@ -124,8 +124,8 @@ async function pickPreserveStructure() {
     return choice;
 }
 
-async function pickTimestampSuffix() {
-    const choice = await selectFromMenu(i18next.t('imgCompress.timestampPrompt'), [
+async function pickSuffixOption() {
+    const choice = await selectFromMenu(i18next.t('imgCompress.suffixPrompt'), [
         { name: i18next.t('imgCompress.yes'), value: true },
         { name: i18next.t('imgCompress.no'), value: false }
     ], true, i18next.t('common.back'));
@@ -133,20 +133,7 @@ async function pickTimestampSuffix() {
     return choice;
 }
 
-function uniqueOutPath(dir, baseName) {
-    let candidate = path.join(dir, baseName);
-    if (!fs.existsSync(candidate)) return candidate;
-    let idx = 1;
-    const ext = path.extname(baseName);
-    const name = path.basename(baseName, ext);
-    while (true) {
-        candidate = path.join(dir, `${name}_${idx}${ext}`);
-        if (!fs.existsSync(candidate)) return candidate;
-        idx++;
-    }
-}
-
-async function compressOne(inputPath, quality, outDir, baseDir, preserveStructure, addTimestamp) {
+async function compressOne(inputPath, quality, outDir, baseDir, preserveStructure, addSuffix) {
     const ext = path.extname(inputPath).toLowerCase();
     const name = path.basename(inputPath, ext);
     const ts = dayjs().format('YYYYMMDD_HHmmss');
@@ -156,7 +143,7 @@ async function compressOne(inputPath, quality, outDir, baseDir, preserveStructur
         targetDir = path.join(outDir, rel);
         fs.mkdirSync(targetDir, { recursive: true });
     }
-    let outPath = addTimestamp ? path.join(targetDir, `${name}_compressed_${ts}${ext}`) : uniqueOutPath(targetDir, `${name}_compressed${ext}`);
+    const outPath = addSuffix ? path.join(targetDir, `${name}_compressed_${ts}${ext}`) : path.join(targetDir, `${name}${ext}`);
     const image = sharp(inputPath, { failOnError: false });
     if (ext === '.jpg' || ext === '.jpeg') {
         await image.jpeg({ quality, mozjpeg: true }).toFile(outPath);
@@ -200,19 +187,19 @@ export async function imgCompressHandler() {
     const outDir = path.resolve(baseDir, `compressed_${dayjs().format('YYYYMMDD_HHmmss')}`);
     fs.mkdirSync(outDir, { recursive: true });
     let preserveStructure = false;
-    let addTimestamp = true;
+    let addSuffix = input.type === 'folder';
     if (input.type === 'folder') {
         const preserveChoice = await pickPreserveStructure();
         if (preserveChoice === '__BACK__') return;
         preserveStructure = preserveChoice;
-        const tsChoice = await pickTimestampSuffix();
-        if (tsChoice === '__BACK__') return;
-        addTimestamp = tsChoice;
+        const suffixChoice = await pickSuffixOption();
+        if (suffixChoice === '__BACK__') return;
+        addSuffix = suffixChoice;
     }
     const results = [];
     for (const f of files) {
         try {
-            const out = await compressOne(f, quality, outDir, baseDir, preserveStructure, addTimestamp);
+            const out = await compressOne(f, quality, outDir, baseDir, preserveStructure, addSuffix);
             if (out) results.push(out);
         } catch (e) {
             console.error(`${i18next.t('imgCompress.fail')}: ${f} -> ${e.message}`);

package/src/locales/en.js

@@ -156,6 +156,6 @@ export default {
         opened: 'Opened output directory',
         scanResult: 'Images found',
         preservePrompt: 'Preserve original directory structure in output?',
-        timestampPrompt: 'Append timestamp suffix to filename for folder compression?'
+        suffixPrompt: 'Append filename suffix (compressed + timestamp)?'
     }
 };

package/src/locales/zh.js

@@ -155,7 +155,8 @@ export default {
         openFail: '打开目录失败',
         opened: '已打开输出目录',
         scanResult: '扫描到图片数量',
-        preservePrompt: '递归时是否按原始目录结构输出',
-        timestampPrompt: '文件夹压缩是否在文件名添加时间戳后缀'
+        preservePrompt: '递归时是否按原始目录结构输出'
+        ,
+        suffixPrompt: '是否在文件名添加后缀（compressed+时间戳）'
     }
 };