tools_batch_files 1.0.10 → 1.0.12

package/index.js

@@ -331,8 +331,7 @@ const watermarkScreenshots = (indexFilePath) => {
 /**
  * 打包物料
  */
-const archiveZip = (fileName, inputPath) => {
-  const sourceVideoPath = path.join(workDir, "video", fileName);
+const archiveZip = (fileName, inputPath, originFilePath) => {
   const zipDir = path.join(inputPath, "zip");
   const timestamp = new Date().getTime();
 
@@ -387,7 +386,7 @@ const archiveZip = (fileName, inputPath) => {
       archive.directory(dirPath, dir);
     });
 
-    archive.file(sourceVideoPath, {
+    archive.file(originFilePath, {
       name: path.join(SOURCE_VIDEO_DIR, fileName),
     });
     // 完成归档
@@ -401,9 +400,9 @@ const archiveZip = (fileName, inputPath) => {
 const getMetadata = async (
   fileName,
   indexFilePath,
+  originFilePath,
   { rowFileName, title, keyword }
 ) => {
-  const inputFilePath = path.join(workDir, "video", fileName);
   //第一张截图
   const photoInputPath = path.join(
     indexFilePath,
@@ -411,7 +410,7 @@ const getMetadata = async (
     "screenshots-1.png"
   );
 
-  const videoMetadataComand = ffmpeg(inputFilePath);
+  const videoMetadataComand = ffmpeg(originFilePath);
   const photoMetadataComand = ffmpeg(photoInputPath);
   const metaDataParams = {
     userid: 1003,
@@ -516,8 +515,8 @@ const task = async (row, index) => {
     path.join(workDir, ORIGIN_FILE_DIR),
     fileName
   );
-  console.log("源视频文件路径");
-  console.log(originFilePath);
+  logger("源视频文件路径");
+  logger(originFilePath);
 
   //index文件夹   output/0
   const indexFilePath = path.join(workDir, "output", index + "");
@@ -530,12 +529,17 @@ const task = async (row, index) => {
     await get5Screenshots(fileName, indexFilePath, originFilePath);
     await watermarkVideo(fileName, indexFilePath);
     await watermarkScreenshots(indexFilePath);
-    await archiveZip(fileName, indexFilePath);
-    const dataParams = await getMetadata(fileName, indexFilePath, {
-      rowFileName,
-      title,
-      keyword,
-    });
+    await archiveZip(fileName, indexFilePath, originFilePath);
+    const dataParams = await getMetadata(
+      fileName,
+      indexFilePath,
+      originFilePath,
+      {
+        rowFileName,
+        title,
+        keyword,
+      }
+    );
     console.log("dataParams参数");
     console.log(dataParams);
 
@@ -544,7 +548,6 @@ const task = async (row, index) => {
     logger(
       `----------------------------------------第${index}条结束---------------------------------end`
     );
-
   } catch (error) {
     // 可以约定code，来表示不同的错误信息
     if (error.code === "ENOENT") {

package/package.json

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