[vevo] Delay the georestriction check to prevent false alerts

Fixes #9408
This commit is contained in:
Yen Chi Hsuan 2016-05-12 19:56:58 +08:00
parent 778a1ccca7
commit 7e8ddca1bb
No known key found for this signature in database
GPG Key ID: 3FDDD575826C5C30

View File

@ -213,19 +213,17 @@ class VevoIE(VevoBaseIE):
formats = [] formats = []
if not video_info: 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') ytid = response.get('errorInfo', {}).get('ytid')
if ytid: if ytid:
self.report_warning( self.report_warning(
'Video is geoblocked, trying with the YouTube video %s' % ytid) 'Video is geoblocked, trying with the YouTube video %s' % ytid)
return self.url_result(ytid, 'Youtube', ytid) return self.url_result(ytid, 'Youtube', ytid)
if 'statusMessage' in response: raise
raise ExtractorError('%s said: %s' % (
self.IE_NAME, response['statusMessage']), expected=True)
raise ExtractorError('Unable to extract videos')
self._initialize_api(video_id)
video_info = self._call_api( video_info = self._call_api(
'video/%s' % video_id, video_id, 'Downloading api video info', 'video/%s' % video_id, video_id, 'Downloading api video info',
'Failed to download video info') 'Failed to download video info')