浏览代码

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

Sergey M․ 8 年之前
父节点
当前提交
d61aa5eb37
共有 1 个文件被更改,包括 8 次插入4 次删除
  1. 8 4
      youtube_dl/extractor/vimeo.py

+ 8 - 4
youtube_dl/extractor/vimeo.py

@@ -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(
-            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')
+        config_url = self._html_search_regex(
+            r'data-config-url=(["\'])(?P<url>(?:(?!\1).)+)\1', webpage,
+            'config URL', default=None, group='url')
+        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(