yetangitu/Peertube
1
0
Fork 0
mirror of https://github.com/Chocobozzz/PeerTube.git synced 2025-10-06 03:50:26 +02:00
Code Issues Releases Wiki Activity

Update server dependencies

Browse source
This commit is contained in:
Chocobozzz 2024-06-21 14:32:25 +02:00
parent 4ff7880584
commit a722194809
No known key found for this signature in database
GPG key ID: 583A612D890159BE
7 changed files with 2988 additions and 2702 deletions
Download patch file Download diff file Expand all files Collapse all files

16
server/core/helpers/youtube-dl/youtube-dl-cli.ts
View file

@ -1,4 +1,4 @@
import { execa, NodeOptions as ExecaNodeOptions } from 'execa'
import { execa, Options as ExecaNodeOptions } from 'execa'
import { ensureDir, pathExists } from 'fs-extra/esm'
import { writeFile } from 'fs/promises'
import { OptionsOfBufferResponseBody } from 'got'
@ -9,6 +9,8 @@ import { logger, loggerTagsFactory } from '../logger.js'
import { getProxy, isProxyEnabled } from '../proxy.js'
import { isBinaryResponse, peertubeGot } from '../requests.js'
type ProcessOptions = Pick<ExecaNodeOptions, 'cwd' | 'maxBuffer'>
const lTags = loggerTagsFactory('youtube-dl')
const youtubeDLBinaryPath = join(CONFIG.STORAGE.BIN_DIR, CONFIG.IMPORT.VIDEOS.HTTP.YOUTUBE_DL_RELEASE.NAME)
@ -111,7 +113,7 @@ export class YoutubeDLCLI {
url: string
format: string
output: string
processOptions: ExecaNodeOptions
processOptions: ProcessOptions
timeout?: number
additionalYoutubeDLArgs?: string[]
}) {
@ -129,7 +131,7 @@ export class YoutubeDLCLI {
async getInfo (options: {
url: string
format: string
processOptions: ExecaNodeOptions
processOptions: ProcessOptions
additionalYoutubeDLArgs?: string[]
}) {
const { url, format, additionalYoutubeDLArgs = [], processOptions } = options
@ -149,7 +151,7 @@ export class YoutubeDLCLI {
async getListInfo (options: {
url: string
latestVideosCount?: number
processOptions: ExecaNodeOptions
processOptions: ProcessOptions
}): Promise<{ upload_date: string, webpage_url: string }[]> {
const additionalYoutubeDLArgs = [ '--skip-download', '--playlist-reverse' ]
@ -178,7 +180,7 @@ export class YoutubeDLCLI {
async getSubs (options: {
url: string
format: 'vtt'
processOptions: ExecaNodeOptions
processOptions: ProcessOptions
}) {
const { url, format, processOptions } = options
@ -204,7 +206,7 @@ export class YoutubeDLCLI {
url: string
args: string[]
timeout?: number
processOptions: ExecaNodeOptions
processOptions: ProcessOptions
}) {
const { url, args, timeout, processOptions } = options
@ -216,7 +218,7 @@ export class YoutubeDLCLI {
const subProcess = execa(PYTHON_PATH, [ youtubeDLBinaryPath, ...completeArgs, url ], processOptions)
if (timeout) {
setTimeout(() => subProcess.cancel(), timeout)
setTimeout(() => subProcess.kill(), timeout)
}
const output = await subProcess