mirror of
https://github.com/yt-dlp/yt-dlp.git
synced 2024-12-24 20:25:52 +01:00
parent
822d66e591
commit
992dc6b486
@ -219,7 +219,7 @@ def get(self, url, html=None, video_id=None, note=None, note2='Executing JS on w
|
||||
|
||||
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 @@ def execute(self, jscode, video_id=None, note='Executing JS'):
|
||||
|
||||
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
|
||||
|
@ -2630,7 +2630,7 @@ def _decrypt_nsig(self, s, video_id, player_url):
|
||||
ret = extract_nsig(jsi, func_code)(s)
|
||||
except JSInterpreter.Exception as e:
|
||||
try:
|
||||
jsi = PhantomJSwrapper(self)
|
||||
jsi = PhantomJSwrapper(self, timeout=5000)
|
||||
except ExtractorError:
|
||||
raise e
|
||||
self.report_warning(
|
||||
|
@ -860,9 +860,9 @@ def kill(self, *, timeout=0):
|
||||
self.wait(timeout=timeout)
|
||||
|
||||
@classmethod
|
||||
def run(cls, *args, **kwargs):
|
||||
def run(cls, *args, timeout=None, **kwargs):
|
||||
with cls(*args, **kwargs) as proc:
|
||||
stdout, stderr = proc.communicate_or_kill()
|
||||
stdout, stderr = proc.communicate_or_kill(timeout=timeout)
|
||||
return stdout or '', stderr or '', proc.returncode
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user