Miroirs/yt-dlp
1
0
Fork 0
mirror of https://github.com/yt-dlp/yt-dlp synced 2025-01-28 19:58:38 +01:00
Code Issues Projects Releases Packages Wiki Activity

[extractor/youtube] Add fallback to phantomjs

Browse source 
Related #4635
This commit is contained in:
pukkandan 2022-08-18 21:35:18 +05:30
parent 587021cd9f
commit 25836db6be
No known key found for this signature in database
GPG key ID: 7EEE9E1E817D0A39
1 changed files with 31 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
yt_dlp/extractor/youtube.py
View file

@ -17,6 +17,7 @@ import urllib.error
import urllib.parse import urllib.parse
from .common import InfoExtractor, SearchInfoExtractor from .common import InfoExtractor, SearchInfoExtractor
from .openload import PhantomJSwrapper
from ..compat import functools from ..compat import functools
from ..jsinterp import JSInterpreter from ..jsinterp import JSInterpreter
from ..utils import ( from ..utils import (
@ -2624,8 +2625,23 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
if self.get_param('youtube_print_sig_code'): if self.get_param('youtube_print_sig_code'):
self.to_screen(f'Extracted nsig function from {player_id}:\n{func_code[1]}\n') self.to_screen(f'Extracted nsig function from {player_id}:\n{func_code[1]}\n')
extract_nsig = self._cached(self._extract_n_function_from_code, 'nsig func', player_url) try:
ret = extract_nsig(jsi, func_code)(s) extract_nsig = self._cached(self._extract_n_function_from_code, 'nsig func', player_url)
ret = extract_nsig(jsi, func_code)(s)
except JSInterpreter.Exception as e:
try:
jsi = PhantomJSwrapper(self)
except ExtractorError:
raise e
self.report_warning(
f'Native nsig extraction failed: Trying with PhantomJS\n'
f' n = {s} ; player = {player_url}', video_id)
self.write_debug(e)
args, func_body = func_code
ret = jsi.execute(
f'console.log(function({", ".join(args)}) {{ {func_body} }}({s!r}));',
video_id=video_id, note='Executing signature code').strip()
self.write_debug(f'Decrypted nsig {s} => {ret}') self.write_debug(f'Decrypted nsig {s} => {ret}')
return ret return ret
@ -2655,9 +2671,15 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
func = jsi.extract_function_from_code(*func_code) func = jsi.extract_function_from_code(*func_code)
def extract_nsig(s): def extract_nsig(s):
ret = func([s]) try:
ret = func([s])
except JSInterpreter.Exception:
raise
except Exception as e:
raise JSInterpreter.Exception(traceback.format_exc(), cause=e)
if ret.startswith('enhanced_except_'): if ret.startswith('enhanced_except_'):
raise ExtractorError('Signature function returned an exception') raise JSInterpreter.Exception('Signature function returned an exception')
return ret return ret
return extract_nsig return extract_nsig
@ -3240,9 +3262,12 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
'n': decrypt_nsig(query['n'][0], video_id, player_url) 'n': decrypt_nsig(query['n'][0], video_id, player_url)
}) })
except ExtractorError as e: except ExtractorError as e:
phantomjs_hint = ''
if isinstance(e, JSInterpreter.Exception):
phantomjs_hint = f' Install {self._downloader._format_err("PhantomJS", self._downloader.Styles.EMPHASIS)} to workaround the issue\n'
self.report_warning( self.report_warning(
'nsig extraction failed: You may experience throttling for some formats\n' f'nsig extraction failed: You may experience throttling for some formats\n{phantomjs_hint}'
f'n = {query["n"][0]} ; player = {player_url}', video_id=video_id, only_once=True) f' n = {query["n"][0]} ; player = {player_url}', video_id=video_id, only_once=True)
self.write_debug(e, only_once=True) self.write_debug(e, only_once=True)
throttled = True throttled = True