]> git.bitcoin.ninja Git - youtube-dl/commitdiff
[vevo] Delay the georestriction check to prevent false alerts
authorYen Chi Hsuan <yan12125@gmail.com>
Thu, 12 May 2016 11:56:58 +0000 (19:56 +0800)
committerYen Chi Hsuan <yan12125@gmail.com>
Thu, 12 May 2016 11:56:58 +0000 (19:56 +0800)
Fixes #9408

youtube_dl/extractor/vevo.py

index c0632cd6af4b725d9a852871351c7915751b927b..388b4debee27d7331ae7dc351338e3829e539071 100644 (file)
@@ -213,19 +213,17 @@ class VevoIE(VevoBaseIE):
         formats = []
 
         if not video_info:
-            if response and response.get('statusCode') != 909:
+            try:
+                self._initialize_api(video_id)
+            except ExtractorError:
                 ytid = response.get('errorInfo', {}).get('ytid')
                 if ytid:
                     self.report_warning(
                         'Video is geoblocked, trying with the YouTube video %s' % ytid)
                     return self.url_result(ytid, 'Youtube', ytid)
 
-                if 'statusMessage' in response:
-                    raise ExtractorError('%s said: %s' % (
-                        self.IE_NAME, response['statusMessage']), expected=True)
-                raise ExtractorError('Unable to extract videos')
+                raise
 
-            self._initialize_api(video_id)
             video_info = self._call_api(
                 'video/%s' % video_id, video_id, 'Downloading api video info',
                 'Failed to download video info')