From 9633a2125060d2f2b8018e6ce4e955ae858d79dd Mon Sep 17 00:00:00 2001 From: Izuco <57068530+izu-co@users.noreply.github.com> Date: Mon, 12 Jul 2021 19:17:58 +0200 Subject: [PATCH] Added --allDubs and --allSubs options --- config/bin-path.yml | 2 +- modules/merger.js | 1 - modules/module.app-args.js | 24 +++++++++++++++++++++--- 3 files changed, 22 insertions(+), 5 deletions(-) diff --git a/config/bin-path.yml b/config/bin-path.yml index 039122d..6131ee9 100644 --- a/config/bin-path.yml +++ b/config/bin-path.yml @@ -1,2 +1,2 @@ -ffmpeg: "C:\\Program Files\\ffmpeg\\bin\\ffmpeg.exe" +ffmpeg: "./bin/ffmpeg/ffmpeg.exe" mkvmerge: "./bin/mkvtoolnix/mkvmerge.exe" diff --git a/modules/merger.js b/modules/merger.js index fd7050a..a67b0d0 100644 --- a/modules/merger.js +++ b/modules/merger.js @@ -94,7 +94,6 @@ const buildCommandMkvMerge = (videoAndAudio, onlyVid, onlyAudio, subtitles, outp } for (let vid of videoAndAudio) { - console.log(vid, vid.lang); if (!hasVideo) { args.push( '--video-tracks 0', diff --git a/modules/module.app-args.js b/modules/module.app-args.js index 8f11149..887eccf 100644 --- a/modules/module.app-args.js +++ b/modules/module.app-args.js @@ -9,6 +9,9 @@ const availableFilenameVars = [ 'height' ]; +const subLang = [ 'enUS', 'esLA', 'ptBR' ] +const dubLang = [ 'enUS', 'esLA', 'ptBR', 'zhMN', 'jaJP' ] + const appArgv = (cfg) => { // init const argv = yargs.parserConfiguration({ @@ -74,7 +77,7 @@ const appArgv = (cfg) => { .option('dub', { group: 'Downloading:', describe: 'Download non-Japanese Dub (English Dub mode by default)', - choices: [ 'enUS', 'esLA', 'ptBR', 'zhMN', 'jaJP' ], + choices: dubLang, default: cfg.dub || 'enUS', type: 'array', }) @@ -82,7 +85,7 @@ const appArgv = (cfg) => { group: 'Downloading:', describe: 'Set the subtitle language (English is default and fallback)', default: cfg.subLang || 'enUS', - choices: [ 'enUS', 'esLA', 'ptBR' ], + choices: subLang, type: 'array' }) .option('fontSize', { @@ -91,6 +94,18 @@ const appArgv = (cfg) => { default: cfg.fontSize || 55, type: 'number' }) + .option('allSubs', { + group: 'Downloading:', + describe: 'If set to true, all available subs will get downloaded', + default: false, + type: 'boolean' + }) + .option('allDubs', { + group: 'Downloading:', + describe: 'If set to true, all available dubs will get downloaded', + default: false, + type: 'boolean' + }) // simulcast .option('simul', { group: 'Downloading:', @@ -195,8 +210,11 @@ const appArgv = (cfg) => { // -- .argv; - // Resolve unwanted arrays + if (argv.allDubs) + argv.dub = dubLang + if (argv.allSubs) + argv.subLang = subLang for (let key in argv) { if (argv[key] instanceof Array && !(key === 'subLang' || key === 'dub')) { argv[key] = argv[key].pop();