tools_batch_files 1.0.8 → 1.0.9

package/README.md

@@ -42,5 +42,4 @@
 
 ## 3.下个版本的优化点
 - 尝试在内存中处理 stream
-- 上传成功后删除相关文件
-- 新增400p的预览视频
+- 上传成功后删除相关文件

package/index.js

@@ -6,6 +6,7 @@ const fs_asnyc = require("fs").promises;
 const archiver = require("archiver");
 const axios = require("axios");
 const generateUniqueHash = require("./utils/index");
+const FormData = require("form-data");
 
 //执行目录
 const exeDir = __dirname;
@@ -25,11 +26,12 @@ const SCREENSHOT_DIR = "screenshots";
 const ZIP_WATERMARK_VIDEO_DIR = "zip_watermark_video";
 const ZIP_SCREENSHOT_DIR = "screenshot_watermark";
 const SOURCE_VIDEO_DIR = "source_video";
+const ZIP_FILES_DIR = "zip";
 
 //并发数量
 const queueCount = 1;
 
-//任务开始序列
+//起始任务下标
 let taskIndex = 0;
 
 /**
@@ -160,7 +162,7 @@ const compressVideo = (fileName, outputFileDir, inputFilePath) => {
         resolve(outputFilePath);
       })
       .on("error", (err) => {
-        logger("视频压缩出错:", err);
+        logger("视频压缩出错:" + err);
         reject(err);
       })
       .run();
@@ -181,6 +183,8 @@ const compressVideo400p = (fileName, outputFileDir, inputFilePath) => {
   ensureDirSync(path.dirname(outputFilePath));
   return new Promise((resolve, reject) => {
     comand
+      .seekInput(0)
+      .inputOptions("-t 10")
       .videoCodec("libx264")
       .size("400x?")
 
@@ -329,10 +333,13 @@ const watermarkScreenshots = (indexFilePath) => {
 const archiveZip = (fileName, inputPath) => {
   const sourceVideoPath = path.join(workDir, "video", fileName);
   const zipDir = path.join(inputPath, "zip");
+  const timestamp = new Date().getTime();
 
   ensureDirSync(zipDir);
   // create a file to stream archive data to.
-  const zipStream = fs.createWriteStream(path.join(zipDir, "package.zip"));
+  const zipStream = fs.createWriteStream(
+    path.join(zipDir, `package${timestamp}.zip`)
+  );
   const archive = archiver("zip", {
     zlib: { level: 9 }, // Sets the compression level.
   });
@@ -371,7 +378,7 @@ const archiveZip = (fileName, inputPath) => {
       SCREENSHOT_DIR,
       ZIP_WATERMARK_VIDEO_DIR,
       ZIP_SCREENSHOT_DIR,
-      ZIP_VIDEO_DIR_400
+      ZIP_VIDEO_DIR_400,
     ];
 
     directories.forEach((dir) => {
@@ -390,7 +397,11 @@ const archiveZip = (fileName, inputPath) => {
 /**
  * 获取 元数据
  */
-const getMetadata = async (fileName, indexFilePath) => {
+const getMetadata = async (
+  fileName,
+  indexFilePath,
+  { rowFileName, title, keyword }
+) => {
   const inputFilePath = path.join(workDir, "video", fileName);
   //第一张截图
   const photoInputPath = path.join(
@@ -402,14 +413,25 @@ const getMetadata = async (fileName, indexFilePath) => {
   const videoMetadataComand = ffmpeg(inputFilePath);
   const photoMetadataComand = ffmpeg(photoInputPath);
   const metaDataParams = {
-    videoWidth: "",
-    videoHeight: "",
-    videoSize: "",
-    videoDuration: "",
-    videoId: "",
-    pr: "",
-    photoWidth: "",
-    photoHeight: "",
+    userid: 1003,
+    username: "美好景象",
+    pixel_width: "",
+    pixel_height: "",
+    size: "",
+    duration: "",
+    video_id: rowFileName,
+    title,
+    keyword,
+    pr: 90,
+    format: "mp4",
+    category_id: 4,
+    demand_kind: 23,
+    source_from: 71,
+    plate_id: 5,
+    tag_id: 158,
+    is_government: 0,
+    preview_width: "",
+    preview_height: "",
   };
   await new Promise((resolve, reject) => {
     videoMetadataComand.ffprobe(function (err, metadata) {
@@ -418,10 +440,10 @@ const getMetadata = async (fileName, indexFilePath) => {
       );
       const formatStream = metadata.format;
 
-      metaDataParams.videoWidth = videoStream.width;
-      metaDataParams.videoHeight = videoStream.height;
-      metaDataParams.videoDuration = videoStream.duration;
-      metaDataParams.videoSize = formatStream.size;
+      metaDataParams.pixel_width = videoStream.width;
+      metaDataParams.pixel_height = videoStream.height;
+      metaDataParams.duration = videoStream.duration;
+      metaDataParams.size = formatStream.size;
       resolve();
     });
   });
@@ -432,8 +454,8 @@ const getMetadata = async (fileName, indexFilePath) => {
         (s) => s.codec_type === "video"
       );
 
-      metaDataParams.photoWidth = photoStream.width;
-      metaDataParams.photoHeight = photoStream.height;
+      metaDataParams.preview_width = photoStream.width;
+      metaDataParams.preview_height = photoStream.height;
       resolve();
     });
   });
