aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYen Chi Hsuan <yan12125@gmail.com>2015-07-07 14:16:56 +0800
committerYen Chi Hsuan <yan12125@gmail.com>2015-07-07 14:16:56 +0800
commitd7b4d5dd5072fc82a7f3d437e5990aa74a35a100 (patch)
treeef94c6feaf3014659d44b01bc489066285f83ca4
parent7f220b2facecde21ac3257d20938b63c1b6b01fb (diff)
downloadyoutube-dl-d7b4d5dd5072fc82a7f3d437e5990aa74a35a100.zip
youtube-dl-d7b4d5dd5072fc82a7f3d437e5990aa74a35a100.tar.gz
youtube-dl-d7b4d5dd5072fc82a7f3d437e5990aa74a35a100.tar.bz2
[gfycat] Extract id correctly (fixes #6165)
-rw-r--r--youtube_dl/extractor/gfycat.py22
1 files changed, 19 insertions, 3 deletions
diff --git a/youtube_dl/extractor/gfycat.py b/youtube_dl/extractor/gfycat.py
index 397f1d4..048ee31 100644
--- a/youtube_dl/extractor/gfycat.py
+++ b/youtube_dl/extractor/gfycat.py
@@ -10,8 +10,8 @@ from ..utils import (
class GfycatIE(InfoExtractor):
- _VALID_URL = r'https?://(?:www\.)?gfycat\.com/(?P<id>[^/?#]+)'
- _TEST = {
+ _VALID_URL = r'https?://(?:www\.)?gfycat\.com/(?:ifr/)?(?P<id>[^/?#]+)'
+ _TESTS = [{
'url': 'http://gfycat.com/DeadlyDecisiveGermanpinscher',
'info_dict': {
'id': 'DeadlyDecisiveGermanpinscher',
@@ -27,7 +27,23 @@ class GfycatIE(InfoExtractor):
'categories': list,
'age_limit': 0,
}
- }
+ }, {
+ 'url': 'http://gfycat.com/ifr/JauntyTimelyAmazontreeboa',
+ 'info_dict': {
+ 'id': 'JauntyTimelyAmazontreeboa',
+ 'ext': 'mp4',
+ 'title': 'JauntyTimelyAmazontreeboa',
+ 'timestamp': 1411720126,
+ 'upload_date': '20140926',
+ 'uploader': 'anonymous',
+ 'duration': 3.52,
+ 'view_count': int,
+ 'like_count': int,
+ 'dislike_count': int,
+ 'categories': list,
+ 'age_limit': 0,
+ }
+ }]
def _real_extract(self, url):
video_id = self._match_id(url)