improve output file name conflict handling

Last-Order · Oct 14, 2021 · cbde8f3 · cbde8f3
1 parent bf53249
commit cbde8f3
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 23 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "minyami",
-    "version": "4.4.4",
+    "version": "4.4.5",
     "description": "",
     "main": "dist/exports.js",
     "types": "dist/exports.d.ts",

diff --git a/src/core/archive.ts b/src/core/archive.ts
@@ -421,7 +421,7 @@ class ArchiveDownloader extends Downloader {
                 this.emit("finished");
             }
             muxer(this.outputFileList, this.outputPath)
-                .then(async () => {
+                .then(async (outputPath) => {
                     logger.info("End of merging.");
                     logger.info("Starting cleaning temporary files.");
                     try {
@@ -437,7 +437,7 @@ class ArchiveDownloader extends Downloader {
                         logger.warning("Fail to parse previous tasks, ignored.");
                         logger.warning(error.message);
                     }
-                    logger.info(`All finished. Check your file at [${path.resolve(this.outputPath)}] .`);
+                    logger.info(`All finished. Check your file at [${path.resolve(outputPath)}] .`);
                     this.emit("finished");
                 })
                 .catch(async (e) => {

diff --git a/src/core/downloader.ts b/src/core/downloader.ts
@@ -151,14 +151,6 @@ class Downloader extends EventEmitter {
             this.outputPath = output;
         }
 
-        if (fs.existsSync(this.outputPath)) {
-            // output filename conflict
-            const pathArr = this.outputPath.split(".");
-            const filePath = pathArr.slice(0, -1).join(".");
-            const ext = pathArr[pathArr.length - 1];
-            this.outputPath = `${filePath}_${Date.now()}.${ext}`;
-        }
-
         if (key) {
             this.key = key;
         }

diff --git a/src/core/live.ts b/src/core/live.ts
@@ -290,10 +290,10 @@ export default class LiveDownloader extends Downloader {
             logger.info(`${this.finishedChunkCount} chunks downloaded. Start merging chunks.`);
             const muxer = this.format === "ts" ? mergeToTS : mergeToMKV;
             muxer(this.outputFileList, this.outputPath)
-                .then(async () => {
+                .then(async (outputPath) => {
                     logger.info("End of merging.");
                     await this.clean();
-                    logger.info(`All finished. Check your file at [${path.resolve(this.outputPath)}] .`);
+                    logger.info(`All finished. Check your file at [${path.resolve(outputPath)}] .`);
                     this.emit("finished");
                 })
                 .catch((e) => {

diff --git a/src/utils/common.ts b/src/utils/common.ts
@@ -1,4 +1,5 @@
 import { URL } from "url";
+import * as fs from "fs";
 
 class CommonUtils {
     static buildFullUrl(host: string, path: string) {
@@ -7,6 +8,16 @@ class CommonUtils {
         }
         return new URL(path, host).href;
     }
+    static getAvailableOutputPath(path: string) {
+        if (fs.existsSync(path)) {
+            // output filename conflict
+            const pathArr = path.split(".");
+            const filePath = pathArr.slice(0, -1).join(".");
+            const ext = pathArr[pathArr.length - 1];
+            return `${filePath}_${Date.now()}.${ext}`;
+        }
+        return path;
+    }
 }
 
 export default CommonUtils;
diff --git a/src/utils/media.ts b/src/utils/media.ts
@@ -4,40 +4,42 @@ import * as crypto from "crypto";
 import axios, { AxiosRequestConfig, AxiosResponse } from "axios";
 import { exec } from "./system";
 import ProxyAgentHelper from "../utils/agent";
-import UA from "../constants/ua";
+import CommonUtils from "./common";
 
 /**
  * 合并视频文件
  * @param fileList 文件列表
  * @param output 输出路径
  */
 export function mergeToMKV(fileList = [], output = "./output.mkv") {
-    return new Promise<void>(async (resolve) => {
+    const outputPath = CommonUtils.getAvailableOutputPath(output);
+    return new Promise<string>(async (resolve) => {
         if (fileList.length === 0) {
             return;
         }
         fileList = fileList.map((file, index) => {
             return index === 0 ? file : `+${file}`;
         });
 
-        const parameters = fileList.concat(["-o", output, "-q"]);
+        const parameters = fileList.concat(["-o", outputPath, "-q"]);
 
         const tempFilename = `temp_${new Date().valueOf()}.json`;
         fs.writeFileSync(`./${tempFilename}`, JSON.stringify(parameters, null, 2));
         await exec(`mkvmerge @${tempFilename}`);
         fs.unlinkSync(`./${tempFilename}`);
-        resolve();
+        resolve(outputPath);
     });
 }
 
 export function mergeToTS(fileList = [], output = "./output.ts") {
     const cliProgress = require("cli-progress");
-    return new Promise<void>(async (resolve) => {
+    const outputPath = CommonUtils.getAvailableOutputPath(output);
+    return new Promise<string>(async (resolve) => {
         if (fileList.length === 0) {
-            resolve();
+            resolve(outputPath);
         }
 
-        const writeStream = fs.createWriteStream(output);
+        const writeStream = fs.createWriteStream(outputPath);
         const lastIndex = fileList.length - 1;
         const bar = new cliProgress.SingleBar(
             {
@@ -57,7 +59,7 @@ export function mergeToTS(fileList = [], output = "./output.ts") {
                         bar.update(i);
                         bar.stop();
                         writeStream.end();
-                        resolve();
+                        resolve(outputPath);
                     }
                 });
                 bar.update(i);