diff options
author | Chocobozzz <me@florianbigard.com> | 2018-09-19 16:24:24 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2018-09-19 16:24:24 +0200 |
commit | 606c946e74211c4123b16087288902226306198d (patch) | |
tree | c4dc467d6a4b571f5076915a734058e42d72b77d /server/helpers/youtube-dl.ts | |
parent | f9f899b9f803eb5159a67781f10649a0cf040677 (diff) | |
download | PeerTube-606c946e74211c4123b16087288902226306198d.tar.gz PeerTube-606c946e74211c4123b16087288902226306198d.tar.zst PeerTube-606c946e74211c4123b16087288902226306198d.zip |
Move youtubeDL upgrader in helpers/
Diffstat (limited to 'server/helpers/youtube-dl.ts')
-rw-r--r-- | server/helpers/youtube-dl.ts | 69 |
1 files changed, 66 insertions, 3 deletions
diff --git a/server/helpers/youtube-dl.ts b/server/helpers/youtube-dl.ts index 6738090f3..db2bddf78 100644 --- a/server/helpers/youtube-dl.ts +++ b/server/helpers/youtube-dl.ts | |||
@@ -2,7 +2,11 @@ import { truncate } from 'lodash' | |||
2 | import { CONSTRAINTS_FIELDS, VIDEO_CATEGORIES } from '../initializers' | 2 | import { CONSTRAINTS_FIELDS, VIDEO_CATEGORIES } from '../initializers' |
3 | import { logger } from './logger' | 3 | import { logger } from './logger' |
4 | import { generateVideoTmpPath } from './utils' | 4 | import { generateVideoTmpPath } from './utils' |
5 | import { YoutubeDlUpdateScheduler } from '../lib/schedulers/youtube-dl-update-scheduler' | 5 | import { join } from 'path' |
6 | import { root } from './core-utils' | ||
7 | import { ensureDir, writeFile } from 'fs-extra' | ||
8 | import * as request from 'request' | ||
9 | import { createWriteStream } from 'fs' | ||
6 | 10 | ||
7 | export type YoutubeDLInfo = { | 11 | export type YoutubeDLInfo = { |
8 | name?: string | 12 | name?: string |
@@ -40,7 +44,7 @@ function downloadYoutubeDLVideo (url: string) { | |||
40 | 44 | ||
41 | return new Promise<string>(async (res, rej) => { | 45 | return new Promise<string>(async (res, rej) => { |
42 | const youtubeDL = await safeGetYoutubeDL() | 46 | const youtubeDL = await safeGetYoutubeDL() |
43 | youtubeDL.exec(url, options, async (err, output) => { | 47 | youtubeDL.exec(url, options, err => { |
44 | if (err) return rej(err) | 48 | if (err) return rej(err) |
45 | 49 | ||
46 | return res(path) | 50 | return res(path) |
@@ -48,9 +52,68 @@ function downloadYoutubeDLVideo (url: string) { | |||
48 | }) | 52 | }) |
49 | } | 53 | } |
50 | 54 | ||
55 | // Thanks: https://github.com/przemyslawpluta/node-youtube-dl/blob/master/lib/downloader.js | ||
56 | // We rewrote it to avoid sync calls | ||
57 | async function updateYoutubeDLBinary () { | ||
58 | logger.info('Updating youtubeDL binary.') | ||
59 | |||
60 | const binDirectory = join(root(), 'node_modules', 'youtube-dl', 'bin') | ||
61 | const bin = join(binDirectory, 'youtube-dl') | ||
62 | const detailsPath = join(binDirectory, 'details') | ||
63 | const url = 'https://yt-dl.org/downloads/latest/youtube-dl' | ||
64 | |||
65 | await ensureDir(binDirectory) | ||
66 | |||
67 | return new Promise(res => { | ||
68 | request.get(url, { followRedirect: false }, (err, result) => { | ||
69 | if (err) { | ||
70 | logger.error('Cannot update youtube-dl.', { err }) | ||
71 | return res() | ||
72 | } | ||
73 | |||
74 | if (result.statusCode !== 302) { | ||
75 | logger.error('youtube-dl update error: did not get redirect for the latest version link. Status %d', result.statusCode) | ||
76 | return res() | ||
77 | } | ||
78 | |||
79 | const url = result.headers.location | ||
80 | const downloadFile = request.get(url) | ||
81 | const newVersion = /yt-dl\.org\/downloads\/(\d{4}\.\d\d\.\d\d(\.\d)?)\/youtube-dl/.exec(url)[ 1 ] | ||
82 | |||
83 | downloadFile.on('response', result => { | ||
84 | if (result.statusCode !== 200) { | ||
85 | logger.error('Cannot update youtube-dl: new version response is not 200, it\'s %d.', result.statusCode) | ||
86 | return res() | ||
87 | } | ||
88 | |||
89 | downloadFile.pipe(createWriteStream(bin, { mode: 493 })) | ||
90 | }) | ||
91 | |||
92 | downloadFile.on('error', err => { | ||
93 | logger.error('youtube-dl update error.', { err }) | ||
94 | return res() | ||
95 | }) | ||
96 | |||
97 | downloadFile.on('end', () => { | ||
98 | const details = JSON.stringify({ version: newVersion, path: bin, exec: 'youtube-dl' }) | ||
99 | writeFile(detailsPath, details, { encoding: 'utf8' }, err => { | ||
100 | if (err) { | ||
101 | logger.error('youtube-dl update error: cannot write details.', { err }) | ||
102 | return res() | ||
103 | } | ||
104 | |||
105 | logger.info('youtube-dl updated to version %s.', newVersion) | ||
106 | return res() | ||
107 | }) | ||
108 | }) | ||
109 | }) | ||
110 | }) | ||
111 | } | ||
112 | |||
51 | // --------------------------------------------------------------------------- | 113 | // --------------------------------------------------------------------------- |
52 | 114 | ||
53 | export { | 115 | export { |
116 | updateYoutubeDLBinary, | ||
54 | downloadYoutubeDLVideo, | 117 | downloadYoutubeDLVideo, |
55 | getYoutubeDLInfo | 118 | getYoutubeDLInfo |
56 | } | 119 | } |
@@ -64,7 +127,7 @@ async function safeGetYoutubeDL () { | |||
64 | youtubeDL = require('youtube-dl') | 127 | youtubeDL = require('youtube-dl') |
65 | } catch (e) { | 128 | } catch (e) { |
66 | // Download binary | 129 | // Download binary |
67 | await YoutubeDlUpdateScheduler.Instance.execute() | 130 | await updateYoutubeDLBinary() |
68 | youtubeDL = require('youtube-dl') | 131 | youtubeDL = require('youtube-dl') |
69 | } | 132 | } |
70 | 133 | ||