From: Jaime Marquínez Ferrándiz Date: Sun, 27 Oct 2013 11:09:46 +0000 (+0100) Subject: [facebook] Report a more meaningful message if the video cannot be accessed (closes... X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=6f71ef580c0d93947817c81a09f6a188631585a1;p=youtube-dl [facebook] Report a more meaningful message if the video cannot be accessed (closes #1658) --- diff --git a/youtube_dl/extractor/facebook.py b/youtube_dl/extractor/facebook.py index 62881da31..aa2525f17 100644 --- a/youtube_dl/extractor/facebook.py +++ b/youtube_dl/extractor/facebook.py @@ -100,7 +100,12 @@ class FacebookIE(InfoExtractor): AFTER = '.forEach(function(variable) {swf.addVariable(variable[0], variable[1]);});' m = re.search(re.escape(BEFORE) + '(.*?)' + re.escape(AFTER), webpage) if not m: - raise ExtractorError(u'Cannot parse data') + m_msg = re.search(r'class="[^"]*uiInterstitialContent[^"]*">
(.*?)
', webpage) + if m_msg is not None: + err_msg = u'The video is not available, Facebook said: "%s"' % m_msg.group(1) + else: + err_msg = u'Cannot parse data' + raise ExtractorError(err_msg) data = dict(json.loads(m.group(1))) params_raw = compat_urllib_parse.unquote(data['params']) params = json.loads(params_raw)