tools_batch_files 1.0.4 → 1.0.5

package/index.js

@@ -7,10 +7,15 @@ const archiver = require("archiver");
 const axios = require("axios");
 const generateUniqueHash = require("./utils/index");
 
+//执行目录
+const exeDir = __dirname;
+//当前工作目录
+const workDir = process.cwd();
+
 // 表格目录
-const excelDir = path.join(__dirname, "excel", "excel.xlsx");
+const excelDir = path.join(workDir, "excel", "excel.xlsx");
 //水印
-const watermarkImage = path.join(process.cwd(), "imgs", "miz-watermark.png");
+const watermarkImage = path.join(__dirname, "imgs", "miz-watermark.png");
 // 截图数量
 const SCREENSHOT_COUNT = 5;
 const ORIGIN_FILE_DIR = "video";
@@ -129,7 +134,7 @@ function logFileSize(path) {
  * @returns Promise
  */
 const compressVideo = (fileName, outputFileDir, inputFilePath) => {
-  // const inputFilePath = path.join(__dirname, "video", fileName);
+  // const inputFilePath = path.join(workDir, "video", fileName);
   const outputFilePath = path.join(
     outputFileDir,
     ZIP_VIDEO_DIR,
@@ -287,7 +292,7 @@ const watermarkScreenshots = (indexFilePath) => {
  * 打包物料
  */
 const archiveZip = (fileName, inputPath) => {
-  const sourceVideoPath = path.join(__dirname, "video", fileName);
+  const sourceVideoPath = path.join(workDir, "video", fileName);
   const zipDir = path.join(inputPath, "zip");
 
   ensureDirSync(zipDir);
@@ -350,7 +355,7 @@ const archiveZip = (fileName, inputPath) => {
  * 获取 元数据
  */
 const getMetadata = async (fileName, indexFilePath) => {
-  const inputFilePath = path.join(__dirname, "video", fileName);
+  const inputFilePath = path.join(workDir, "video", fileName);
   //第一张截图
   const photoInputPath = path.join(
     indexFilePath,
@@ -426,16 +431,16 @@ const task = async (row, index) => {
   );
   // Excel的列名分别为： fileName title keyword
   const fileName = row.fileName;
-  // const originFilePath = path.join(__dirname, "video", fileName); // 源视频文件路径
+  // const originFilePath = path.join(workDir, "video", fileName); // 源视频文件路径
   const originFilePath = findFileInDir(
-    path.join(__dirname, ORIGIN_FILE_DIR),
+    path.join(workDir, ORIGIN_FILE_DIR),
     fileName
   ); // 源视频文件路径
   console.log("originFilePath");
   console.log(originFilePath);
 
   //index文件夹   output/0
-  const indexFilePath = path.join(__dirname, "output", index + "");
+  const indexFilePath = path.join(workDir, "output", index + "");
 
   try {
     await fs_asnyc.access(originFilePath, fs_asnyc.constants.F_OK);
@@ -472,8 +477,8 @@ const transitionExcelToJSON = () => {
   const hashOrigin = generateUniqueHash();
   const hash = hashOrigin.slice(0, 8);
   logger("任务开始---" + hash);
-  logger("当前目录： " + __dirname);
-  logger("工作目录： " + process.cwd());
+  logger("当前目录： " + workDir);
+  logger("工作目录： " + __dirname);
 
   const jsonData = readExcel(excelDir);
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tools_batch_files",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "批处理视频工具",
   "keywords": [
     "utils",
@@ -16,7 +16,7 @@
     "test": "echo \"Error: no test specified\" && exit 1",
     "start": "node index.js"
   },
-  "author": "z",
+  "author": "zephyr",
   "license": "ISC",
   "dependencies": {
     "archiver": "^7.0.1",