@duoyun/md-img-pull 1.2.0 → 1.2.2

package/README.md

@@ -87,11 +87,19 @@ node dist/main.cjs
 
 ## 更新日志
 
+### v1.2.2
+
+- **优化**：在 `getFilesRecursive` 中对读取的子项进行自然排序，使数字按数值大小排序（避免 1, 10, 2 的字典序问题）
+
+### v1.2.1
+
+- **修复**：优化进度显示稳定性，减少刷新频率，解决抖动问题
+- **优化**：缩短进度条和文件名显示，避免终端换行导致的显示异常
+
 ### v1.2.0
 
 - **新功能**：分区输出 - 自动将输出按约 50MB 分割为多个 `part_X` 文件夹，方便管理和传输
-- **优化**：全新的单行进度显示，不再闪烁抖动
-- **优化**：实时显示分区大小、下载/压缩状态、累计时间
+- **优化**：全新的单行进度显示，实时显示分区大小、下载/压缩状态、累计时间
 - **优化**：精简日志输出，移除冗余信息
 
 ### v1.1.0

package/dist/main.cjs

@@ -13789,6 +13789,10 @@ var import_fs_extra = __toESM(require_lib(), 1);
 var import_path = __toESM(require("path"), 1);
 async function getFilesRecursive(dir) {
   const subdirs = await import_fs_extra.default.readdir(dir);
+  subdirs.sort(
+    (a, b) => a.localeCompare(b, void 0, { numeric: true, sensitivity: "base" })
+  );
+  console.log("\u{1F680} ~ getFilesRecursive ~ subdirs:", subdirs);
   const files = await Promise.all(
     //返回数组
     subdirs.map(async (subdir) => {
@@ -23814,13 +23818,13 @@ function remarkStringify(options) {
 }
 
 // utils/processSingleMarkdown.ts
-var import_fs_extra5 = __toESM(require_lib(), 1);
-var import_path4 = __toESM(require("path"), 1);
+var import_fs_extra4 = __toESM(require_lib(), 1);
+var import_path3 = __toESM(require("path"), 1);
 
 // utils/downloader.ts
 var import_crypto2 = __toESM(require("crypto"), 1);
-var path4 = __toESM(require("path"), 1);
-var import_fs_extra4 = __toESM(require_lib(), 1);
+var path3 = __toESM(require("path"), 1);
+var import_fs_extra3 = __toESM(require_lib(), 1);
 
 // node_modules/.pnpm/axios@1.13.4/node_modules/axios/lib/helpers/bind.js
 function bind(fn, thisArg) {
@@ -30938,32 +30942,6 @@ function ora(options) {
   return new Ora(options);
 }
 
-// utils/getFolderSize.ts
-var import_fs_extra3 = __toESM(require_lib(), 1);
-var import_path3 = __toESM(require("path"), 1);
-async function getFolderSize(folderPath) {
-  let totalSize = 0;
-  if (!await import_fs_extra3.default.pathExists(folderPath)) {
-    return 0;
-  }
-  const items = await import_fs_extra3.default.readdir(folderPath);
-  for (const item of items) {
-    const itemPath = import_path3.default.join(folderPath, item);
-    const stats = await import_fs_extra3.default.stat(itemPath);
-    if (stats.isFile()) {
-      totalSize += stats.size;
-    } else if (stats.isDirectory()) {
-      totalSize += await getFolderSize(itemPath);
-    }
-  }
-  return totalSize;
-}
-function formatSize(bytes) {
-  if (bytes < 1024) return `${bytes} B`;
-  if (bytes < 1024 * 1024) return `${(bytes / 1024).toFixed(2)} KB`;
-  return `${(bytes / (1024 * 1024)).toFixed(2)} MB`;
-}
-
 // utils/progressManager.ts
 var ProgressManager = class {
   totalFiles = 0;
@@ -30974,21 +30952,18 @@ var ProgressManager = class {
   currentFileName = "";
   downloadTotal = 0;
   downloadCompleted = 0;
-  compressedCount = 0;
   isCompressing = false;
-  // 是否正在压缩
   // 分区信息
   partitionIndex = 1;
-  partitionPath = "";
-  cachedPartitionSize = "0 B";
-  // ora spinner 实例
+  partitionSize = "0 B";
+  // ora spinner
   spinner = null;
-  // 定时器（用于实时更新时间）
+  // 定时器（只用于更新时间）
   timer = null;
   /**
-   * 初始化进度管理器
+   * 初始化
    */
-  init(srcPath, distPath, totalFiles) {
+  init(_srcPath, distPath, totalFiles) {
     this.totalFiles = totalFiles;
     this.completedFiles = 0;
     this.startTime = Date.now();
@@ -30996,38 +30971,35 @@ var ProgressManager = class {
     console.log("");
   }
   /**
-   * 设置当前分区信息
+   * 设置分区
    */
-  setPartition(index2, partitionPath) {
+  setPartition(index2, _path) {
     this.partitionIndex = index2;
-    this.partitionPath = partitionPath;
   }
   /**
-   * 异步更新分区大小缓存
+   * 设置分区大小
    */
-  async updatePartitionSize() {
-    if (this.partitionPath) {
-      const size = await getFolderSize(this.partitionPath);
-      this.cachedPartitionSize = formatSize(size);
-    }
+  setPartitionSize(size) {
+    this.partitionSize = size;
   }
   /**
-   * 开始处理一个新文件
+   * 开始处理文件
    */
   startFile(fileName, imageCount) {
     this.currentFileName = fileName;
     this.downloadTotal = imageCount;
     this.downloadCompleted = 0;
-    this.compressedCount = 0;
     this.isCompressing = false;
     this.fileStartTime = Date.now();
     this.spinner = ora({
-      text: this.formatText(),
+      text: this.getText(),
       spinner: "dots"
     }).start();
     this.timer = setInterval(() => {
-      this.updateDisplay();
-    }, 200);
+      if (this.spinner) {
+        this.spinner.text = this.getText();
+      }
+    }, 500);
   }
   /**
    * 更新下载进度
@@ -31035,22 +31007,27 @@ var ProgressManager = class {
   updateDownload() {
     this.downloadCompleted++;
     this.isCompressing = false;
-    this.updateDisplay();
+    if (this.spinner) {
+      this.spinner.text = this.getText();
+    }
   }
   /**
-   * 开始压缩（设置压缩状态）
+   * 开始压缩
    */
   startCompress() {
     this.isCompressing = true;
-    this.updateDisplay();
+    if (this.spinner) {
+      this.spinner.text = this.getText();
+    }
   }
   /**
-   * 更新压缩计数
+   * 完成压缩
    */
   updateCompress() {
-    this.compressedCount++;
     this.isCompressing = false;
-    this.updateDisplay();
+    if (this.spinner) {
+      this.spinner.text = this.getText();
+    }
   }
   /**
    * 完成当前文件
@@ -31072,78 +31049,37 @@ var ProgressManager = class {
       this.spinner.stop();
       this.spinner = null;
     }
-    const totalTime = this.formatTime(Date.now() - this.startTime);
-    const progressBar = this.createProgressBar(
-      this.totalFiles,
-      this.totalFiles
-    );
-    console.log(
-      source_default.green("OK") + ` ${progressBar} ${this.completedFiles}/${this.totalFiles} | ${totalTime}`
-    );
+    const time = this.formatTime(Date.now() - this.startTime);
+    const bar = this.getBar(this.totalFiles, this.totalFiles);
+    console.log(source_default.green("OK") + ` ${bar} ${this.completedFiles}/${this.totalFiles} | ${time}`);
     console.log("");
   }
-  /**
-   * 更新显示（由定时器或事件触发）
-   */
-  updateDisplay() {
-    if (this.spinner) {
-      this.spinner.text = this.formatText();
-    }
-  }
-  /**
-   * 停止定时器
-   */
   stopTimer() {
     if (this.timer) {
       clearInterval(this.timer);
       this.timer = null;
     }
   }
-  /**
-   * 格式化单行显示文本
-   */
-  formatText() {
-    const totalTime = this.formatTime(Date.now() - this.startTime);
+  getText() {
+    const bar = this.getBar(this.completedFiles, this.totalFiles);
+    const time = this.formatTime(Date.now() - this.startTime);
     const fileTime = this.formatTime(Date.now() - this.fileStartTime);
-    const progressBar = this.createProgressBar(
-      this.completedFiles,
-      this.totalFiles
-    );
-    let status = "";
-    if (this.isCompressing) {
-      status = "\u538B\u7F29\u4E2D";
-    } else if (this.downloadTotal > 0) {
-      status = `\u2193 ${this.downloadCompleted}/${this.downloadTotal}`;
-    }
-    let text4 = `${progressBar} ${this.completedFiles}/${this.totalFiles}`;
-    text4 += ` | \u5206\u533A${this.partitionIndex} (${this.cachedPartitionSize})`;
-    text4 += ` | ${this.currentFileName} (${fileTime})`;
-    if (status) {
-      text4 += ` | ${status}`;
+    let name = this.currentFileName;
+    if (name.length > 25) {
+      name = name.slice(0, 22) + "...";
     }
-    text4 += ` | ${totalTime}`;
-    return text4;
+    let status = this.isCompressing ? "\u538B\u7F29\u4E2D" : `\u2193${this.downloadCompleted}/${this.downloadTotal}`;
+    return `${bar} ${this.completedFiles}/${this.totalFiles} | \u5206\u533A${this.partitionIndex}(${this.partitionSize}) | ${name}(${fileTime}) | ${status} | ${time}`;
   }
-  /**
-   * 创建进度条
-   */
-  createProgressBar(current, total) {
-    const width = 20;
-    const filled = total > 0 ? Math.round(current / total * width) : 0;
-    const empty2 = width - filled;
-    return source_default.green("\u2588".repeat(filled)) + source_default.gray("\u2591".repeat(empty2));
+  getBar(cur, total) {
+    const w = 15;
+    const f = total > 0 ? Math.round(cur / total * w) : 0;
+    return source_default.green("\u2588".repeat(f)) + source_default.gray("\u2591".repeat(w - f));
   }
-  /**
-   * 格式化时间
-   */
   formatTime(ms) {
-    const seconds = Math.floor(ms / 1e3);
-    if (seconds < 60) {
-      return `${seconds}s`;
-    }
-    const minutes = Math.floor(seconds / 60);
-    const remainingSeconds = seconds % 60;
-    return `${minutes}m${remainingSeconds}s`;
+    const s = Math.floor(ms / 1e3);
+    if (s < 60) return `${s}s`;
+    return `${Math.floor(s / 60)}m${s % 60}s`;
   }
 };
 var progressManager = new ProgressManager();
@@ -31193,7 +31129,7 @@ async function downloadAndLocalize(node2, assetDir) {
     let finalExt = mimeMap[contentType];
     if (!finalExt) {
       const rawPath = (currentUrl.split("?")[0] || "").split("#")[0];
-      const rawExt = path4.extname(rawPath || "");
+      const rawExt = path3.extname(rawPath || "");
       finalExt = rawExt === ".image" || !rawExt ? ".png" : rawExt;
     }
     let imageData = Buffer.from(response.data);
@@ -31209,10 +31145,10 @@ async function downloadAndLocalize(node2, assetDir) {
       finalExt = ".webp";
     }
     const fileName = `${hash}${finalExt}`;
-    const localPath = path4.join(assetDir, fileName);
-    await import_fs_extra4.default.ensureDir(assetDir);
-    if (!await import_fs_extra4.default.pathExists(localPath)) {
-      await import_fs_extra4.default.writeFile(localPath, imageData);
+    const localPath = path3.join(assetDir, fileName);
+    await import_fs_extra3.default.ensureDir(assetDir);
+    if (!await import_fs_extra3.default.pathExists(localPath)) {
+      await import_fs_extra3.default.writeFile(localPath, imageData);
     }
     progressManager.updateDownload();
     const originalSize = response.data.byteLength;
@@ -31234,11 +31170,11 @@ async function downloadAndLocalize(node2, assetDir) {
 
 // utils/processSingleMarkdown.ts
 async function processSingleMarkdown(srcPath, distPath) {
-  const fileName = import_path4.default.basename(srcPath);
+  const fileName = import_path3.default.basename(srcPath);
   imageLog.setCurrentFile(fileName);
-  const content3 = await import_fs_extra5.default.readFile(srcPath, "utf-8");
-  const targetAssetDir = import_path4.default.join(import_path4.default.dirname(distPath), "assets");
-  await import_fs_extra5.default.ensureDir(targetAssetDir);
+  const content3 = await import_fs_extra4.default.readFile(srcPath, "utf-8");
+  const targetAssetDir = import_path3.default.join(import_path3.default.dirname(distPath), "assets");
+  await import_fs_extra4.default.ensureDir(targetAssetDir);
   const processor = unified().use(remarkParse).use(() => async (tree) => {
     const promises = [];
     const imageNodes = [];
@@ -31256,14 +31192,42 @@ async function processSingleMarkdown(srcPath, distPath) {
     progressManager.completeFile();
   }).use(remarkStringify);
   const result = await processor.process(content3);
-  await import_fs_extra5.default.ensureDir(import_path4.default.dirname(distPath));
-  await import_fs_extra5.default.writeFile(distPath, result.toString());
+  await import_fs_extra4.default.ensureDir(import_path3.default.dirname(distPath));
+  await import_fs_extra4.default.writeFile(distPath, result.toString());
 }
 
 // main.ts
 var readline = __toESM(require("node:readline/promises"), 1);
 var import_fs_extra6 = __toESM(require_lib(), 1);
 var import_node_process8 = require("node:process");
+
+// utils/getFolderSize.ts
+var import_fs_extra5 = __toESM(require_lib(), 1);
+var import_path4 = __toESM(require("path"), 1);
+async function getFolderSize(folderPath) {
+  let totalSize = 0;
+  if (!await import_fs_extra5.default.pathExists(folderPath)) {
+    return 0;
+  }
+  const items = await import_fs_extra5.default.readdir(folderPath);
+  for (const item of items) {
+    const itemPath = import_path4.default.join(folderPath, item);
+    const stats = await import_fs_extra5.default.stat(itemPath);
+    if (stats.isFile()) {
+      totalSize += stats.size;
+    } else if (stats.isDirectory()) {
+      totalSize += await getFolderSize(itemPath);
+    }
+  }
+  return totalSize;
+}
+function formatSize(bytes) {
+  if (bytes < 1024) return `${bytes} B`;
+  if (bytes < 1024 * 1024) return `${(bytes / 1024).toFixed(2)} KB`;
+  return `${(bytes / (1024 * 1024)).toFixed(2)} MB`;
+}
+
+// main.ts
 var log = console.log;
 var PARTITION_SIZE_LIMIT = 50 * 1024 * 1024;
 async function runBatch() {
@@ -31332,8 +31296,8 @@ async function runBatch() {
       }
       const targetMdPath = import_path5.default.join(currentPartitionPath, relativePath);
       await processSingleMarkdown(mdFile, targetMdPath);
-      await progressManager.updatePartitionSize();
       const currentPartitionSize = await getFolderSize(currentPartitionPath);
+      progressManager.setPartitionSize(formatSize(currentPartitionSize));
       if (currentPartitionSize >= PARTITION_SIZE_LIMIT) {
         partitionIndex++;
         currentPartitionPath = import_path5.default.join(
@@ -31341,6 +31305,7 @@ async function runBatch() {
           `part_${partitionIndex}`
         );
         progressManager.setPartition(partitionIndex, currentPartitionPath);
+        progressManager.setPartitionSize("0 B");
       }
     }
     progressManager.finish();

package/package.json

@@ -1,53 +1,53 @@
-{
-  "name": "@duoyun/md-img-pull",
-  "version": "1.2.0",
-  "description": "Markdown 媒体资源本地化与压缩工具",
-  "main": "./dist/main.cjs",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/518luck/md-img-pull.git"
-  },
-  "homepage": "https://github.com/518luck/md-img-pull#readme",
-  "publishConfig": {
-    "access": "public",
-    "registry": "https://registry.npmjs.org/"
-  },
-  "bin": {
-    "md-img-p": "dist/main.cjs"
-  },
-  "type": "module",
-  "files": [
-    "dist"
-  ],
-  "scripts": {
-    "start": "tsx main.ts",
-    "build": "esbuild main.ts --bundle --platform=node --format=cjs --outfile=dist/main.cjs --external:sharp --banner:js=\"#!/usr/bin/env node\"",
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "keywords": [],
-  "author": "",
-  "license": "ISC",
-  "packageManager": "pnpm@10.28.0",
-  "devDependencies": {
-    "@types/fs-extra": "^11.0.4",
-    "@types/node": "^25.2.1",
-    "esbuild": "^0.27.3",
-    "ts-node": "^10.9.2",
-    "tsx": "^4.21.0",
-    "typescript": "^5.9.3"
-  },
-  "dependencies": {
-    "@types/mdast": "^4.0.4",
-    "axios": "^1.13.4",
-    "chalk": "^5.6.2",
-    "crypto": "^1.0.1",
-    "fs-extra": "^11.3.3",
-    "ora": "^9.3.0",
-    "p-limit": "^7.3.0",
-    "remark-parse": "^11.0.0",
-    "remark-stringify": "^11.0.0",
-    "sharp": "^0.34.5",
-    "unified": "^11.0.5",
-    "unist-util-visit": "^5.1.0"
-  }
-}
+{
+  "name": "@duoyun/md-img-pull",
+  "version": "1.2.2",
+  "description": "Markdown 媒体资源本地化与压缩工具",
+  "main": "./dist/main.cjs",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/518luck/md-img-pull.git"
+  },
+  "homepage": "https://github.com/518luck/md-img-pull#readme",
+  "publishConfig": {
+    "access": "public",
+    "registry": "https://registry.npmjs.org/"
+  },
+  "bin": {
+    "md-img-p": "dist/main.cjs"
+  },
+  "type": "module",
+  "files": [
+    "dist"
+  ],
+  "scripts": {
+    "start": "tsx main.ts",
+    "build": "esbuild main.ts --bundle --platform=node --format=cjs --outfile=dist/main.cjs --external:sharp --banner:js=\"#!/usr/bin/env node\"",
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC",
+  "packageManager": "pnpm@10.28.0",
+  "devDependencies": {
+    "@types/fs-extra": "^11.0.4",
+    "@types/node": "^25.2.1",
+    "esbuild": "^0.27.3",
+    "ts-node": "^10.9.2",
+    "tsx": "^4.21.0",
+    "typescript": "^5.9.3"
+  },
+  "dependencies": {
+    "@types/mdast": "^4.0.4",
+    "axios": "^1.13.4",
+    "chalk": "^5.6.2",
+    "crypto": "^1.0.1",
+    "fs-extra": "^11.3.3",
+    "ora": "^9.3.0",
+    "p-limit": "^7.3.0",
+    "remark-parse": "^11.0.0",
+    "remark-stringify": "^11.0.0",
+    "sharp": "^0.34.5",
+    "unified": "^11.0.5",
+    "unist-util-visit": "^5.1.0"
+  }
+}