tools_batch_files 1.0.32 → 1.0.34

package/package.json

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

package/src/audioFn/audioBatch.js

@@ -13,6 +13,7 @@ const {
   ensureDirSync,
   isExist,
   readTxt,
+  removeDirectory,
 } = require("../../utils/settleFiles");
 const ffmpeg = require("fluent-ffmpeg");
 const fs = require("fs");
@@ -32,8 +33,12 @@ let taskIndex = 0;
 const exeDir = __dirname;
 //当前工作目录
 const workDir = process.cwd();
-// 表格目录
-const excelDir = path.join(workDir, "excel", "excel.xlsx");
+
+// 表格目录，从excel文件夹中查找
+const excelFiles = fs
+  .readdirSync(path.join(workDir, "excel"))
+  .find((file) => file.endsWith(".xlsx"));
+const excelDir = path.join(workDir, "excel", excelFiles);
 
 const ORIGIN_FILE_DIR = "audio";
 const WM_AUDIO_DIR = "watermark_audio";
@@ -200,10 +205,8 @@ const archiveZip = (fileName, inputPath, originFilePath) => {
  * 获取 元数据
  */
 const getMetadata = async (
-  fileName,
-  indexFilePath,
   originFilePath,
-  { rowFileName, title, keyword }
+  { rowFileName, title, keyword, anotherId }
 ) => {
   //源音频数据
   const photoMetadataComand = ffmpeg(originFilePath);
@@ -221,6 +224,7 @@ const getMetadata = async (
     duration: "",
     tag_ids: "3",
     source_from: "sound_1",
+    anotherId,
   };
 
   await new Promise((resolve, reject) => {
@@ -248,7 +252,7 @@ const getMetadata = async (
 /**
  * 接口
  */
-const postData = (dataParams, indexFilePath) => {
+const postData = (dataParams, indexFilePath, index) => {
   const formData = new FormData();
 
   const zipFiles = fs
@@ -265,11 +269,11 @@ const postData = (dataParams, indexFilePath) => {
     }
   }
 
-  logger("等待接口返回结果……");
+  logger(`第${index}条等待接口返回结果……`);
 
   // return axios.post("http://192.168.102.61: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, {
+  // return axios.post("http://127.0.0.1:9999/upload/sound", formData, {
+  return axios.post("http://192.168.101.149:9999/upload/sound", formData, {
     headers: {
       "Content-Type": "multipart/form-data",
     },
@@ -291,31 +295,29 @@ async function postDataWithRetry(
 
   while (retryCount < maxRetries) {
     try {
-      const resData = await postData(dataParams, indexFilePath);
+      const resData = await postData(dataParams, indexFilePath, index);
       if (resData.data.code === 200) {
         logger("请求成功！");
         logger(resData.data.code);
         // 文件名和索引值
         successLogger(hash, index, fileName);
-        fs.rmdirSync(indexFilePath, { recursive: true });
+        removeDirectory(indexFilePath);
         return;
       } else if (resData.data.code === 300) {
         // 重复上传，不捕获此错误
+        logger(resData.data.code);
         logger(`第${index}条文件-${index}重复上传！`);
-        fs.rmdirSync(indexFilePath, { recursive: true });
+        removeDirectory(indexFilePath);
         return;
       } else {
-        // 其他错误，抛出异常
-        throw new Error(
-          "请求code！==200：" + resData.data.code + resData.data.msg
-        );
+        logger(`请求失败，重试中... (${retryCount + 1}/${maxRetries})`);
+        logger(`请求code！==200： ${resData.data.code}${resData.data.msg}`);
+        // 延时等待一段时间后再进行重试
+        await new Promise((resolve) => setTimeout(resolve, 100)); // 等待0.1秒
+        retryCount++;
       }
     } catch (error) {
-      logger(`请求失败，重试中... (${retryCount + 1}/${maxRetries})`);
-      logger(error);
-      retryCount++;
-      // 延时等待一段时间后再进行重试
-      await new Promise((resolve) => setTimeout(resolve, 100)); // 等待0.1秒
+      throw new Error("重试机制错误！" + error);
     }
   }
   // 如果达到最大重试次数仍然失败，则抛出异常
@@ -326,14 +328,22 @@ async function postDataWithRetry(
  * 任务
  */
 const task = async (row, index, hash) => {
+  //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;
+  /**
+   * 唯一标识符id，仅错误excel中有 anotherI d 列
+   */
+  const anotherId = row.anotherId ? row.anotherId : excelFiles + index;
+
   try {
     logger(
       "**************************" + row.fileName + "**************************"
     );
     // Excel的列名分别为： fileName title keyword
-    let fileName = row.fileName;
-    const title = row.title;
-    const keyword = row.keyword;
     // const keywordArr = row.keyword.split(",");
     // const filteredArray = keywordArr.filter((item) => item.trim() !== "");
     // const keyword = filteredArray.join(" ");
@@ -358,26 +368,21 @@ const task = async (row, index, hash) => {
     logger(`-------------------${new Date()}------------------`);
 
     logger("原文件路径：" + originFilePath);
+    logger(`第${index}条原文件路径：${originFilePath}`);
 
     if (!originFilePath) {
-      logger(`音频文件 ${fileName} 不存在`);
+      logger(`第${index}条音频文件 ${fileName} 不存在`);
       return;
     }
 
-    //index文件夹   output/0
-    const indexFilePath = path.join(workDir, "output", index + "");
-
     await fs_asnyc.access(originFilePath, fs_asnyc.constants.F_OK);
-    logFileSize(originFilePath);
-    const dataParams = await getMetadata(
-      fileName,
-      indexFilePath,
-      originFilePath,
-      {
-        title,
-        keyword,
-      }
-    );
+    logFileSize(originFilePath, index);
+    const dataParams = await getMetadata(originFilePath, {
+      rowFileName,
+      title,
+      keyword,
+      anotherId,
+    });
     await wavAudio(indexFilePath, originFilePath, fileName);
     await watermarkAudio(
       indexFilePath,
@@ -400,8 +405,8 @@ const task = async (row, index, hash) => {
     } else {
       logger("音频任务失败（最外层catch）：" + error);
     }
-    fs.rmdirSync(indexFilePath, { recursive: true });
-    disposeError(hash, { fileName, keyword, title });
+    removeDirectory(indexFilePath);
+    disposeError(hash, { fileName, keyword, title, anotherId });
 
     //失败的时候，复制文件到错误文件夹中
     // const failPath = path.join(workDir, Error_Files_Dir, fileName);
@@ -418,7 +423,10 @@ const run = (index, data, hash) => {
 
     if (!row) {
       taskIndex = 0;
-      logger("当前任务，最后一条已结束！");
+      logger(
+        index +
+          "=========================当前任务，最后一条已结束！========================="
+      );
 
       // 是否存在错误列表？ 存在的话，继续遍历
       const errorExcelPath = path.join(workDir, `error${hash}.xlsx`);
@@ -432,7 +440,7 @@ const run = (index, data, hash) => {
       return;
     }
 
-    task(row, index)
+    task(row, index, hash)
       .then(() => {
         taskIndex++;
         run(taskIndex, data, hash);
@@ -457,7 +465,7 @@ const main = () => {
   //当前任务hash
   let hash = "";
   let jsonData = [];
-  logger("音频批量任务任务开始---" + hash);
+  logger("》》》》》》》》》》音频批量任务任务开始《《《《《《《《《《" + hash);
   logger("当前目录： " + workDir + "；工作目录： " + exeDir);
 
   // 读取success.txt，判断是否是 异常中断，

package/utils/logger.js

@@ -18,16 +18,16 @@ const logger = (log) => {
  * @param {*}  日志内容 hash index fileName
  */
 const successLogger = (hash, index, fileName) => {
-  console.log(log);
+  console.log(fileName);
   fs.writeFileSync("success.txt", hash + " " + index + " " + fileName + "\n", {
     flag: "a",
   });
 };
 
 //错误日志- xlsx
-const disposeError = (hash, { fileName, keyword, title }) => {
+const disposeError = (hash, { fileName, keyword, title, anotherId }) => {
   // 构建 Excel 数据
-  const data = [[fileName, keyword, title]]; // 不包含表头
+  const data = [[fileName, keyword, title, anotherId]]; // 不包含表头
 
   // 读取已存在的 Excel 文件
   let existingData = [];
@@ -41,7 +41,7 @@ const disposeError = (hash, { fileName, keyword, title }) => {
   } catch (error) {
     logger("No existing file found, creating new one.");
     // 如果文件不存在，添加表头
-    existingData.push(["fileName", "keyword", "title"]);
+    existingData.push(["fileName", "keyword", "title", "anotherId"]);
   }
 
   // 合并已有数据和新数据

package/utils/settleFiles.js

@@ -19,10 +19,10 @@ function findFileInDir(dir, fileName) {
   return null;
 }
 
-function logFileSize(path) {
+function logFileSize(path, index) {
   const fileSize = fs.statSync(path).size / (1024 * 1024);
   const formattedSize = fileSize.toFixed(2); // 保留两位小数
-  logger(`音频大小：${formattedSize}M`);
+  logger(`第${index}条音频大小：${formattedSize}M`);
 }
 
 /**
@@ -44,14 +44,28 @@ function ensureDirSync(dirpath) {
  * 判断文件是否存在
  */
 function isExist(filePath) {
-  fs.access(filePath, fs.constants.F_OK, (err) => {
-    if (err) {
-      return false;
-    } else {
-      return true;
-    }
-  });
+  try {
+    fs.accessSync(filePath, fs.constants.F_OK);
+    console.log("存在");
+    return true;
+  } catch (err) {
+    console.log("不存在");
+    console.error(err);
+    return false;
+  }
 }
+// function isExist(filePath) {
+//   fs.access(filePath, fs.constants.F_OK, (err) => {
+//     if (err) {
+//       console.log(err);
+
+//       return false;
+//     } else {
+//       console.log(555);
+//       return true;
+//     }
+//   });
+// }
 
 /**
  * 上传失败后，存入新文件夹（手动创建）
@@ -68,10 +82,12 @@ function readTxt(path) {
   try {
     const data = fs.readFileSync(path, "utf-8");
     const arr = data.split("\n").map((line) => line.trim()); // 删除每行两侧的空白符
-    const lastItem = arr[arr.length - 1];
+    const filteredArray = arr.filter((item) => item !== ""); //去除空项
+
+    const lastItem = filteredArray[filteredArray.length - 1];
 
     const loghash = lastItem.split(" ")[0];
-    const lastItemIndex = lastItem.split(" ")[1];
+    const lastItemIndex = parseInt(lastItem.split(" ")[1]);
     return { loghash, lastItemIndex };
   } catch (error) {
     console.error("readErrorTxt函数出错：", error);
@@ -79,6 +95,22 @@ function readTxt(path) {
   }
 }
 
+/**
+ * 确保文件存在，再删除
+ */
+function removeDirectory(directoryPath) {
+  try {
+    if (fs.existsSync(directoryPath)) {
+      fs.rmdirSync(directoryPath, { recursive: true });
+      console.log(`文件已删除: ${directoryPath}`);
+    } else {
+      console.log(`Directory does not exist: ${directoryPath}`);
+    }
+  } catch (error) {
+    console.error(`Error removing directory ${directoryPath}: ${error}`);
+  }
+}
+
 module.exports = {
   findFileInDir,
   logFileSize,
@@ -86,4 +118,5 @@ module.exports = {
   moveFailFiles,
   isExist,
   readTxt,
+  removeDirectory,
 };