midgard/youtube-dl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[vimeo:review] Fix config URL extraction (closes #11821)

Browse source
This commit is contained in:
Sergey M․ 2017-01-24 22:46:40 +07:00
parent c3a65c3de0
commit d61aa5eb37
No known key found for this signature in database
GPG key ID: 2C393E0F18A9236D
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
youtube_dl/extractor/vimeo.py
View file

@ -884,10 +884,14 @@ class VimeoReviewIE(VimeoBaseInfoExtractor):
def _get_config_url(self, webpage_url, video_id, video_password_verified=False): def _get_config_url(self, webpage_url, video_id, video_password_verified=False):
webpage = self._download_webpage(webpage_url, video_id) webpage = self._download_webpage(webpage_url, video_id)
data = self._parse_json(self._search_regex( config_url = self._html_search_regex(
r'window\s*=\s*_extend\(window,\s*({.+?})\);', webpage, 'data', r'data-config-url=(["\'])(?P<url>(?:(?!\1).)+)\1', webpage,
default=NO_DEFAULT if video_password_verified else '{}'), video_id) 'config URL', default=None, group='url')
config_url = data.get('vimeo_esi', {}).get('config', {}).get('configUrl') if not config_url:
data = self._parse_json(self._search_regex(
r'window\s*=\s*_extend\(window,\s*({.+?})\);', webpage, 'data',
default=NO_DEFAULT if video_password_verified else '{}'), video_id)
config_url = data.get('vimeo_esi', {}).get('config', {}).get('configUrl')
if config_url is None: if config_url is None:
self._verify_video_password(webpage_url, video_id, webpage) self._verify_video_password(webpage_url, video_id, webpage)
config_url = self._get_config_url( config_url = self._get_config_url(