nhyatt/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl.git synced 2025-07-13 17:17:43 -05:00
Code Issues Projects Releases Wiki Activity

[utils, etc] Kill child processes when yt-dl is killed

Browse Source 
* derived from PR #26592, closes #26592

Authored by: Unrud
This commit is contained in:
pukkandan
2021-01-09 17:56:12 +05:30
committed by dirkf
parent 811c480f7b
commit 0700fde640
8 changed files with 42 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
youtube_dl/postprocessor/ffmpeg.py
View File

@ -16,6 +16,7 @@ from ..utils import (
is_outdated_version,
PostProcessingError,
prepend_extension,
process_communicate_or_kill,
shell_quote,
subtitles_filename,
dfxp2srt,
@ -180,7 +181,7 @@ class FFmpegPostProcessor(PostProcessor):
handle = subprocess.Popen(
cmd, stderr=subprocess.PIPE,
stdout=subprocess.PIPE, stdin=subprocess.PIPE)
stdout_data, stderr_data = handle.communicate()
stdout_data, stderr_data = process_communicate_or_kill(handle)
expected_ret = 0 if self.probe_available else 1
if handle.wait() != expected_ret:
return None
@ -228,7 +229,7 @@ class FFmpegPostProcessor(PostProcessor):
if self._downloader.params.get('verbose', False):
self._downloader.to_screen('[debug] ffmpeg command line: %s' % shell_quote(cmd))
p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, stdin=subprocess.PIPE)
stdout, stderr = p.communicate()
stdout, stderr = process_communicate_or_kill(p)
if p.returncode != 0:
stderr = stderr.decode('utf-8', 'replace')
msgs = stderr.strip().split('\n')