jcgruenhage/youtube-dl
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

[twitter] Use _download_xml

Browse source
This commit is contained in:
Yen Chi Hsuan 2015-10-18 17:11:55 +08:00
parent 48aae2d2cf
commit 01d22d4703
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
youtube_dl/extractor/twitter.py
View file

@ -8,6 +8,7 @@ from ..compat import compat_urllib_request
from ..utils import ( from ..utils import (
float_or_none, float_or_none,
unescapeHTML, unescapeHTML,
xpath_text,
) )
@ -60,9 +61,8 @@ class TwitterCardIE(InfoExtractor):
video_id) video_id)
if 'playlist' not in config: if 'playlist' not in config:
if 'vmapUrl' in config: if 'vmapUrl' in config:
webpage = self._download_webpage(config['vmapUrl'], video_id + ' (xml)') vmap_data = self._download_xml(config['vmapUrl'], video_id)
video_url = self._search_regex( video_url = xpath_text(vmap_data, './/MediaFile').strip()
r'<MediaFile>\s*<!\[CDATA\[(https?://.+?)\]\]>', webpage, 'data player config (xml)')
f = { f = {
'url': video_url, 'url': video_url,
} }