diff options
| author | Jesús <heckyel@hyperbola.info> | 2022-03-30 01:24:15 +0800 |
|---|---|---|
| committer | Jesús <heckyel@hyperbola.info> | 2022-03-30 01:24:15 +0800 |
| commit | 950cc067b8c41ac246deb4725177a372c95d8341 (patch) | |
| tree | 66d5284ff86faec8c3000be1e7d0bd856b4c4dbe /yt_dlp/extractor/generic.py | |
| parent | 7a74bc5d1e54299e51b73492e09c70da994f4b35 (diff) | |
| parent | e7870111e83033e0ac728d5a2d565d1eb146c335 (diff) | |
| download | hypervideo-pre-950cc067b8c41ac246deb4725177a372c95d8341.tar.lz hypervideo-pre-950cc067b8c41ac246deb4725177a372c95d8341.tar.xz hypervideo-pre-950cc067b8c41ac246deb4725177a372c95d8341.zip | |
updated from upstream | 30/03/2022 at 01:24
Diffstat (limited to 'yt_dlp/extractor/generic.py')
| -rw-r--r-- | yt_dlp/extractor/generic.py | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/yt_dlp/extractor/generic.py b/yt_dlp/extractor/generic.py index 97e34808f..4a2e30158 100644 --- a/yt_dlp/extractor/generic.py +++ b/yt_dlp/extractor/generic.py @@ -17,6 +17,7 @@ from ..compat import ( ) from ..utils import ( determine_ext, + dict_get, ExtractorError, float_or_none, HEADRequest, @@ -31,6 +32,7 @@ from ..utils import ( parse_resolution, sanitized_Request, smuggle_url, + str_or_none, unescapeHTML, unified_timestamp, unsmuggle_url, @@ -3778,11 +3780,12 @@ class GenericIE(InfoExtractor): # Video.js embed mobj = re.search( - r'(?s)\bvideojs\s*\(.+?\.src\s*\(\s*((?:\[.+?\]|{.+?}))\s*\)\s*;', + r'(?s)\bvideojs\s*\(.+?([a-zA-Z0-9_$]+)\.src\s*\(\s*((?:\[.+?\]|{.+?}))\s*\)\s*;', webpage) if mobj is not None: + varname = mobj.group(1) sources = self._parse_json( - mobj.group(1), video_id, transform_source=js_to_json, + mobj.group(2), video_id, transform_source=js_to_json, fatal=False) or [] if not isinstance(sources, list): sources = [sources] @@ -3819,6 +3822,21 @@ class GenericIE(InfoExtractor): 'Referer': full_response.geturl(), }, }) + # https://docs.videojs.com/player#addRemoteTextTrack + # https://html.spec.whatwg.org/multipage/media.html#htmltrackelement + for sub_match in re.finditer(rf'(?s){re.escape(varname)}' r'\.addRemoteTextTrack\(({.+?})\s*,\s*(?:true|false)\)', webpage): + sub = self._parse_json( + sub_match.group(1), video_id, transform_source=js_to_json, fatal=False) or {} + src = str_or_none(sub.get('src')) + if not src: + continue + subtitles.setdefault(dict_get(sub, ('language', 'srclang')) or 'und', []).append({ + 'url': compat_urlparse.urljoin(url, src), + 'name': sub.get('label'), + 'http_headers': { + 'Referer': full_response.geturl(), + }, + }) if formats or subtitles: self.report_detected('video.js embed') self._sort_formats(formats) |