[youku] Better error handling

pull/5991/head^2
Yen Chi Hsuan 2015-06-15 23:54:55 +08:00
parent f1e66cb2eb
commit 04e7596680
1 changed files with 8 additions and 6 deletions

View File

@ -176,13 +176,15 @@ class YoukuIE(InfoExtractor):
error_code = data1.get('error_code') error_code = data1.get('error_code')
if error_code: if error_code:
# -8 means blocked outside China.
# Chinese and English, separated by newline.
error = data1.get('error') error = data1.get('error')
raise ExtractorError( if error is not None and '因版权原因无法观看此视频' in error:
error or 'Server reported error %i' % raise ExtractorError(
error_code, 'Youku said: Sorry, this video is available in China only', expected=True)
expected=True) else:
msg = 'Youku server reported error %i' % error_code
if error is not None:
msg += ': ' + error
raise ExtractorError(msg)
title = data1['title'] title = data1['title']