aboutsummaryrefslogtreecommitdiffstats
path: root/youtube_dl/extractor/gfycat.py
diff options
context:
space:
mode:
authorWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2018-01-14 00:50:11 +0100
committerWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2018-01-14 00:50:11 +0100
commitb382d0f71eeece4e6e1cc3662f3c89884d5ac05d (patch)
treee48661b9f1de2380d4bff94f416624827746abd7 /youtube_dl/extractor/gfycat.py
parent5020cb7e8233683ef7845fea1233a95f3f775a7b (diff)
parenta86922c4702e2c8538337124c5bf02a4b5f9aa4a (diff)
downloadyoutube-dl-b382d0f71eeece4e6e1cc3662f3c89884d5ac05d.zip
youtube-dl-b382d0f71eeece4e6e1cc3662f3c89884d5ac05d.tar.gz
youtube-dl-b382d0f71eeece4e6e1cc3662f3c89884d5ac05d.tar.bz2
Merge branch 'upstream'
Diffstat (limited to 'youtube_dl/extractor/gfycat.py')
-rw-r--r--youtube_dl/extractor/gfycat.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/youtube_dl/extractor/gfycat.py b/youtube_dl/extractor/gfycat.py
index 45ccc11..a0670b6 100644
--- a/youtube_dl/extractor/gfycat.py
+++ b/youtube_dl/extractor/gfycat.py
@@ -11,7 +11,7 @@ from ..utils import (
class GfycatIE(InfoExtractor):
- _VALID_URL = r'https?://(?:www\.)?gfycat\.com/(?:ifr/)?(?P<id>[^/?#]+)'
+ _VALID_URL = r'https?://(?:www\.)?gfycat\.com/(?:ifr/|gifs/detail/)?(?P<id>[^/?#]+)'
_TESTS = [{
'url': 'http://gfycat.com/DeadlyDecisiveGermanpinscher',
'info_dict': {
@@ -44,6 +44,9 @@ class GfycatIE(InfoExtractor):
'categories': list,
'age_limit': 0,
}
+ }, {
+ 'url': 'https://gfycat.com/gifs/detail/UnconsciousLankyIvorygull',
+ 'only_matching': True
}]
def _real_extract(self, url):