Skip to content

Do not directly or unconditionally output to the console #160

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Do not directly or unconditionally output to the console #160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1e9f3e7
use logging function and do not output directly to console
rse Apr 17, 2024
7fc53fe
do not unconditionally output to console
rse Apr 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion lib/extract-video-frames.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ module.exports = (opts) => {
const {
videoPath,
framePattern,
log,
verbose = false
} = opts

Expand All @@ -17,7 +18,7 @@ module.exports = (opts) => {
'-start_number', '0'
])
.output(framePattern)
.on('start', (cmd) => console.log({ cmd }))
.on('start', (cmd) => log({ cmd }))
.on('end', () => resolve(framePattern))
.on('error', (err) => reject(err))

Expand Down
33 changes: 22 additions & 11 deletions lib/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,12 @@ module.exports = async (opts) => {

const temp = tempDir || tempy.directory()

console.time('ffmpeg-concat')
if (verbose)
console.time('ffmpeg-concat')

try {
console.time('init-frames')
if (verbose)
console.time('init-frames')
const {
frames,
scenes,
Expand All @@ -52,9 +54,11 @@ module.exports = async (opts) => {
renderAudio: !audio,
verbose
})
console.timeEnd('init-frames')
if (verbose)
console.timeEnd('init-frames')

console.time('render-frames')
if (verbose)
console.time('render-frames')
const framePattern = await renderFrames({
log,
concurrency,
Expand All @@ -66,9 +70,11 @@ module.exports = async (opts) => {
log(`render ${(100 * p).toFixed()}%`)
}
})
console.timeEnd('render-frames')
if (verbose)
console.timeEnd('render-frames')

console.time('render-audio')
if (verbose)
console.time('render-audio')
let concatAudioFile = audio
if (!audio && scenes.filter(s => s.sourceAudioPath).length === scenes.length) {
concatAudioFile = await renderAudio({
Expand All @@ -78,9 +84,11 @@ module.exports = async (opts) => {
fileName: 'audioConcat.mp3'
})
}
console.timeEnd('render-audio')
if (verbose)
console.timeEnd('render-audio')

console.time('transcode-video')
if (verbose)
console.time('transcode-video')
await transcodeVideo({
args,
log,
Expand All @@ -94,19 +102,22 @@ module.exports = async (opts) => {
log(`transcode ${(100 * p).toFixed()}%`)
}
})
console.timeEnd('transcode-video')
if (verbose)
console.timeEnd('transcode-video')
} catch (err) {
if (cleanupFrames) {
await rmfr(temp)
}

console.timeEnd('ffmpeg-concat')
if (verbose)
console.timeEnd('ffmpeg-concat')
throw err
}

if (cleanupFrames && !tempDir) {
await rmfr(temp)
}

console.timeEnd('ffmpeg-concat')
if (verbose)
console.timeEnd('ffmpeg-concat')
}