X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Flib%2Fschedulers%2Fyoutube-dl-update-scheduler.ts;h=898691c13279dfb57169005ea1643f55358aa097;hb=fd6a74a83594bfb59e28bf9cae71a39884ebcc2f;hp=b736f17ee19961f5b763ec1f1811bcb74ce3a6a5;hpb=ce32426be941164d041526e4748b4c83cdc6bf1c;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/lib/schedulers/youtube-dl-update-scheduler.ts b/server/lib/schedulers/youtube-dl-update-scheduler.ts index b736f17ee..898691c13 100644 --- a/server/lib/schedulers/youtube-dl-update-scheduler.ts +++ b/server/lib/schedulers/youtube-dl-update-scheduler.ts @@ -1,13 +1,6 @@ -// Thanks: https://github.com/przemyslawpluta/node-youtube-dl/blob/master/lib/downloader.js -// Use rewrote it to avoid sync calls - +import { YoutubeDL } from '@server/helpers/youtube-dl' +import { SCHEDULER_INTERVALS_MS } from '../../initializers/constants' import { AbstractScheduler } from './abstract-scheduler' -import { SCHEDULER_INTERVALS_MS } from '../../initializers' -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' export class YoutubeDlUpdateScheduler extends AbstractScheduler { @@ -19,51 +12,8 @@ export class YoutubeDlUpdateScheduler extends AbstractScheduler { super() } - async execute () { - 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 - } - - downloadFile.pipe(createWriteStream(bin, { mode: 493 })) - }) - - downloadFile.on('error', err => logger.error('youtube-dl update error.', { err })) - - 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 - } - - logger.info('youtube-dl updated to version %s.', newVersion) - }) - }) - - }) + protected internalExecute () { + return YoutubeDL.updateYoutubeDLBinary() } static get Instance () {