projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
fc68d52
)
[democracynow] Rename js to json_data
author
Yen Chi Hsuan
<yan12125@gmail.com>
Tue, 3 Nov 2015 16:09:55 +0000
(
00:09
+0800)
committer
Yen Chi Hsuan
<yan12125@gmail.com>
Tue, 3 Nov 2015 16:09:55 +0000
(
00:09
+0800)
youtube_dl/extractor/democracynow.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/democracynow.py
b/youtube_dl/extractor/democracynow.py
index 70c364e8b040c1faf8ad8448aa64eeb0cead3766..72fc75d80cf7fe105d99a7147204bdd12885e4bf 100644
(file)
--- a/
youtube_dl/extractor/democracynow.py
+++ b/
youtube_dl/extractor/democracynow.py
@@
-40,7
+40,7
@@
class DemocracynowIE(InfoExtractor):
webpage = self._download_webpage(url, display_id)
description = self._og_search_description(webpage)
webpage = self._download_webpage(url, display_id)
description = self._og_search_description(webpage)
- js = self._parse_json(self._search_regex(
+ js
on_data
= self._parse_json(self._search_regex(
r'<script[^>]+type="text/json"[^>]*>\s*({[^>]+})', webpage, 'json'),
display_id)
video_id = None
r'<script[^>]+type="text/json"[^>]*>\s*({[^>]+})', webpage, 'json'),
display_id)
video_id = None
@@
-56,19
+56,19
@@
class DemocracynowIE(InfoExtractor):
subtitles[lang].append(info_dict)
# chapter_file are not subtitles
subtitles[lang].append(info_dict)
# chapter_file are not subtitles
- if 'caption_file' in js:
+ if 'caption_file' in js
on_data
:
add_subtitle_item(default_lang, {
add_subtitle_item(default_lang, {
- 'url': compat_urlparse.urljoin(url, js['caption_file']),
+ 'url': compat_urlparse.urljoin(url, js
on_data
['caption_file']),
})
})
- for subtitle_item in js.get('captions', []):
+ for subtitle_item in js
on_data
.get('captions', []):
lang = subtitle_item.get('language', '').lower() or default_lang
add_subtitle_item(lang, {
'url': compat_urlparse.urljoin(url, subtitle_item['url']),
})
for key in ('file', 'audio', 'video'):
lang = subtitle_item.get('language', '').lower() or default_lang
add_subtitle_item(lang, {
'url': compat_urlparse.urljoin(url, subtitle_item['url']),
})
for key in ('file', 'audio', 'video'):
- media_url = js.get(key, '')
+ media_url = js
on_data
.get(key, '')
if not media_url:
continue
media_url = re.sub(r'\?.*', '', compat_urlparse.urljoin(url, media_url))
if not media_url:
continue
media_url = re.sub(r'\?.*', '', compat_urlparse.urljoin(url, media_url))
@@
-81,7
+81,7
@@
class DemocracynowIE(InfoExtractor):
return {
'id': video_id,
return {
'id': video_id,
- 'title': js.get('title'),
+ 'title': js
on_data
.get('title'),
'description': description,
'subtitles': subtitles,
'formats': formats,
'description': description,
'subtitles': subtitles,
'formats': formats,