tools_batch_files 1.0.20 → 1.0.22

package/index.js

@@ -30,10 +30,10 @@ const SOURCE_VIDEO_DIR = "source_video";
 const ZIP_FILES_DIR = "zip";
 
 //并发数量
-const queueCount = 10;
+const queueCount = 50;
 
 //起始任务下标
-let taskIndex = 0;
+let taskIndex = 2066;
 
 /**
  * 递归遍历文件夹，查找mp4文件
@@ -102,12 +102,12 @@ const logger = (log, hash, err) => {
 };
 
 //错误日志
-const disposeError = (hash, err) => {
-  logger("---任务失败---", hash, err);
+const disposeError = (fileName) => {
+  logger("---任务失败---" + fileName);
   logger(
     `******************************************************************end`
   );
-  fs.writeFileSync("error.txt", err + "\n", {
+  fs.writeFileSync("error.txt", fileName + "\n", {
     flag: "a",
   });
 };
@@ -422,7 +422,7 @@ const getMetadata = async (
     video_id: rowFileName,
     title,
     keyword,
-    pr: 90,
+    pr: 100,
     format: "mp4",
     category_id: 4,
     demand_kind: 23,
@@ -485,10 +485,11 @@ const postData = (dataParams, indexFilePath) => {
 
   logger("等待接口返回结果……");
 
-  return axios.post("http://192.168.101.149:9999/upload/video", formData, {
+  return axios.post("http://127.0.0.1:9999/upload/video", formData, {
     headers: {
       "Content-Type": "multipart/form-data",
     },
+    timeout: 600000,
   });
 };
 
@@ -509,7 +510,7 @@ const task = async (row, index) => {
   const keyword = filteredArray.join(" ");
 
   if (!fileName.includes(".")) {
-    fileName = row.fileName + ".mp4";
+    fileName = row.fileName + ".mov";
   }
 
   // 源视频文件路径
@@ -519,7 +520,7 @@ const task = async (row, index) => {
   );
 
   if (!originFilePath) {
-    logger(`图片文件 ${fileName} 不存在`);
+    logger(`视频文件 ${fileName} 不存在`);
     return;
   }
   logger("源视频文件路径");
@@ -547,10 +548,17 @@ const task = async (row, index) => {
         keyword,
       }
     );
-    console.log("dataParams参数");
-    console.log(dataParams);
 
     const resData = await postData(dataParams, indexFilePath);
+    if (resData.data.code === 200) {
+      logger("请求成功！");
+      logger(resData.data.code);
+      logger(resData.data);
+      //删除文件夹
+      // fs.rmdirSync(indexFilePath, { recursive: true });
+    } else {
+      throw new Error("请求失败！" + resData.data.msg);
+    }
     logger(resData.data);
     logger(
       `----------------------------------------第${index}条结束---------------------------------end`
@@ -563,7 +571,9 @@ const task = async (row, index) => {
       logger("视频处理失败：");
       logger(error);
     }
-    disposeError(hash, fileName);
+    logger("catch日志*********************************");
+    disposeError(fileName);
+    // fs.rmdirSync(indexFilePath, { recursive: true });
   }
 };
 
@@ -601,7 +611,7 @@ const transitionExcelToJSON = () => {
   };
 
   for (let i = 0; i < queueCount; i++) {
-    run(i);
+    run(i + taskIndex);
   }
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tools_batch_files",
-  "version": "1.0.20",
+  "version": "1.0.22",
   "description": "批处理视频工具",
   "keywords": [
     "utils",
@@ -11,7 +11,8 @@
   "main": "index.js",
   "bin": {
     "tbf": "./index.js",
-    "tbfp": "./src/photoBatch.js"
+    "tbfp": "./src/photoBatch.js",
+    "tbfb": "./src/photoBatchBack.js"
   },
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",