From f27f8b01aa1c4369c3154ec1f16b221960cfea0b Mon Sep 17 00:00:00 2001 From: Mylloon Date: Sun, 19 Nov 2023 21:43:35 +0100 Subject: [PATCH] Support for files with only one audio track --- README.md | 1 + src/main.ts | 63 +++++++++++++++++++++++++++++++++++++++-------------- 2 files changed, 48 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index f5d181f..6f79356 100644 --- a/README.md +++ b/README.md @@ -41,6 +41,7 @@ Helper for sharing video captured by NVidia Shadowplay in Discord. - [x] If already under the limit, the file won't be compressed - [x] Nitro suppport via `/nitro` flag - [x] Merge all audio files into one track, while keeping the original ones (keeping track's title too) + - [x] Works with one-audio file too - [x] Support multiples files ## Package the app for Windows diff --git a/src/main.ts b/src/main.ts index 68597e0..8b68e10 100644 --- a/src/main.ts +++ b/src/main.ts @@ -57,10 +57,14 @@ app.whenReady().then(() => { /** Get filename of a path */ const getFilename = (filepath: string) => path.parse(filepath).base; - /** Merge all audios track of a video into one */ + /** Merge all audios track of a video into one + * In case video have only one track, silently pass */ const mergeAudio = async (file: string) => { + const copy = process.platform === "win32" ? "COPY" : "cp"; + const copyArg = process.platform === "win32" ? "/Y" : ""; + const tmpFile = getNewFilename(file, "TMP_"); - const outFile = getNewFilename(file, "(merged audio) "); + let outFile; // Merge 2 audio // See: https://trac.ffmpeg.org/wiki/AudioChannelManipulation#a2stereostereo @@ -70,22 +74,49 @@ app.whenReady().then(() => { -filter_complex "[0:a]amerge=inputs=2[a]" -ac 2 -map 0:v -map "[a]" \ -c:v copy \ "${tmpFile}"` - ).catch((e) => printAndDevTool(win, e)); + ) + .catch(async (e) => { + if ( + `${e}`.includes( + "Cannot find a matching stream for unlabeled input pad 1 on filter" + ) + ) { + // Only one audio in the file + outFile = getNewFilename(file, "(processed) "); - // Add merged audio as first position to original video and make it default - // About disposition: https://ffmpeg.org/ffmpeg.html#Main-options - // Also rename all tracks accordingly to what they are - await execute( - `"${ffmpegPath}" -y \ - -i "${tmpFile}" -i "${file}" \ - -map 0 -map 1:a -c:v copy \ - -disposition:a 0 -disposition:a:0 default \ - ${metadataAudio} \ - "${outFile}"` - ).catch((e) => printAndDevTool(win, e)); + // Do a copy + await execute(`${copy} "${file}" "${outFile}" ${copyArg}`).catch( + (e) => printAndDevTool(win, e) + ); - // Delete the temporary video file - deleteFile(tmpFile); + // We throw the error since we do not want to merge any audio + return Promise.resolve("skip"); + } else { + // Error handling + printAndDevTool(win, e); + } + }) + .then(async (val) => { + if (val == "skip") { + return; + } + + outFile = getNewFilename(file, "(merged audio) "); + // Add merged audio as first position to original video and make it default + // About disposition: https://ffmpeg.org/ffmpeg.html#Main-options + // Also rename all tracks accordingly to what they are + await execute( + `"${ffmpegPath}" -y \ + -i "${tmpFile}" -i "${file}" \ + -map 0 -map 1:a -c:v copy \ + -disposition:a 0 -disposition:a:0 default \ + ${metadataAudio} \ + "${outFile}"` + ).catch((e) => printAndDevTool(win, e)); + + // Delete the temporary video file + deleteFile(tmpFile); + }); const duration = getVideoDuration(outFile); const stats = statSync(outFile);