tools_batch_files 1.0.26 → 1.0.28

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.26",
+  "version": "1.0.28",
   "description": "批处理视频工具",
   "keywords": [
     "utils",

package/src/photoBatch.js

@@ -19,7 +19,7 @@ const excelDir = path.join(workDir, "excel", "excel.xlsx");
 //水印
 const watermarkImage = path.join(__dirname, "..", "imgs", "picWater.png");
 
-//拷贝 - 存放上传失败的文件 
+//拷贝 - 存放上传失败的文件
 const Error_Files_Dir = "failed_photos";
 
 // 截图数量
@@ -41,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);
@@ -463,11 +469,18 @@ const task = async (row, index) => {
     logger(`-------------------${new Date()}------------------`);
 
     if (resData.data.code === 200) {
+      progressIndex++;
       logger("请求成功！");
-      logger(resData.data.code);
       logger(resData.data);
+      if (totals) {
+        logger(`任务进度：${progressIndex}/${totals}`);
+      }
       //删除文件夹
       fs.rmdirSync(indexFilePath, { recursive: true });
+    } else if (resData.data.code === 300) {
+      //不捕获此错误
+      logger(`第${index}条文件-${index}重复上传！`);
+      fs.rmdirSync(indexFilePath, { recursive: true });
     } else {
       throw new Error("请求失败！" + resData.data.msg);
     }