From 91925d37e80e17d19a183e614728764b20f5f892 Mon Sep 17 00:00:00 2001 From: fnord Date: Tue, 23 Jun 2015 09:02:08 -0500 Subject: [PATCH] unbreak tumblr-vimeo (c5895d5) --- youtube_dl/extractor/tumblr.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/youtube_dl/extractor/tumblr.py b/youtube_dl/extractor/tumblr.py index 9ead13a91..37935e935 100644 --- a/youtube_dl/extractor/tumblr.py +++ b/youtube_dl/extractor/tumblr.py @@ -72,9 +72,14 @@ class TumblrIE(InfoExtractor): if pornhub_url: return self.url_result(pornhub_url, 'PornHub') - vimeo_url = VimeoIE._extract_vimeo_url(url, webpage) - if vimeo_url: - return self.url_result(vimeo_url, 'Vimeo') + vimeo_urls = VimeoIE._extract_vimeo_urls(url, webpage) + if vimeo_urls: + entries = [{ + '_type': 'url', + 'url': vurl, + 'ie_key': 'Vimeo' + } for vurl in vimeo_urls] + return self.playlist_result(entries) iframe_url = self._search_regex( r'src=\'(https?://www\.tumblr\.com/video/[^\']+)\'',