about summary refs log tree commit diff
path: root/youtube_dl/extractor/imgur.py
diff options
context:
space:
mode:
authorJakub Wilk <jwilk@jwilk.net>2018-05-24 11:15:03 +0200
committerChih-Hsuan Yen <yan12125@gmail.com>2018-05-25 21:54:21 +0800
commit3d2a643fdcba126b209b758f2e403742ee631cf3 (patch)
treebfd4f814381e3a458b9793687e1c591574b205a3 /youtube_dl/extractor/imgur.py
parente8e58c22786918f93e6928d86b878fdc56461c4d (diff)
downloadyoutube-dl-3d2a643fdcba126b209b758f2e403742ee631cf3.tar.gz
youtube-dl-3d2a643fdcba126b209b758f2e403742ee631cf3.tar.xz
youtube-dl-3d2a643fdcba126b209b758f2e403742ee631cf3.zip
[imgur] Fix extraction
Diffstat (limited to 'youtube_dl/extractor/imgur.py')
-rw-r--r--youtube_dl/extractor/imgur.py13
1 files changed, 5 insertions, 8 deletions
diff --git a/youtube_dl/extractor/imgur.py b/youtube_dl/extractor/imgur.py
index 67c24a51c..2901960a5 100644
--- a/youtube_dl/extractor/imgur.py
+++ b/youtube_dl/extractor/imgur.py
@@ -3,7 +3,6 @@ from __future__ import unicode_literals
 import re
 
 from .common import InfoExtractor
-from ..compat import compat_urlparse
 from ..utils import (
     int_or_none,
     js_to_json,
@@ -21,7 +20,7 @@ class ImgurIE(InfoExtractor):
             'id': 'A61SaA1',
             'ext': 'mp4',
             'title': 're:Imgur GIF$|MRW gifv is up and running without any bugs$',
-            'description': 'Imgur: The most awesome images on the Internet.',
+            'description': 'Imgur: The magic of the Internet',
         },
     }, {
         'url': 'https://imgur.com/A61SaA1',
@@ -29,7 +28,7 @@ class ImgurIE(InfoExtractor):
             'id': 'A61SaA1',
             'ext': 'mp4',
             'title': 're:Imgur GIF$|MRW gifv is up and running without any bugs$',
-            'description': 'Imgur: The most awesome images on the Internet.',
+            'description': 'Imgur: The magic of the Internet',
         },
     }, {
         'url': 'https://imgur.com/gallery/YcAQlkx',
@@ -37,8 +36,6 @@ class ImgurIE(InfoExtractor):
             'id': 'YcAQlkx',
             'ext': 'mp4',
             'title': 'Classic Steve Carell gif...cracks me up everytime....damn the repost downvotes....',
-            'description': 'Imgur: The most awesome images on the Internet.'
-
         }
     }, {
         'url': 'http://imgur.com/topic/Funny/N8rOudd',
@@ -50,8 +47,8 @@ class ImgurIE(InfoExtractor):
 
     def _real_extract(self, url):
         video_id = self._match_id(url)
-        webpage = self._download_webpage(
-            compat_urlparse.urljoin(url, video_id), video_id)
+        gifv_url = 'https://i.imgur.com/{id}.gifv'.format(id=video_id)
+        webpage = self._download_webpage(gifv_url, video_id)
 
         width = int_or_none(self._og_search_property(
             'video:width', webpage, default=None))
@@ -107,7 +104,7 @@ class ImgurIE(InfoExtractor):
         return {
             'id': video_id,
             'formats': formats,
-            'description': self._og_search_description(webpage),
+            'description': self._og_search_description(webpage, default=None),
             'title': self._og_search_title(webpage),
         }