tools_batch_files 1.0.24 → 1.0.26

package/package.json

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

package/src/photoBatch.js

@@ -19,6 +19,9 @@ const excelDir = path.join(workDir, "excel", "excel.xlsx");
 //水印
 const watermarkImage = path.join(__dirname, "..", "imgs", "picWater.png");
 
+//拷贝 - 存放上传失败的文件 
+const Error_Files_Dir = "failed_photos";
+
 // 截图数量
 const SCREENSHOT_COUNT = 5;
 const ORIGIN_FILE_DIR = "photos";
@@ -59,7 +62,7 @@ function logFileSize(path) {
 }
 
 //普通日志
-const logger = (log, hash, err) => {
+const logger = (log) => {
   console.log(log);
   fs.writeFileSync("log.txt", log + "\n", {
     flag: "a",
@@ -68,7 +71,7 @@ const logger = (log, hash, err) => {
 
 //错误日志
 const disposeError = (err) => {
-  logger("---任务失败---", err);
+  logger("---任务失败---" + err);
   logger(
     `******************************************************************end`
   );
@@ -376,6 +379,16 @@ const postData = (dataParams, indexFilePath) => {
   });
 };
 
+/**
+ * 上传失败后，存入新文件夹（手动创建）
+ */
+const moveFailFiles = (originFilePath, failPath) => {
+  if (originFilePath) {
+    fs.copyFileSync(originFilePath, failPath);
+    logger(`${originFilePath}上传失败，已移入错误文件夹！！！`);
+  }
+};
+
 /**
  * 任务
  */
@@ -408,8 +421,7 @@ const task = async (row, index) => {
   logger(`第${index}条Path路径搜索时间：${timeInSeconds}秒`);
   logger(`-------------------${new Date()}------------------`);
 
-  console.log("originFilePath：" + originFilePath);
-  console.log("fileName：" + fileName);
+  logger("originFilePath：" + originFilePath);
 
   if (!originFilePath) {
     logger(`图片文件 ${fileName} 不存在`);
@@ -453,7 +465,7 @@ const task = async (row, index) => {
     if (resData.data.code === 200) {
       logger("请求成功！");
       logger(resData.data.code);
-      console.log(resData.data);
+      logger(resData.data);
       //删除文件夹
       fs.rmdirSync(indexFilePath, { recursive: true });
     } else {
@@ -473,6 +485,10 @@ const task = async (row, index) => {
     }
     fs.rmdirSync(indexFilePath, { recursive: true });
     disposeError(fileName);
+
+    //失败的时候，复制文件到错误文件夹中
+    const failPath = path.join(workDir, Error_Files_Dir, fileName);
+    moveFailFiles(originFilePath, failPath);
   }
 };
 
@@ -494,24 +510,11 @@ const transitionExcelToJSON = () => {
       logger(
         `run-------------------------------------第${index}条开始------------------------------------`
       );
-      const readExcelStartTime = new Date();
       const row = jsonData[index];
 
-      const readExcelEndTime = new Date();
-      const timeInSeconds = (
-        (readExcelEndTime - readExcelStartTime) /
-        1000
-      ).toFixed(2);
-
-      logger(`第${index}条Excel搜索时间：${timeInSeconds}秒`);
-      logger(`-------------------${new Date()}------------------`);
       if (!row) {
         return;
       }
-      logger(
-        `----------------------------------------第${index}条task开始--------------------------------`
-      );
-      logger(`-------------------${new Date()}------------------`);
       task(row, index)
         .then(() => {
           taskIndex++;

package/src/removeFailVideo.js

@@ -3,13 +3,13 @@ const path = require("path");
 
 const workDir = process.cwd();
 
-const ORIGIN_FILE_DIR = "video";
+const ORIGIN_FILE_DIR = "photos";
 
 // error错误日志目录
 const errorDir = path.join(workDir, "error.txt");
 
-const Error_Files_Dir = "failed_videos";
-// const Error_Files_Dir = "failed_photos";
+// const Error_Files_Dir = "failed_videos";
+const Error_Files_Dir = "failed_photos";
 
 /**
  * 确保目录存在，如果不存在则创建它
@@ -61,7 +61,8 @@ function findFileInDir(dir, fileName) {
       if (result) {
         return result;
       }
-    } else if (file.startsWith(fileName) && file.endsWith(".mov")) {
+      // } else if (file.startsWith(fileName) && file.endsWith(".mov")) {
+    } else if (file.startsWith(fileName) && file.endsWith(".jpg")) {
       return { filePath, file };
     }
   }
@@ -90,7 +91,8 @@ txtData.forEach((item, index) => {
     const { filePath: originFilePath, file: fileName } = fileObj;
 
     if (originFilePath) {
-      const failPath = path.join(workDir, Error_Files_Dir, fileName);
+      // const failPath = path.join(workDir, Error_Files_Dir, fileName);
+      const failPath = path.join("E:", Error_Files_Dir, fileName);
       // ensureDirSync(failPath)
 
       fs.copyFileSync(originFilePath, failPath);