diff options
author | Florent <florent.git@zeteo.me> | 2022-01-09 17:21:45 +0100 |
---|---|---|
committer | Chocobozzz <chocobozzz@cpy.re> | 2022-01-10 10:01:43 +0100 |
commit | 22c777863088f90c7f3f9df613b42952abab856d (patch) | |
tree | 4598391136ce36e8f94cd95604fe4aa80c4bb831 /server | |
parent | f332d502d5d6a6c7ab62199c8b45f24e488f48e7 (diff) | |
download | PeerTube-22c777863088f90c7f3f9df613b42952abab856d.tar.gz PeerTube-22c777863088f90c7f3f9df613b42952abab856d.tar.zst PeerTube-22c777863088f90c7f3f9df613b42952abab856d.zip |
Give the ability to define python path for youtube-dl / yt-dlp
Diffstat (limited to 'server')
-rw-r--r-- | server/helpers/youtube-dl/youtube-dl-cli.ts | 3 | ||||
-rw-r--r-- | server/initializers/config.ts | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/server/helpers/youtube-dl/youtube-dl-cli.ts b/server/helpers/youtube-dl/youtube-dl-cli.ts index 559f92984..293acff43 100644 --- a/server/helpers/youtube-dl/youtube-dl-cli.ts +++ b/server/helpers/youtube-dl/youtube-dl-cli.ts | |||
@@ -153,7 +153,8 @@ export class YoutubeDLCLI { | |||
153 | completeArgs = this.wrapWithIPOptions(completeArgs) | 153 | completeArgs = this.wrapWithIPOptions(completeArgs) |
154 | completeArgs = this.wrapWithFFmpegOptions(completeArgs) | 154 | completeArgs = this.wrapWithFFmpegOptions(completeArgs) |
155 | 155 | ||
156 | const output = await execa('python', [ youtubeDLBinaryPath, ...completeArgs, url ], processOptions) | 156 | const { PYTHON_PATH } = CONFIG.IMPORT.VIDEOS.HTTP.YOUTUBE_DL_RELEASE |
157 | const output = await execa(PYTHON_PATH, [ youtubeDLBinaryPath, ...completeArgs, url ], processOptions) | ||
157 | 158 | ||
158 | logger.debug('Runned youtube-dl command.', { command: output.command, ...lTags() }) | 159 | logger.debug('Runned youtube-dl command.', { command: output.command, ...lTags() }) |
159 | 160 | ||
diff --git a/server/initializers/config.ts b/server/initializers/config.ts index f2e9f7088..fb6f7ae62 100644 --- a/server/initializers/config.ts +++ b/server/initializers/config.ts | |||
@@ -333,7 +333,8 @@ const CONFIG = { | |||
333 | 333 | ||
334 | YOUTUBE_DL_RELEASE: { | 334 | YOUTUBE_DL_RELEASE: { |
335 | get URL () { return config.get<string>('import.videos.http.youtube_dl_release.url') }, | 335 | get URL () { return config.get<string>('import.videos.http.youtube_dl_release.url') }, |
336 | get NAME () { return config.get<string>('import.videos.http.youtube_dl_release.name') } | 336 | get NAME () { return config.get<string>('import.videos.http.youtube_dl_release.name') }, |
337 | get PYTHON_PATH () { return config.get<string>('import.videos.http.youtube_dl_release.python_path') } | ||
337 | }, | 338 | }, |
338 | 339 | ||
339 | get FORCE_IPV4 () { return config.get<boolean>('import.videos.http.force_ipv4') } | 340 | get FORCE_IPV4 () { return config.get<boolean>('import.videos.http.force_ipv4') } |