tools_batch_files 1.0.39 → 1.0.40

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tools_batch_files",
-  "version": "1.0.39",
+  "version": "1.0.40",
   "description": "批处理视频工具",
   "keywords": [
     "utils",

package/src/videoFn/videoBatch.js

@@ -337,7 +337,16 @@ const archiveZip = (fileName, inputPath, originFilePath) => {
 const getMetadata = async (
   indexFilePath,
   originFilePath,
-  { title, keyword, anotherId, category_id, demand_kind, tag_id }
+  {
+    title,
+    keyword,
+    anotherId,
+    category_id,
+    demand_kind,
+    tag_id,
+    userid,
+    username,
+  }
 ) => {
   //第一张截图
   const photoInputPath = path.join(
@@ -349,8 +358,8 @@ const getMetadata = async (
   const videoMetadataComand = ffmpeg(originFilePath);
   const photoMetadataComand = ffmpeg(photoInputPath);
   const metaDataParams = {
-    userid: 10876358,
-    username: "樊建",
+    userid,
+    username,
     pixel_width: "",
     pixel_height: "",
     size: "",
@@ -360,11 +369,11 @@ const getMetadata = async (
     keyword,
     pr: 0,
     format: "mp4",
-    category_id: category_id,
-    demand_kind: demand_kind,
-    source_from: 74,
+    category_id,
+    demand_kind,
+    source_from,
     plate_id: 5,
-    tag_id: tag_id,
+    tag_id,
     is_government: 0,
     preview_width: "",
     preview_height: "",
@@ -479,15 +488,20 @@ async function postDataWithRetry(
  * 任务
  */
 const task = async (row, index, hash, type) => {
+  logger("88888888888888888888888888row8888888888888888888888");
+  const copyRow = { ...row };
+  logger(copyRow);
+
   //index文件夹   output/0
   const indexFilePath = path.join(workDir, "output", index + "");
-  let fileName = row.fileName;
   const rowFileName = row.fileName;
-  const title = row.title;
-  const keyword = row.keyword;
-  const category_id = row.category_id;
-  const demand_kind = row.demand_kind;
-  const tag_id = row.tag_id;
+
+  let fileName = row.fileName;
+  // const title = row.title;
+  // const keyword = row.keyword;
+  // const category_id = row.category_id;
+  // const demand_kind = row.demand_kind;
+  // const tag_id = row.tag_id;
 
   /**
    * 唯一标识符id，仅错误excel中有 anotherI d 列
@@ -536,12 +550,8 @@ const task = async (row, index, hash, type) => {
     await archiveZip(fileName, indexFilePath, originFilePath);
 
     const dataParams = await getMetadata(indexFilePath, originFilePath, {
-      title,
-      keyword,
       anotherId,
-      category_id,
-      demand_kind,
-      tag_id,
+      ...copyRow,
     });
 
     // 重试机制
@@ -565,7 +575,11 @@ const task = async (row, index, hash, type) => {
       logger("视频任务失败（最外层catch）：" + error);
     }
     removeDirectory(indexFilePath);
-    disposeError(hash, { fileName, keyword, title, anotherId });
+    disposeError(hash, {
+      fileName,
+      anotherId,
+      ...copyRow,
+    });
   }
 };
 

package/utils/logger.js

@@ -29,9 +29,35 @@ const successLogger = (hash, index, fileName, type = "") => {
 };
 
 //错误日志- xlsx
-const disposeError = (hash, { fileName, keyword, title, anotherId }) => {
+const disposeError = (
+  hash,
+  {
+    fileName,
+    keyword,
+    title,
+    anotherId,
+    category_id,
+    demand_kind,
+    tag_id,
+    userid,
+    username,
+  }
+) => {
   // 构建 Excel 数据
-  const data = [[fileName, keyword, title, anotherId]]; // 不包含表头
+  const data = [
+    [
+      fileName,
+      keyword,
+      title,
+      anotherId,
+      category_id,
+      demand_kind,
+      tag_id,
+      userid,
+      username,
+      source_from
+    ],
+  ]; // 不包含表头
 
   // 读取已存在的 Excel 文件
   let existingData = [];
@@ -45,7 +71,18 @@ const disposeError = (hash, { fileName, keyword, title, anotherId }) => {
   } catch (error) {
     logger("No existing file found, creating new one.");
     // 如果文件不存在，添加表头
-    existingData.push(["fileName", "keyword", "title", "anotherId"]);
+    existingData.push([
+      "fileName",
+      "keyword",
+      "title",
+      "anotherId",
+      "category_id",
+      "demand_kind",
+      "tag_id",
+      "userid",
+      "username",
+      "source_from"
+    ]);
   }
 
   // 合并已有数据和新数据