From 4f1f6f038389ce9cdf0c77dfccdc63efc6948101 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Thu, 16 Aug 2018 09:45:51 +0200 Subject: Ensure youtubedl binary exists in ydl helper --- .../lib/schedulers/youtube-dl-update-scheduler.ts | 71 ++++++++++++---------- 1 file changed, 40 insertions(+), 31 deletions(-) (limited to 'server/lib/schedulers/youtube-dl-update-scheduler.ts') diff --git a/server/lib/schedulers/youtube-dl-update-scheduler.ts b/server/lib/schedulers/youtube-dl-update-scheduler.ts index a2d919603..24cd3f87b 100644 --- a/server/lib/schedulers/youtube-dl-update-scheduler.ts +++ b/server/lib/schedulers/youtube-dl-update-scheduler.ts @@ -7,7 +7,7 @@ import { logger } from '../../helpers/logger' import * as request from 'request' import { createWriteStream, writeFile } from 'fs' import { join } from 'path' -import { root } from '../../helpers/core-utils' +import { mkdirpPromise, root } from '../../helpers/core-utils' export class YoutubeDlUpdateScheduler extends AbstractScheduler { @@ -20,49 +20,58 @@ export class YoutubeDlUpdateScheduler extends AbstractScheduler { } async execute () { + logger.info('Updating youtubeDL binary.') + const binDirectory = join(root(), 'node_modules', 'youtube-dl', 'bin') const bin = join(binDirectory, 'youtube-dl') const detailsPath = join(binDirectory, 'details') const url = 'https://yt-dl.org/downloads/latest/youtube-dl' - request.get(url, { followRedirect: false }, (err, res) => { - if (err) { - logger.error('Cannot update youtube-dl.', { err }) - return - } - - if (res.statusCode !== 302) { - logger.error('youtube-dl update error: did not get redirect for the latest version link. Status %d', res.statusCode) - return - } - - const url = res.headers.location - const downloadFile = request.get(url) - const newVersion = /yt-dl\.org\/downloads\/(\d{4}\.\d\d\.\d\d(\.\d)?)\/youtube-dl/.exec(url)[1] - - downloadFile.on('response', res => { - if (res.statusCode !== 200) { - logger.error('Cannot update youtube-dl: new version response is not 200, it\'s %d.', res.statusCode) - return + await mkdirpPromise(binDirectory) + + return new Promise(res => { + request.get(url, { followRedirect: false }, (err, result) => { + if (err) { + logger.error('Cannot update youtube-dl.', { err }) + return res() } - downloadFile.pipe(createWriteStream(bin, { mode: 493 })) - }) + if (result.statusCode !== 302) { + logger.error('youtube-dl update error: did not get redirect for the latest version link. Status %d', result.statusCode) + return res() + } - downloadFile.on('error', err => logger.error('youtube-dl update error.', { err })) + const url = result.headers.location + const downloadFile = request.get(url) + const newVersion = /yt-dl\.org\/downloads\/(\d{4}\.\d\d\.\d\d(\.\d)?)\/youtube-dl/.exec(url)[ 1 ] - downloadFile.on('end', () => { - const details = JSON.stringify({ version: newVersion, path: bin, exec: 'youtube-dl' }) - writeFile(detailsPath, details, { encoding: 'utf8' }, err => { - if (err) { - logger.error('youtube-dl update error: cannot write details.', { err }) - return + downloadFile.on('response', result => { + if (result.statusCode !== 200) { + logger.error('Cannot update youtube-dl: new version response is not 200, it\'s %d.', result.statusCode) + return res() } - logger.info('youtube-dl updated to version %s.', newVersion) + downloadFile.pipe(createWriteStream(bin, { mode: 493 })) }) - }) + downloadFile.on('error', err => { + logger.error('youtube-dl update error.', { err }) + return res() + }) + + downloadFile.on('end', () => { + const details = JSON.stringify({ version: newVersion, path: bin, exec: 'youtube-dl' }) + writeFile(detailsPath, details, { encoding: 'utf8' }, err => { + if (err) { + logger.error('youtube-dl update error: cannot write details.', { err }) + return res() + } + + logger.info('youtube-dl updated to version %s.', newVersion) + return res() + }) + }) + }) }) } -- cgit v1.2.3