]> git.bitcoin.ninja Git - youtube-dl/commitdiff
[vimeo] Fix error parsing
authorLukáš Lalinský <lukas@oxygene.sk>
Tue, 20 Oct 2015 08:30:31 +0000 (10:30 +0200)
committerLukáš Lalinský <lukas@oxygene.sk>
Tue, 20 Oct 2015 08:31:32 +0000 (10:31 +0200)
youtube_dl/extractor/vimeo.py

index 0f84656c0af8f0015a830b07f221bdb86e9f695e..bdec79341b55b5af0c6833890f5cd2cf02ef35d9 100644 (file)
@@ -273,13 +273,13 @@ class VimeoIE(VimeoBaseInfoExtractor):
         self.report_extraction(video_id)
 
         vimeo_config = self._search_regex(
-            r'vimeo\.config\s*=\s*({.+?});', webpage,
+            r'vimeo\.config\s*=\s*(?:({.+?})|_extend\([^,]+,\s+({.+?})\));', webpage,
             'vimeo config', default=None)
         if vimeo_config:
             seed_status = self._parse_json(vimeo_config, video_id).get('seed_status', {})
             if seed_status.get('state') == 'failed':
                 raise ExtractorError(
-                    '%s returned error: %s' % (self.IE_NAME, seed_status['title']),
+                    '%s said: %s' % (self.IE_NAME, seed_status['title']),
                     expected=True)
 
         # Extract the config JSON