dbrun
/
youtube-dl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[twitter:card] Use _html_search_regex

This commit is contained in:
Yen Chi Hsuan 2015-10-18 18:08:24 +08:00
parent 575036b405
commit 77a54b6a65
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
youtube_dl/extractor/twitter.py
View File

@ -7,7 +7,6 @@ from .common import InfoExtractor
from ..compat import compat_urllib_request from ..compat import compat_urllib_request
from ..utils import ( from ..utils import (
float_or_none, float_or_none,
unescapeHTML,
xpath_text, xpath_text,
remove_end, remove_end,
) )
@ -57,9 +56,8 @@ class TwitterCardIE(InfoExtractor):
request.add_header('User-Agent', user_agent) request.add_header('User-Agent', user_agent)
webpage = self._download_webpage(request, video_id) webpage = self._download_webpage(request, video_id)
config = self._parse_json( config = self._parse_json(self._html_search_regex(
unescapeHTML(self._search_regex( r'data-player-config="([^"]+)"', webpage, 'data player config'),
r'data-player-config="([^"]+)"', webpage, 'data player config')),
video_id) video_id)
if 'playlist' not in config: if 'playlist' not in config:
if 'vmapUrl' in config: if 'vmapUrl' in config: