tools_batch_files 1.0.33 → 1.0.34

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tools_batch_files",
-  "version": "1.0.33",
+  "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";
@@ -201,7 +206,7 @@ const archiveZip = (fileName, inputPath, originFilePath) => {
  */
 const getMetadata = async (
   originFilePath,
-  { rowFileName, title, keyword, index }
+  { rowFileName, title, keyword, anotherId }
 ) => {
   //源音频数据
   const photoMetadataComand = ffmpeg(originFilePath);
@@ -219,7 +224,7 @@ const getMetadata = async (
     duration: "",
     tag_ids: "3",
     source_from: "sound_1",
-    anotherId: rowFileName + index,
+    anotherId,
   };
 
   await new Promise((resolve, reject) => {
@@ -247,7 +252,7 @@ const getMetadata = async (
 /**
  * 接口
  */
-const postData = (dataParams, indexFilePath) => {
+const postData = (dataParams, indexFilePath, index) => {
   const formData = new FormData();
 
   const zipFiles = fs
@@ -264,7 +269,7 @@ const postData = (dataParams, indexFilePath) => {
     }
   }
 
-  logger("等待接口返回结果……");
+  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, {
@@ -290,18 +295,19 @@ 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 {
         logger(`请求失败，重试中... (${retryCount + 1}/${maxRetries})`);
@@ -328,6 +334,11 @@ const task = async (row, index, hash) => {
   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 + "**************************"
@@ -370,7 +381,7 @@ const task = async (row, index, hash) => {
       rowFileName,
       title,
       keyword,
-      index,
+      anotherId,
     });
     await wavAudio(indexFilePath, originFilePath, fileName);
     await watermarkAudio(
@@ -394,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);
@@ -412,7 +423,10 @@ const run = (index, data, hash) => {
 
     if (!row) {
       taskIndex = 0;
-      logger("当前任务，最后一条已结束！");
+      logger(
+        index +
+          "=========================当前任务，最后一条已结束！========================="
+      );
 
       // 是否存在错误列表？ 存在的话，继续遍历
       const errorExcelPath = path.join(workDir, `error${hash}.xlsx`);

package/utils/logger.js

@@ -25,9 +25,9 @@ const successLogger = (hash, index, fileName) => {
 };
 
 //错误日志- 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

@@ -49,7 +49,7 @@ function isExist(filePath) {
     console.log("存在");
     return true;
   } catch (err) {
-    console.log("错了");
+    console.log("不存在");
     console.error(err);
     return false;
   }
@@ -95,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,
@@ -102,4 +118,5 @@ module.exports = {
   moveFailFiles,
   isExist,
   readTxt,
+  removeDirectory,
 };