From 04e7596680bce28beae2436bac0f6d1f01a45210 Mon Sep 17 00:00:00 2001 From: Yen Chi Hsuan Date: Mon, 15 Jun 2015 23:54:55 +0800 Subject: [PATCH] [youku] Better error handling --- youtube_dl/extractor/youku.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/youtube_dl/extractor/youku.py b/youtube_dl/extractor/youku.py index d5b73ebce..91f9f6bff 100644 --- a/youtube_dl/extractor/youku.py +++ b/youtube_dl/extractor/youku.py @@ -176,13 +176,15 @@ class YoukuIE(InfoExtractor): error_code = data1.get('error_code') if error_code: - # -8 means blocked outside China. - # Chinese and English, separated by newline. error = data1.get('error') - raise ExtractorError( - error or 'Server reported error %i' % - error_code, - expected=True) + if error is not None and '因版权原因无法观看此视频' in error: + raise ExtractorError( + 'Youku said: Sorry, this video is available in China only', expected=True) + else: + msg = 'Youku server reported error %i' % error_code + if error is not None: + msg += ': ' + error + raise ExtractorError(msg) title = data1['title']