diff --git a/funi.ts b/funi.ts index 3a2b859..4c49a6b 100644 --- a/funi.ts +++ b/funi.ts @@ -720,14 +720,6 @@ async function downloadStreams(epsiode: FunimationMediaDownload){ if ( argv.novids ){ console.log('[INFO] Video not downloaded. Skip muxing video.'); } - - // mergers - if(!argv.mp4 && !mergerBin.MKVmerge){ - console.log('[WARN] MKVMerge not found...'); - } - if(!mergerBin.MKVmerge && !mergerBin.FFmpeg || argv.mp4 && !mergerBin.MKVmerge){ - console.log('[WARN] FFmpeg not found...'); - } const ffext = !argv.mp4 ? 'mkv' : 'mp4'; const mergeInstance = new merger({ @@ -747,7 +739,7 @@ async function downloadStreams(epsiode: FunimationMediaDownload){ skipSubMux: argv.skipSubMux }); - if(!argv.mp4 && mergerBin.MKVmerge){ + if(mergerBin.MKVmerge){ const command = mergeInstance.MkvMerge(); shlp.exec('mkvmerge', `"${mergerBin.MKVmerge}"`, command); } diff --git a/modules/module.merger.ts b/modules/module.merger.ts index 547c209..6f3e018 100644 --- a/modules/module.merger.ts +++ b/modules/module.merger.ts @@ -196,6 +196,7 @@ class Merger { } if (this.options.fonts && this.options.fonts.length > 0) { for (const f of this.options.fonts) { + console.log(f.path); args.push('--attachment-name', f.name); args.push('--attachment-mime-type', f.mime); args.push('--attach-file', f.path); @@ -212,24 +213,25 @@ class Merger { public static checkMerger(bin: { mkvmerge?: string, ffmpeg?: string - }, useMP4format: boolean) { - const merger: { - MKVmerge: undefined|string|false, - FFmpeg: undefined|string|false - } = { - MKVmerge: bin.mkvmerge, - FFmpeg: bin.ffmpeg, - }; - if( !useMP4format && !merger.MKVmerge ){ - console.log('[WARN] MKVMerge not found, skip using this...'); - merger.MKVmerge = false; + }, useMP4format: boolean) : { + MKVmerge?: string, + FFmpeg?: string + } { + if (useMP4format && bin.ffmpeg) { + return { + FFmpeg: bin.ffmpeg + } + } else if (!useMP4format && (bin.mkvmerge || bin.ffmpeg)) { + return { + MKVmerge: bin.mkvmerge, + FFmpeg: bin.ffmpeg + } + } else if (useMP4format) { + console.log('[WARN] FFmpeg not found, skip muxing...'); + } else if (!bin.mkvmerge) { + console.log('[WARN] MKVMerge not found, skip muxing...'); } - if( !merger.MKVmerge && !merger.FFmpeg || useMP4format && !merger.FFmpeg ){ - console.log('[WARN] FFmpeg not found, skip using this...'); - merger.FFmpeg = false; - } - return merger; - + return {}; } public static makeFontsList (fontsDir: string, subs: {