mirrors/yt-dlp
1
0
Fork 0
mirror of https://github.com/yt-dlp/yt-dlp.git synced 2025-09-03 08:35:32 +00:00
Code Issues Projects Releases Wiki Activity

[jsinterp] Implement timeout

Browse Source 
Workaround for #4716
This commit is contained in:
pukkandan
2022-08-22 06:19:06 +05:30
parent 822d66e591
commit 992dc6b486
3 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
yt_dlp/extractor/openload.py
View File

@ -219,7 +219,7 @@ class PhantomJSwrapper:
return html, stdout
def execute(self, jscode, video_id=None, note='Executing JS'):
def execute(self, jscode, video_id=None, *, note='Executing JS'):
"""Execute JS and return stdout"""
if 'phantom.exit();' not in jscode:
jscode += ';\nphantom.exit();'
@ -231,8 +231,12 @@ class PhantomJSwrapper:
cmd = [self.exe, '--ssl-protocol=any', self._TMP_FILES['script'].name]
self.extractor.write_debug(f'PhantomJS command line: {shell_quote(cmd)}')
stdout, stderr, returncode = Popen.run(cmd, text=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
try:
stdout, stderr, returncode = Popen.run(cmd, timeout=self.options['timeout'] / 1000,
text=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
except Exception as e:
raise ExtractorError(f'{note} failed: Unable to run PhantomJS binary', cause=e)
if returncode:
raise ExtractorError(f'Executing JS failed:\n{stderr.strip()}')
raise ExtractorError(f'{note} failed:\n{stderr.strip()}')
return stdout