vid-com 1.0.5 → 1.0.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vid-com",
-  "version": "1.0.5",
+  "version": "1.0.7",
   "description": "Video bitrate scanner & batch compressor with ARW→JPEG conversion (macOS, FFmpeg, hevc_videotoolbox)",
   "main": "video_bitrate_tool.js",
   "bin": {

package/scripts/arw_to_jpg.sh

@@ -42,6 +42,9 @@ do_convert() {
     
     # 执行转换
     sips -s format jpeg -s formatOptions 90 "$src_file" --out "$target_file" > /dev/null 2>&1
+
+    # 从原始 ARW 拷贝所有元数据到输出 JPG
+    exiftool -TagsFromFile "$src_file" -All:All -overwrite_original "$target_file" > /dev/null 2>&1
 }
 
 export -f do_convert

package/scripts/batch_delete.js

@@ -6,10 +6,12 @@
  * 用法：
  *   node scripts/batch_delete.js [--input <json>]          # 视频模式（默认）
  *   node scripts/batch_delete.js --mode arw --dir <目录>   # ARW 模式
+ *   加 -y                                                  # yolo 模式：符合条件自动删除，不询问
  */
 
 const fs       = require('fs');
 const path     = require('path');
+const os       = require('os');
 const readline = require('readline');
 const { execSync } = require('child_process');
 
@@ -18,7 +20,9 @@ const { execSync } = require('child_process');
 function parseArgs(argv) {
   const args = {};
   for (let i = 0; i < argv.length; i++) {
-    if (argv[i].startsWith('--')) {
+    if (argv[i] === '-y') {
+      args.y = true;
+    } else if (argv[i].startsWith('--')) {
       const key = argv[i].slice(2);
       args[key] = argv[i + 1] && !argv[i + 1].startsWith('-') ? argv[++i] : true;
     }
@@ -28,6 +32,7 @@ function parseArgs(argv) {
 
 const args = parseArgs(process.argv.slice(2));
 const MODE = (args.mode || 'video').toLowerCase();
+const YOLO = !!args.y;
 
 // ─── 共用工具 ─────────────────────────────────────────────────────────────────
 
@@ -188,18 +193,22 @@ async function runVideoMode(jsonFile) {
       continue;
     }
 
-    const key = await askKey('  Delete original? [y = yes / other = skip]: ');
-    if (key.toLowerCase() === 'y') {
-      try {
-        fs.unlinkSync(origPath);
-        console.log('  -> DELETED\n');
-        deleted++;
-      } catch (err) {
-        console.error(`  -> FAILED: ${err.message}\n`);
+    if (!YOLO) {
+      const key = await askKey('  Delete original? [y = yes / other = skip]: ');
+      if (key.toLowerCase() !== 'y') {
+        console.log('  -> Skipped\n');
+        skipped++;
+        continue;
       }
     } else {
-      console.log('  -> Skipped\n');
-      skipped++;
+      console.log('  [yolo] 自动删除');
+    }
+    try {
+      fs.unlinkSync(origPath);
+      console.log('  -> DELETED\n');
+      deleted++;
+    } catch (err) {
+      console.error(`  -> FAILED: ${err.message}\n`);
     }
   }
 
@@ -225,6 +234,113 @@ function getImageDimensions(filePath) {
   }
 }
 
+// ─── pHash 工具 ───────────────────────────────────────────────────────────────
+
+/**
+ * 计算图片 dHash（差值哈希）。
+ * 用 sips 缩到 9×8 → BMP，直接解析像素，无需 npm 依赖。
+ * @returns {bigint}
+ */
+function computeDHash(imgPath) {
+  const tmpBmp = path.join(
+    os.tmpdir(),
+    `dhash_${Date.now()}_${Math.random().toString(36).slice(2)}.bmp`
+  );
+  try {
+    // sips -z pixelsH pixelsW  →  height=8, width=9
+    execSync(
+      `sips -z 8 9 -s format bmp "${imgPath}" --out "${tmpBmp}"`,
+      { stdio: ['pipe', 'pipe', 'pipe'] }
+    );
+    const buf        = fs.readFileSync(tmpBmp);
+    const dataOffset = buf.readUInt32LE(10);
+    const width      = buf.readInt32LE(18);
+    const height     = Math.abs(buf.readInt32LE(22));
+    const bpp        = buf.readUInt16LE(28);
+    const bytesPerPx = bpp / 8;
+    const rowStride  = Math.ceil(width * bytesPerPx / 4) * 4;  // 4 字节对齐
+
+    // BMP 行从下到上存储，转为灰度值数组（行从上到下）
+    const pixels = [];
+    for (let row = 0; row < height; row++) {
+      const rowOffset = dataOffset + (height - 1 - row) * rowStride;
+      for (let col = 0; col < width; col++) {
+        const o = rowOffset + col * bytesPerPx;
+        const b = buf[o], g = buf[o + 1], r = buf[o + 2];
+        pixels.push(Math.round(0.299 * r + 0.587 * g + 0.114 * b));
+      }
+    }
+
+    // dHash：每行相邻像素对比，左 < 右 → 1，否则 → 0
+    let hash = 0n;
+    for (let row = 0; row < 8; row++) {
+      for (let col = 0; col < 8; col++) {
+        hash = (hash << 1n) | (pixels[row * 9 + col] < pixels[row * 9 + col + 1] ? 1n : 0n);
+      }
+    }
+    return hash;
+  } finally {
+    try { fs.unlinkSync(tmpBmp); } catch {}
+  }
+}
+
+/** 计算两个 64-bit 哈希的汉明距离 */
+function hammingDistance(h1, h2) {
+  let xor = h1 ^ h2, dist = 0;
+  while (xor > 0n) { dist += Number(xor & 1n); xor >>= 1n; }
+  return dist;
+}
+
+/**
+ * 从 ARW 提取内嵌 JPEG（需要 exiftool）。
+ * 优先取 JpgFromRaw（全分辨率），回退到 PreviewImage。
+ * @returns {string|null} 临时文件路径，调用方负责删除
+ */
+function extractArwPreview(arwPath) {
+  const tmpJpg = path.join(
+    os.tmpdir(),
+    `arw_preview_${Date.now()}_${Math.random().toString(36).slice(2)}.jpg`
+  );
+  for (const tag of ['-JpgFromRaw', '-PreviewImage']) {
+    try {
+      execSync(
+        `exiftool -b ${tag} "${arwPath}" > "${tmpJpg}"`,
+        { shell: true, stdio: ['pipe', 'pipe', 'pipe'] }
+      );
+      if (fs.existsSync(tmpJpg) && fs.statSync(tmpJpg).size > 5000) return tmpJpg;
+    } catch {}
+  }
+  try { fs.unlinkSync(tmpJpg); } catch {}
+  return null;
+}
+
+/**
+ * 对比 ARW 内嵌预览与 JPG 的视觉哈希。
+ * @returns {{ match: boolean|null, dist: number|null, line: string }}
+ */
+function checkVisualMatch(arwPath, jpgPath) {
+  let previewPath = null;
+  try {
+    previewPath = extractArwPreview(arwPath);
+    if (!previewPath) {
+      return { match: null, dist: null, line: '  pHash   : ARW 无内嵌预览，跳过视觉验证' };
+    }
+    const h1   = computeDHash(previewPath);
+    const h2   = computeDHash(jpgPath);
+    const dist = hammingDistance(h1, h2);
+    const match = dist <= 10;
+    return {
+      match,
+      dist,
+      line: `  pHash   : 汉明距离 ${dist}/64  ${match ? '✓ 视觉一致' : '✗ 视觉不一致'}`,
+    };
+  } catch (err) {
+    return { match: null, dist: null, line: `  pHash   : 计算失败 (${err.message})` };
+  } finally {
+    if (previewPath) try { fs.unlinkSync(previewPath); } catch {}
+  }
+}
+
 /** 在同目录下查找同名的 .jpg / .jpeg（大小写不敏感） */
 function findJpgForArw(arwPath) {
   const dir  = path.dirname(arwPath);
@@ -307,18 +423,31 @@ async function runArwMode(dir) {
       continue;
     }
 
-    const key = await askKey('  Delete ARW? [y = yes / other = skip]: ');
-    if (key.toLowerCase() === 'y') {
-      try {
-        fs.unlinkSync(arwPath);
-        console.log('  -> DELETED\n');
-        deleted++;
-      } catch (err) {
-        console.error(`  -> FAILED: ${err.message}\n`);
+    // 视觉 pHash 验证（ARW 内嵌预览 vs JPG）
+    const { match: visualMatch, line: visualLine } = checkVisualMatch(arwPath, jpgPath);
+    console.log(visualLine);
+    if (visualMatch === false) {
+      console.log(`  -> 视觉内容不一致，自动跳过\n`);
+      mismatch++;
+      continue;
+    }
+
+    if (!YOLO) {
+      const key = await askKey('  Delete ARW? [y = yes / other = skip]: ');
+      if (key.toLowerCase() !== 'y') {
+        console.log('  -> Skipped\n');
+        skipped++;
+        continue;
       }
     } else {
-      console.log('  -> Skipped\n');
-      skipped++;
+      console.log('  [yolo] 自动删除');
+    }
+    try {
+      fs.unlinkSync(arwPath);
+      console.log('  -> DELETED\n');
+      deleted++;
+    } catch (err) {
+      console.error(`  -> FAILED: ${err.message}\n`);
     }
   }