minify-pic-cli 1.2.0-beta.1 → 1.2.0-beta.2

package/index.js

@@ -10,7 +10,7 @@ const ProgressDisplay = require("./lib/progress-display");
 
 // 默认配置参数
 const DEFAULT_CONFIG = {
-  targetDir: process.cwd(), // 需要压缩的目录(可包含子目录)
+  targetDirs: [process.cwd()], // 需要压缩的目录数组(可包含子目录)
   outputDir: path.join(process.cwd(), "output"), // 输出目录
   quality: 80, // 压缩质量 0 - 100
   gifColours: 128, // GIF调色板最大数量
@@ -18,20 +18,68 @@ const DEFAULT_CONFIG = {
 };
 
 // 询问用户是否继续
-function askUserToContinue() {
+function askUserToContinue(dirStats) {
   return new Promise((resolve) => {
     const rl = readline.createInterface({
       input: process.stdin,
       output: process.stdout,
     });
-    console.log(`当前目录路径为: ${process.cwd()}`);
-    rl.question("是否需要压缩当前目录的所有图片？Y/N：", (answer) => {
+    
+    if (dirStats && dirStats.length > 0) {
+      console.log("\n检测到以下目录待压缩:");
+      dirStats.forEach((stat, index) => {
+        console.log(`  ${index + 1}. ${stat.dir} (${stat.count} 张图片)`);
+      });
+      const totalCount = dirStats.reduce((sum, stat) => sum + stat.count, 0);
+      console.log(`总计: ${dirStats.length} 个目录, ${totalCount} 张图片\n`);
+    } else {
+      console.log(`当前目录路径为: ${process.cwd()}`);
+    }
+    
+    rl.question("是否继续压缩? Y/N：", (answer) => {
       rl.close();
       resolve(answer.trim().toLowerCase() === "y");
     });
   });
 }
 
+// 验证目录有效性
+function validateDirectories(dirs) {
+  const validDirs = [];
+  const invalidDirs = [];
+
+  for (const dir of dirs) {
+    try {
+      if (!fs.existsSync(dir)) {
+        console.warn(`警告: 目录不存在,跳过: ${dir}`);
+        invalidDirs.push({ dir, reason: '目录不存在' });
+        continue;
+      }
+      
+      const stat = fs.statSync(dir);
+      if (!stat.isDirectory()) {
+        console.warn(`警告: 路径不是目录,跳过: ${dir}`);
+        invalidDirs.push({ dir, reason: '不是目录' });
+        continue;
+      }
+      
+      // 检查读取权限
+      try {
+        fs.accessSync(dir, fs.constants.R_OK);
+        validDirs.push(dir);
+      } catch (err) {
+        console.error(`错误: 目录无读取权限,跳过: ${dir}`);
+        invalidDirs.push({ dir, reason: '无读取权限' });
+      }
+    } catch (err) {
+      console.error(`错误: 验证目录失败,跳过: ${dir}`, err.message);
+      invalidDirs.push({ dir, reason: err.message });
+    }
+  }
+
+  return { validDirs, invalidDirs };
+}
+
 // 获取文件大小（带单位，自动转换MB/KB）
 function getFileSizeWithUnit(filePath) {
   const stats = fs.statSync(filePath);
@@ -49,7 +97,7 @@ function getFileSizeWithUnit(filePath) {
 }
 
 // 压缩单张图片
-async function compressImage(filePath, config, baseDir = config.targetDir) {
+async function compressImage(filePath, config, sourceDir) {
   const beforeSize = getFileSizeWithUnit(filePath);
   sharp.cache(false);
 
@@ -84,8 +132,10 @@ async function compressImage(filePath, config, baseDir = config.targetDir) {
     outputFileDir = path.dirname(outputFilePath);
   } else {
     // 保持目录结构输出到新目录
-    const relativePath = path.relative(baseDir, filePath);
-    outputFilePath = path.join(config.outputDir, relativePath);
+    // 多目录支持: 使用sourceDir的basename作为一级子目录
+    const relativePath = path.relative(sourceDir, filePath);
+    const sourceDirBasename = path.basename(sourceDir);
+    outputFilePath = path.join(config.outputDir, sourceDirBasename, relativePath);
     outputFileDir = path.dirname(outputFilePath);
   }
 
@@ -121,7 +171,7 @@ async function compressImage(filePath, config, baseDir = config.targetDir) {
 }
 
 // 递归扫描目录，收集所有图片文件
-function collectImageFiles(dir, config, baseDir = config.targetDir) {
+function collectImageFiles(dir, config, sourceDir) {
   const files = fs.readdirSync(dir);
   const imageFiles = [];
 
@@ -137,7 +187,7 @@ function collectImageFiles(dir, config, baseDir = config.targetDir) {
 
     if (stat.isDirectory()) {
       if (!config.blackDirs.includes(file)) {
-        const subFiles = collectImageFiles(filePath, config, baseDir);
+        const subFiles = collectImageFiles(filePath, config, sourceDir);
         imageFiles.push(...subFiles);
       } else {
         console.log(`跳过的目录: ${filePath}`);
@@ -145,7 +195,8 @@ function collectImageFiles(dir, config, baseDir = config.targetDir) {
     } else if (/\.(png|jpe?g|gif)$/i.test(filePath)) {
       imageFiles.push({
         filePath,
-        size: stat.size
+        size: stat.size,
+        sourceDir: sourceDir  // 记录所属源目录
       });
     }
   }
@@ -153,8 +204,34 @@ function collectImageFiles(dir, config, baseDir = config.targetDir) {
   return imageFiles;
 }
 
+// 收集多个目录的图片文件
+function collectImageFilesFromMultipleDirs(dirs, config) {
+  const allImageFiles = [];
+  const dirStats = [];
+
+  for (const dir of dirs) {
+    console.log(`正在扫描目录: ${dir}`);
+    
+    // 如果是非原地替换模式，跳过与输出目录相同的源目录
+    if (!config.replace && path.resolve(dir) === path.resolve(config.outputDir)) {
+      console.warn(`警告: 源目录与输出目录相同,跳过: ${dir}`);
+      continue;
+    }
+    
+    const imageFiles = collectImageFiles(dir, config, dir);
+    allImageFiles.push(...imageFiles);
+    dirStats.push({
+      dir: dir,
+      count: imageFiles.length
+    });
+    console.log(`  找到 ${imageFiles.length} 张图片`);
+  }
+
+  return { allImageFiles, dirStats };
+}
+
 // 递归压缩目录下所有图片（单进程模式）
-async function compressFiles(dir, config, baseDir = config.targetDir) {
+async function compressFiles(dir, config, sourceDir) {
   const files = fs.readdirSync(dir);
 
   for (const file of files) {
@@ -169,18 +246,18 @@ async function compressFiles(dir, config, baseDir = config.targetDir) {
 
     if (stat.isDirectory()) {
       if (!config.blackDirs.includes(file)) {
-        await compressFiles(filePath, config, baseDir);
+        await compressFiles(filePath, config, sourceDir);
       } else {
         console.log(`跳过的目录: ${filePath}`);
       }
     } else if (/\.(png|jpe?g|gif)$/i.test(filePath)) {
-      await compressImage(filePath, config, baseDir);
+      await compressImage(filePath, config, sourceDir);
     }
   }
 }
 
 // 多进程压缩
-async function compressFilesParallel(imageFiles, config, baseDir, setGlobalPool) {
+async function compressFilesParallel(imageFiles, config, setGlobalPool) {
   const workerCount = WorkerPool.calculateWorkerCount(
     imageFiles.length,
     config.workers
@@ -201,10 +278,10 @@ async function compressFilesParallel(imageFiles, config, baseDir, setGlobalPool)
     for (const fileInfo of imageFiles) {
       try {
         const beforeSize = fileInfo.size;
-        await compressImage(fileInfo.filePath, config, baseDir);
+        await compressImage(fileInfo.filePath, config, fileInfo.sourceDir);
         const afterSize = fs.statSync(
           config.replace ? fileInfo.filePath : 
-          path.join(config.outputDir, path.relative(baseDir, fileInfo.filePath))
+          path.join(config.outputDir, path.basename(fileInfo.sourceDir), path.relative(fileInfo.sourceDir, fileInfo.filePath))
         ).size;
         
         completed++;
@@ -252,7 +329,6 @@ async function compressFilesParallel(imageFiles, config, baseDir, setGlobalPool)
     gifColours: config.gifColours,
     outputDir: config.outputDir,
     replace: config.replace,
-    baseDir: baseDir,
     onProgress: (data) => {
       progress.update(data);
     }
@@ -294,7 +370,7 @@ const program = new Command();
 program
   .name("mpic")
   .description("图片批量压缩工具")
-  .option("-d, --dir <dir>", "需要压缩的目录", DEFAULT_CONFIG.targetDir)
+  .option("-d, --dir <dir>", "需要压缩的目录(逗号分隔多个目录)", val => val.split(",").map(d => d.trim()), DEFAULT_CONFIG.targetDirs)
   .option("-o, --output <output>", "输出目录", DEFAULT_CONFIG.outputDir)
   .option("-q, --quality <quality>", "压缩质量(0-100)", String(DEFAULT_CONFIG.quality))
   .option("-g, --gif-colours <colours>", "GIF调色板最大数量(2-256)", String(DEFAULT_CONFIG.gifColours))
@@ -329,9 +405,14 @@ program
     // 注册信号处理
     process.on('SIGINT', () => gracefulShutdown('SIGINT'));
     process.on('SIGTERM', () => gracefulShutdown('SIGTERM'));
-    // 合并配置
+    
+    // 合并配置 - 处理多目录
+    const inputDirs = Array.isArray(options.dir) 
+      ? options.dir.map(d => path.resolve(process.cwd(), d))
+      : [path.resolve(process.cwd(), options.dir)];
+    
     const config = {
-      targetDir: path.resolve(process.cwd(), options.dir),
+      targetDirs: inputDirs,
       outputDir: options.replace ? null : path.resolve(process.cwd(), options.output),
       quality: parseInt(options.quality, 10),
       gifColours: parseInt(options.gifColours, 10),
@@ -340,29 +421,42 @@ program
       workers: options.workers,
       noParallel: options.noParallel || false,
     };
-
-    let shouldContinue = options.yes;
-    if (!shouldContinue) {
-      shouldContinue = await askUserToContinue();
+    
+    // 验证目录
+    console.log("正在验证目录...");
+    const { validDirs, invalidDirs } = validateDirectories(config.targetDirs);
+    
+    if (invalidDirs.length > 0) {
+      console.log(`\n跳过了 ${invalidDirs.length} 个无效目录`);
     }
-    if (!shouldContinue) {
-      console.log("已取消操作。");
-      process.exit(0);
+    
+    if (validDirs.length === 0) {
+      console.error("错误: 所有目录都无效，程序退出");
+      process.exit(1);
     }
-
-    const inputDir = config.targetDir;
+    
+    console.log(`\n有效目录: ${validDirs.length} 个`);
     
     // 收集所有图片文件
-    console.log("正在扫描图片文件...");
-    const imageFiles = collectImageFiles(inputDir, config, inputDir);
+    console.log("\n正在扫描图片文件...");
+    const { allImageFiles, dirStats } = collectImageFilesFromMultipleDirs(validDirs, config);
     
-    if (imageFiles.length === 0) {
+    if (allImageFiles.length === 0) {
       console.log("未找到需要压缩的图片文件");
       process.exit(0);
     }
 
+    let shouldContinue = options.yes;
+    if (!shouldContinue) {
+      shouldContinue = await askUserToContinue(dirStats);
+    }
+    if (!shouldContinue) {
+      console.log("已取消操作。");
+      process.exit(0);
+    }
+
     try {
-      await compressFilesParallel(imageFiles, config, inputDir, (pool) => {
+      await compressFilesParallel(allImageFiles, config, (pool) => {
         globalPool = pool;
       });
       

package/lib/worker-pool.js

@@ -250,13 +250,13 @@ class WorkerPool {
       type: "task",
       taskId,
       filePath: task.filePath,
+      sourceDir: task.sourceDir,
       config: {
         quality: this.config.quality,
         gifColours: this.config.gifColours,
         outputDir: this.config.outputDir,
         replace: this.config.replace
-      },
-      baseDir: this.config.baseDir
+      }
     });
   }
 

package/lib/worker.js

@@ -13,7 +13,7 @@ function getFileSize(filePath) {
 }
 
 // 压缩单张图片
-async function compressImage(filePath, config, baseDir) {
+async function compressImage(filePath, config, sourceDir) {
   const beforeSize = getFileSize(filePath);
   const startTime = Date.now();
   
@@ -50,8 +50,10 @@ async function compressImage(filePath, config, baseDir) {
     outputFileDir = path.dirname(outputFilePath);
   } else {
     // 保持目录结构输出到新目录
-    const relativePath = path.relative(baseDir, filePath);
-    outputFilePath = path.join(config.outputDir, relativePath);
+    // 多目录支持: 使用sourceDir的basename作为一级子目录
+    const relativePath = path.relative(sourceDir, filePath);
+    const sourceDirBasename = path.basename(sourceDir);
+    outputFilePath = path.join(config.outputDir, sourceDirBasename, relativePath);
     outputFileDir = path.dirname(outputFilePath);
   }
 
@@ -85,10 +87,10 @@ async function compressImage(filePath, config, baseDir) {
 // 工作进程消息处理
 process.on("message", async (message) => {
   if (message.type === "task") {
-    const { taskId, filePath, config, baseDir } = message;
+    const { taskId, filePath, config, sourceDir } = message;
     
     try {
-      const result = await compressImage(filePath, config, baseDir);
+      const result = await compressImage(filePath, config, sourceDir);
       
       process.send({
         type: "success",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "minify-pic-cli",
-  "version": "1.2.0-beta.1",
+  "version": "1.2.0-beta.2",
   "description": "一个简单易用的图片批量压缩命令行工具，支持 PNG、JPEG、GIF 格式，适合前端和设计师快速优化图片体积。",
   "main": "index.js",
   "files": [
@@ -13,7 +13,7 @@
   },
   "scripts": {
     "build": "node ./index.js",
-    "test": "mpic -d ./test/src -o ./test/output -y"
+    "test": "mpic -d ./test/src/assets,./test/src/imgs -o ./test/output -y -w 2"
   },
   "keywords": [
     "图片压缩",