fix #456 catching errors in import-videos (#457)

pull/462/head
memorybox 2018-04-03 02:28:25 +08:00 committed by Rigel Kent
parent f209b32afa
commit f97d299230
1 changed files with 13 additions and 8 deletions

View File

@ -76,7 +76,6 @@ async function run () {
await processVideo(info, program['language'])
}
// https://www.youtube.com/watch?v=2Upx39TBc1s
console.log('I\'m finished!')
process.exit(0)
})
@ -103,15 +102,21 @@ function processVideo (info: any, languageCode: number) {
console.log('Downloading video "%s"...', videoInfo.title)
const options = [ '-f', 'bestvideo[ext=mp4]+bestaudio[ext=m4a]/best', '-o', path ]
youtubeDL.exec(videoInfo.url, options, processOptions, async (err, output) => {
if (err) return console.error(err)
console.log(output.join('\n'))
await uploadVideoOnPeerTube(normalizeObject(videoInfo), path, languageCode)
try {
youtubeDL.exec(videoInfo.url, options, processOptions, async (err, output) => {
if (err) {
console.error(err)
return res()
}
console.log(output.join('\n'))
await uploadVideoOnPeerTube(normalizeObject(videoInfo), path, languageCode)
return res()
})
} catch (err) {
console.log(err.message)
return res()
})
}
})
}