OpenCloud
/
PeerTube
mirror of https://github.com/Chocobozzz/PeerTube
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix youtube-dl update with proxy

pull/4468/head
Chocobozzz 2021-10-15 08:32:06 +02:00
parent 1ffb5fb682
commit b3fc41a165
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
server/helpers/requests.ts
View File

@ -186,7 +186,8 @@ export {
doRequest, doRequest,
doJSONRequest, doJSONRequest,
doRequestAndSaveToFile, doRequestAndSaveToFile,
downloadImage downloadImage,
peertubeGot
} }
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------

8
server/helpers/youtube-dl.ts
View File

@ -1,6 +1,5 @@
import { createWriteStream } from 'fs' import { createWriteStream } from 'fs'
import { ensureDir, move, pathExists, remove, writeFile } from 'fs-extra' import { ensureDir, move, pathExists, remove, writeFile } from 'fs-extra'
import got from 'got'
import { join } from 'path' import { join } from 'path'
import { CONFIG } from '@server/initializers/config' import { CONFIG } from '@server/initializers/config'
import { HttpStatusCode } from '../../shared/models/http/http-error-codes' import { HttpStatusCode } from '../../shared/models/http/http-error-codes'
@ -9,6 +8,7 @@ import { CONSTRAINTS_FIELDS, VIDEO_CATEGORIES, VIDEO_LANGUAGES, VIDEO_LICENCES }
import { peertubeTruncate, pipelinePromise, root } from './core-utils' import { peertubeTruncate, pipelinePromise, root } from './core-utils'
import { isVideoFileExtnameValid } from './custom-validators/videos' import { isVideoFileExtnameValid } from './custom-validators/videos'
import { logger } from './logger' import { logger } from './logger'
import { peertubeGot } from './requests'
import { generateVideoImportTmpPath } from './utils' import { generateVideoImportTmpPath } from './utils'
export type YoutubeDLInfo = { export type YoutubeDLInfo = {
@ -343,7 +343,9 @@ class YoutubeDL {
await ensureDir(binDirectory) await ensureDir(binDirectory)
try { try {
const result = await got(url, { followRedirect: false }) const gotContext = { bodyKBLimit: 20_000 }
const result = await peertubeGot(url, { followRedirect: false, context: gotContext })
if (result.statusCode !== HttpStatusCode.FOUND_302) { if (result.statusCode !== HttpStatusCode.FOUND_302) {
logger.error('youtube-dl update error: did not get redirect for the latest version link. Status %d', result.statusCode) logger.error('youtube-dl update error: did not get redirect for the latest version link. Status %d', result.statusCode)
@ -353,7 +355,7 @@ class YoutubeDL {
const newUrl = result.headers.location const newUrl = result.headers.location
const newVersion = /\/(\d{4}\.\d\d\.\d\d(\.\d)?)\/youtube-dl$/.exec(newUrl)[1] const newVersion = /\/(\d{4}\.\d\d\.\d\d(\.\d)?)\/youtube-dl$/.exec(newUrl)[1]
const downloadFileStream = got.stream(newUrl) const downloadFileStream = peertubeGot.stream(newUrl, { context: gotContext })
const writeStream = createWriteStream(bin, { mode: 493 }) const writeStream = createWriteStream(bin, { mode: 493 })
await pipelinePromise( await pipelinePromise(