mirror of
https://github.com/yt-dlp/yt-dlp.git
synced 2024-11-17 21:59:17 +00:00
[democracynow] Rename js to json_data
This commit is contained in:
parent
fc68d52bb9
commit
fd8102820c
|
@ -40,7 +40,7 @@ def _real_extract(self, url):
|
||||||
webpage = self._download_webpage(url, display_id)
|
webpage = self._download_webpage(url, display_id)
|
||||||
description = self._og_search_description(webpage)
|
description = self._og_search_description(webpage)
|
||||||
|
|
||||||
js = self._parse_json(self._search_regex(
|
json_data = self._parse_json(self._search_regex(
|
||||||
r'<script[^>]+type="text/json"[^>]*>\s*({[^>]+})', webpage, 'json'),
|
r'<script[^>]+type="text/json"[^>]*>\s*({[^>]+})', webpage, 'json'),
|
||||||
display_id)
|
display_id)
|
||||||
video_id = None
|
video_id = None
|
||||||
|
@ -56,19 +56,19 @@ def add_subtitle_item(lang, info_dict):
|
||||||
subtitles[lang].append(info_dict)
|
subtitles[lang].append(info_dict)
|
||||||
|
|
||||||
# chapter_file are not subtitles
|
# chapter_file are not subtitles
|
||||||
if 'caption_file' in js:
|
if 'caption_file' in json_data:
|
||||||
add_subtitle_item(default_lang, {
|
add_subtitle_item(default_lang, {
|
||||||
'url': compat_urlparse.urljoin(url, js['caption_file']),
|
'url': compat_urlparse.urljoin(url, json_data['caption_file']),
|
||||||
})
|
})
|
||||||
|
|
||||||
for subtitle_item in js.get('captions', []):
|
for subtitle_item in json_data.get('captions', []):
|
||||||
lang = subtitle_item.get('language', '').lower() or default_lang
|
lang = subtitle_item.get('language', '').lower() or default_lang
|
||||||
add_subtitle_item(lang, {
|
add_subtitle_item(lang, {
|
||||||
'url': compat_urlparse.urljoin(url, subtitle_item['url']),
|
'url': compat_urlparse.urljoin(url, subtitle_item['url']),
|
||||||
})
|
})
|
||||||
|
|
||||||
for key in ('file', 'audio', 'video'):
|
for key in ('file', 'audio', 'video'):
|
||||||
media_url = js.get(key, '')
|
media_url = json_data.get(key, '')
|
||||||
if not media_url:
|
if not media_url:
|
||||||
continue
|
continue
|
||||||
media_url = re.sub(r'\?.*', '', compat_urlparse.urljoin(url, media_url))
|
media_url = re.sub(r'\?.*', '', compat_urlparse.urljoin(url, media_url))
|
||||||
|
@ -81,7 +81,7 @@ def add_subtitle_item(lang, info_dict):
|
||||||
|
|
||||||
return {
|
return {
|
||||||
'id': video_id,
|
'id': video_id,
|
||||||
'title': js.get('title'),
|
'title': json_data.get('title'),
|
||||||
'description': description,
|
'description': description,
|
||||||
'subtitles': subtitles,
|
'subtitles': subtitles,
|
||||||
'formats': formats,
|
'formats': formats,
|
||||||
|
|
Loading…
Reference in a new issue