@@ -444,18 +466,30 @@ const getMetadata = async (fileName, indexFilePath) => {
 /**
  * 接口
  */
-const postData = (data) => {
+const postData = (dataParams, indexFilePath) => {
+  const formData = new FormData();
+  //风险：确保文件夹中只要一个zip文件，（因为时间戳，老的文件不会被覆盖）
+  const zipFiles = fs
+    .readdirSync(path.join(indexFilePath, ZIP_FILES_DIR))
+    .find((file) => file.endsWith(".zip"));
+
+  const packageZip = path.join(indexFilePath, ZIP_FILES_DIR, zipFiles);
+
+  formData.append("file", fs.createReadStream(packageZip));
+  for (const key in dataParams) {
+    if (Object.hasOwnProperty.call(dataParams, key)) {
+      const value = dataParams[key];
+      formData.append(key, value);
+    }
+  }
+
   logger("等待接口返回结果……");
 
-  return axios.post(
-    "https://designer-api.51miz.com/designer/CallBack/uploadVideoData",
-    data,
-    {
-      headers: {
-        "Content-Type": "multipart/form-data",
-      },
-    }
-  );
+  return axios.post("http://192.168.101.149:9999/upload/video", formData, {
+    headers: {
+      "Content-Type": "multipart/form-data",
+    },
+  });
 };
 
 /**
@@ -466,13 +500,22 @@ const task = async (row, index) => {
     "**************************" + row.fileName + "**************************"
   );
   // Excel的列名分别为： fileName title keyword
-  const fileName = row.fileName;
-  // const originFilePath = path.join(workDir, "video", fileName); // 源视频文件路径
+  // 表格中文件名无后缀，遂手动添加写死为mp4
+  let fileName = row.fileName;
+  const rowFileName = row.fileName;
+  const title = row.title;
+  const keyword = row.keyword;
+
+  if (!fileName.includes(".")) {
+    fileName = row.fileName + ".mp4";
+  }
+
+  // 源视频文件路径
   const originFilePath = findFileInDir(
     path.join(workDir, ORIGIN_FILE_DIR),
     fileName
-  ); // 源视频文件路径
-  console.log("originFilePath");
+  );
+  console.log("源视频文件路径");
   console.log(originFilePath);
 
   //index文件夹   output/0
@@ -487,20 +530,27 @@ const task = async (row, index) => {
     await watermarkVideo(fileName, indexFilePath);
     await watermarkScreenshots(indexFilePath);
     await archiveZip(fileName, indexFilePath);
-    const dataParams = await getMetadata(fileName, indexFilePath);
-    console.log("dataParams");
+    const dataParams = await getMetadata(fileName, indexFilePath, {
+      rowFileName,
+      title,
+      keyword,
+    });
+    console.log("dataParams参数");
     console.log(dataParams);
 
-    // await postData(dataParams);
+    const resData = await postData(dataParams, indexFilePath);
+    logger(resData.data);
     logger(
       `----------------------------------------第${index}条结束---------------------------------end`
     );
+
   } catch (error) {
     // 可以约定code，来表示不同的错误信息
     if (error.code === "ENOENT") {
       logger(`视频文件 ${fileName} 不存在`);
     } else {
-      logger("视频处理失败", error.message);
+      logger("视频处理失败：");
+      logger(error);
     }
     disposeError(hash, fileName);
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tools_batch_files",
-  "version": "1.0.8",
+  "version": "1.0.9",
   "description": "批处理视频工具",
   "keywords": [
     "utils",
@@ -10,11 +10,13 @@
   ],
   "main": "index.js",
   "bin": {
-    "tbf": "index.js"
+    "tbf": "./index.js"
   },
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
-    "start": "node index.js"
+    "start": "node index.js",
+    "batch-video": "node index.js",
+    "batch-photo": "node src/photoBatch.js"
   },
   "author": "zephyr",
   "license": "ISC",