tools_batch_files 1.0.32 → 1.0.33

package/package.json

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

package/src/audioFn/audioBatch.js

@@ -200,10 +200,8 @@ const archiveZip = (fileName, inputPath, originFilePath) => {
  * 获取 元数据
  */
 const getMetadata = async (
-  fileName,
-  indexFilePath,
   originFilePath,
-  { rowFileName, title, keyword }
+  { rowFileName, title, keyword, index }
 ) => {
   //源音频数据
   const photoMetadataComand = ffmpeg(originFilePath);
@@ -221,6 +219,7 @@ const getMetadata = async (
     duration: "",
     tag_ids: "3",
     source_from: "sound_1",
+    anotherId: rowFileName + index,
   };
 
   await new Promise((resolve, reject) => {
@@ -268,8 +267,8 @@ const postData = (dataParams, indexFilePath) => {
   logger("等待接口返回结果……");
 
   // 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",
     },
@@ -305,17 +304,14 @@ async function postDataWithRetry(
         fs.rmdirSync(indexFilePath, { recursive: true });
         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 +322,17 @@ 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;
   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 +357,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,
+      index,
+    });
     await wavAudio(indexFilePath, originFilePath, fileName);
     await watermarkAudio(
       indexFilePath,
@@ -432,7 +426,7 @@ const run = (index, data, hash) => {
       return;
     }
 
-    task(row, index)
+    task(row, index, hash)
       .then(() => {
         taskIndex++;
         run(taskIndex, data, hash);
@@ -457,7 +451,7 @@ const main = () => {
   //当前任务hash
   let hash = "";
   let jsonData = [];
-  logger("音频批量任务任务开始---" + hash);
+  logger("》》》》》》》》》》音频批量任务任务开始《《《《《《《《《《" + hash);
   logger("当前目录： " + workDir + "；工作目录： " + exeDir);
 
   // 读取success.txt，判断是否是 异常中断，

package/utils/logger.js

@@ -18,7 +18,7 @@ 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",
   });

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);