tools_batch_files 1.0.25 → 1.0.27

package/index.js

@@ -555,7 +555,7 @@ const task = async (row, index) => {
       logger(resData.data.code);
       logger(resData.data);
       //删除文件夹
-      // fs.rmdirSync(indexFilePath, { recursive: true });
+      fs.rmdirSync(indexFilePath, { recursive: true });
     } else {
       throw new Error("请求失败！" + resData.data.msg);
     }
@@ -573,7 +573,7 @@ const task = async (row, index) => {
     }
     logger("catch日志*********************************");
     disposeError(fileName);
-    // fs.rmdirSync(indexFilePath, { recursive: true });
+    fs.rmdirSync(indexFilePath, { recursive: true });
   }
 };
 

package/package.json

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

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";
@@ -38,7 +41,13 @@ const expandedName = ".jpg";
 const queueCount = 50;
 
 //起始任务下标
-let taskIndex = 123265;
+let taskIndex = 0;
+
+//重传的 上传进度
+const progressIndex = 0;
+
+//重传的总数
+const totals = 11874;
 
 const readExcel = (path) => {
   const workbook = XLSX.readFile(path);
@@ -59,7 +68,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 +77,7 @@ const logger = (log, hash, err) => {
 
 //错误日志
 const disposeError = (err) => {
-  logger("---任务失败---", err);
+  logger("---任务失败---" + err);
   logger(
     `******************************************************************end`
   );
@@ -376,6 +385,16 @@ const postData = (dataParams, indexFilePath) => {
   });
 };
 
+/**
+ * 上传失败后，存入新文件夹（手动创建）
+ */
+const moveFailFiles = (originFilePath, failPath) => {
+  if (originFilePath) {
+    fs.copyFileSync(originFilePath, failPath);
+    logger(`${originFilePath}上传失败，已移入错误文件夹！！！`);
+  }
+};
+
 /**
  * 任务
  */
@@ -408,8 +427,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} 不存在`);
@@ -451,9 +469,12 @@ const task = async (row, index) => {
     logger(`-------------------${new Date()}------------------`);
 
     if (resData.data.code === 200) {
+      progressIndex++;
       logger("请求成功！");
-      logger(resData.data.code);
-      console.log(resData.data);
+      logger(resData.data);
+      if(totals) {
+        logger(`任务进度：${progressIndex}/${totals}`);
+      }
       //删除文件夹
       fs.rmdirSync(indexFilePath, { recursive: true });
     } else {
@@ -473,6 +494,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 +519,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++;