tools_batch_files 1.0.34 → 1.0.35

package/package.json

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

package/src/audioFn/audioBatch.js

@@ -29,6 +29,12 @@ const queueCount = 10;
 //起始任务下标
 let taskIndex = 0;
 
+//已完成数量
+let completeCount = 0;
+
+//错误文件重试次数
+let retryError = 0;
+
 //执行目录
 const exeDir = __dirname;
 //当前工作目录
@@ -48,7 +54,13 @@ const ZIP_FILES_DIR = "zip";
 //拷贝 - 存放上传失败的文件
 const Error_Files_Dir = "failed_audio";
 //水印
-const watermarkAudioPath = path.join(__dirname, "..", "vocal_print", "mz.mp3");
+const watermarkAudioPath = path.join(
+  __dirname,
+  "..",
+  "..",
+  "vocal_print",
+  "mz.mp3"
+);
 const longWatermarkAudioPath = path.join(
   __dirname,
   "..",
@@ -77,7 +89,7 @@ const watermarkAudio = (indexFilePath, originFilePath, fileName, duration) => {
     `[1:a]atrim=0:duration=${duration},volume=1.5[a1]`, // 对声纹音频流进行截取操作，并设置音量，重命名为a1
     `[a0][a1]amix=inputs=2[a]`, // 合并两个音频流为一个输出流，重命名为a
     `[a]volume=3.0`, // 设置输出音频的音量
-  ].join(";");
+  ];
 
   if (duration <= 5) {
     //直接合并，放在末尾，下次补上
@@ -108,7 +120,7 @@ const watermarkAudio = (indexFilePath, originFilePath, fileName, duration) => {
       .input(originFilePath)
       .input(vocalPath) // 声纹音频文件
 
-      .complexFilter(complexFilter)
+      .complexFilter(complexFilter.join(";"))
       .output(outputFile)
       .on("error", (err) => {
         logger("添加声纹出错: " + err);
@@ -272,8 +284,8 @@ const postData = (dataParams, indexFilePath, index) => {
   logger(`第${index}条等待接口返回结果……`);
 
   // return axios.post("http://192.168.102.61:9999/upload/sound", formData, {
-  // return axios.post("http://127.0.0.1:9999/upload/sound", formData, {
-  return axios.post("http://192.168.101.149:9999/upload/sound", formData, {
+  // return axios.post("http://192.168.101.149:9999/upload/sound", formData, {
+  return axios.post("http://127.0.0.1:9999/upload/sound", formData, {
     headers: {
       "Content-Type": "multipart/form-data",
     },
@@ -289,7 +301,8 @@ async function postDataWithRetry(
   indexFilePath,
   index,
   fileName,
-  hash
+  hash,
+  type
 ) {
   let retryCount = 0; // 当前重试次数
 
@@ -300,7 +313,7 @@ async function postDataWithRetry(
         logger("请求成功！");
         logger(resData.data.code);
         // 文件名和索引值
-        successLogger(hash, index, fileName);
+        successLogger(hash, index, fileName, type);
         removeDirectory(indexFilePath);
         return;
       } else if (resData.data.code === 300) {
@@ -327,7 +340,7 @@ async function postDataWithRetry(
 /**
  * 任务
  */
-const task = async (row, index, hash) => {
+const task = async (row, index, hash, type) => {
   //index文件夹   output/0
   const indexFilePath = path.join(workDir, "output", index + "");
   let fileName = row.fileName;
@@ -393,7 +406,14 @@ const task = async (row, index, hash) => {
     await archiveZip(fileName, indexFilePath, originFilePath);
 
     // 重试机制
-    await postDataWithRetry(dataParams, indexFilePath, index, fileName, hash);
+    await postDataWithRetry(
+      dataParams,
+      indexFilePath,
+      index,
+      fileName,
+      hash,
+      type
+    );
 
     logger(
       `----------------------------------------第${index}条结束---------------------------------end`
@@ -414,35 +434,41 @@ const task = async (row, index, hash) => {
   }
 };
 
-const run = (index, data, hash) => {
+const run = (index, data, hash, type) => {
   try {
     logger(
       `run-------------------------------------第${index}条开始------------------------------------`
     );
     const row = data[index];
 
-    if (!row) {
+    if (completeCount >= data.length) {
       taskIndex = 0;
       logger(
         index +
           "=========================当前任务，最后一条已结束！========================="
       );
 
+      successLogger(hash, index, "done");
+
       // 是否存在错误列表？ 存在的话，继续遍历
-      const errorExcelPath = path.join(workDir, `error${hash}.xlsx`);
-      if (isExist(errorExcelPath)) {
-        const jsonData2 = readExcel(errorExcelPath);
-        queue(taskIndex, jsonData2, hash);
-      } else {
-        logger("跑干了！");
+      const status = runErrorList(taskIndex, hash);
+      if (!status) {
+        logger(
+          "》》》》》》》》》》音频批量任务任务结束《《《《《《《《《《" + hash
+        );
       }
 
       return;
     }
 
-    task(row, index, hash)
+    if (!row) {
+      return;
+    }
+
+    task(row, index, hash, type)
       .then(() => {
         taskIndex++;
+        completeCount++;
         run(taskIndex, data, hash);
       })
       .catch((err) => {
@@ -450,15 +476,52 @@ const run = (index, data, hash) => {
       });
   } catch (error) {
     logger("捕获错误！" + error);
+    completeCount++;
     taskIndex++;
     run(taskIndex, data, hash);
   }
 };
 
-const queue = (taskIndex, jsonData, hash) => {
-  for (let i = 0; i < queueCount; i++) {
-    run(i + taskIndex, jsonData, hash);
+const queue = (index, jsonData, hash, type) => {
+  const rest = jsonData.length - index;
+  const count = queueCount > rest ? rest : queueCount;
+  const queueList = [];
+  completeCount = index;
+
+  for (let i = 0; i < count; i++) {
+    queueList.push(run(i + index, jsonData, hash, type));
   }
+
+  taskIndex += count - 1;
+  return Promise.all(queueList);
+};
+
+//yunxing cuowu wenjian
+const runErrorList = (index, hash, parentHash) => {
+  const fileHash = parentHash || hash;
+  const errorExcelPath = path.join(workDir, `error${fileHash}.xlsx`);
+
+  if (retryError > 5) {
+    console.log("出现无法解析的错误");
+    return false;
+  }
+
+  taskIndex = index;
+  let taskHash = hash;
+  //新的运行任务-重新赋予新的任务id
+  if (index === 0) {
+    taskHash = generateUniqueHash().slice(0, 8);
+  }
+
+  if (isExist(errorExcelPath)) {
+    retryError++;
+
+    logger("开始运行错误列表");
+    jsonData = readExcel(errorExcelPath); //   数据来源于error excel
+    queue(index, jsonData, taskHash, fileHash);
+    return true;
+  }
+  return false;
 };
 
 const main = () => {
@@ -473,18 +536,31 @@ const main = () => {
 
   const successPath = path.join(workDir, "success.txt");
   if (isExist(successPath)) {
-    const { loghash, lastItemIndex } = readTxt(successPath);
-    const errorExcelPath = path.join(workDir, `error${loghash}.xlsx`);
-    logger("成功日志存在，异常中断或者跑完了。");
+    const { loghash, lastItemIndex, fileName, parentHash } =
+      readTxt(successPath);
 
     hash = loghash;
-    taskIndex = lastItemIndex + 1; // lastItemIndex为最后一项，所有要+1
-
-    if (isExist(errorExcelPath)) {
-      jsonData = readExcel(errorExcelPath); //   数据来源于error excel
-      queue(taskIndex, jsonData, hash);
+    taskIndex = parseInt(lastItemIndex) + 1; // lastItemIndex为最后一项，所有要+1
+
+    //当前任务已经结束
+    if (fileName === "done") {
+      //找寻是否存在未上传的错误文件列表
+      const status = runErrorList(0, hash);
+      if (!status) {
+        logger(
+          "》》》》》》》》》》音频批量任务任务结束《《《《《《《《《《" + hash
+        );
+      }
     } else {
-      logger("跑干了！");
+      //当前任务异常中断
+
+      //中断的任务类型为错误任务
+      if (parentHash) {
+        runErrorList(taskIndex, hash, parentHash);
+      } else {
+        jsonData = readExcel(excelDir);
+        queue(taskIndex, jsonData, hash);
+      }
     }
   } else {
     hash = generateUniqueHash().slice(0, 8);

package/utils/logger.js

@@ -17,11 +17,15 @@ const logger = (log) => {
  * 成功日志
  * @param {*}  日志内容 hash index fileName
  */
-const successLogger = (hash, index, fileName) => {
+const successLogger = (hash, index, fileName, type = "") => {
   console.log(fileName);
-  fs.writeFileSync("success.txt", hash + " " + index + " " + fileName + "\n", {
-    flag: "a",
-  });
+  fs.writeFileSync(
+    "success.txt",
+    hash + " " + index + " " + fileName + " " + type + "\n",
+    {
+      flag: "a",
+    }
+  );
 };
 
 //错误日志- xlsx

package/utils/settleFiles.js

@@ -86,9 +86,8 @@ function readTxt(path) {
 
     const lastItem = filteredArray[filteredArray.length - 1];
 
-    const loghash = lastItem.split(" ")[0];
-    const lastItemIndex = parseInt(lastItem.split(" ")[1]);
-    return { loghash, lastItemIndex };
+    const [loghash, lastItemIndex, fileName, parentHash] = lastItem.split(" ");
+    return { loghash, lastItemIndex, fileName, parentHash };
   } catch (error) {
     console.error("readErrorTxt函数出错：", error);
     return {};