From: Yen Chi Hsuan <yan12125@gmail.com>
Date: Tue, 7 Jul 2015 06:22:13 +0000 (+0800)
Subject: [gfycat] Catch errors
X-Git-Url: https://git.cielonegro.org/gitweb.cgi?a=commitdiff_plain;h=267dc07e6b71277b67abad08c515ca9c1bb09f61;p=youtube-dl.git

[gfycat] Catch errors
---

diff --git a/youtube_dl/extractor/gfycat.py b/youtube_dl/extractor/gfycat.py
index 048ee31e2..884700c52 100644
--- a/youtube_dl/extractor/gfycat.py
+++ b/youtube_dl/extractor/gfycat.py
@@ -6,6 +6,7 @@ from ..utils import (
     int_or_none,
     float_or_none,
     qualities,
+    ExtractorError,
 )
 
 
@@ -50,7 +51,10 @@ class GfycatIE(InfoExtractor):
 
         gfy = self._download_json(
             'http://gfycat.com/cajax/get/%s' % video_id,
-            video_id, 'Downloading video info')['gfyItem']
+            video_id, 'Downloading video info')
+        if 'error' in gfy:
+            raise ExtractorError('Gfycat said: ' + gfy['error'], expected=True)
+        gfy = gfy['gfyItem']
 
         title = gfy.get('title') or gfy['gfyName']
         description = gfy.get('description')