desastre
/
youtube-dl
forked from minhngoc25a/youtube-dl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[democracynow] Fix _TESTS

This commit is contained in:
Yen Chi Hsuan 2015-10-31 22:21:52 +08:00
parent 33a513faf7
commit 78d7ee19dc
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
youtube_dl/extractor/democracynow.py
View File

@ -36,10 +36,9 @@ class DemocracynowIE(InfoExtractor):
if display_id == '': if display_id == '':
display_id = 'home' display_id = 'home'
webpage = self._download_webpage(url, display_id) webpage = self._download_webpage(url, display_id)
re_desc = re.search(r'<meta property=.og:description. content=(["\'])(.+?)\1', webpage, re.DOTALL) description = self._og_search_description(webpage)
description = re_desc.group(2) if re_desc else ''
jstr = self._search_regex(r'({.+?"related_video_xml".+?})', webpage, 'json', default=None) jstr = self._search_regex(r'<script[^>]+type="text/json"[^>]*>\s*({[^>]+})', webpage, 'json')
js = self._parse_json(jstr, display_id) js = self._parse_json(jstr, display_id)
video_id = None video_id = None
formats = [] formats = []
@ -56,7 +55,7 @@ class DemocracynowIE(InfoExtractor):
'ext': ext, 'ext': ext,
'url': url, 'url': url,
}] }]
for key in ('file', 'audio'): for key in ('file', 'audio', 'video'):
url = js.get(key, '') url = js.get(key, '')
if url == '' or url is None: if url == '' or url is None:
continue continue