R-yan/l1ving_youtube-dl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

unbreak tumblr-vimeo (c5895d5)

Browse Source
This commit is contained in:
fnord 2015-06-23 09:02:08 -05:00
parent 073741b132
commit 91925d37e8
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
youtube_dl/extractor/tumblr.py
View File

@ -72,9 +72,14 @@ class TumblrIE(InfoExtractor):
if pornhub_url: if pornhub_url:
return self.url_result(pornhub_url, 'PornHub') return self.url_result(pornhub_url, 'PornHub')
vimeo_url = VimeoIE._extract_vimeo_url(url, webpage) vimeo_urls = VimeoIE._extract_vimeo_urls(url, webpage)
if vimeo_url: if vimeo_urls:
return self.url_result(vimeo_url, 'Vimeo') entries = [{
'_type': 'url',
'url': vurl,
'ie_key': 'Vimeo'
} for vurl in vimeo_urls]
return self.playlist_result(entries)
iframe_url = self._search_regex( iframe_url = self._search_regex(
r'src=\'(https?://www\.tumblr\.com/video/[^\']+)\'', r'src=\'(https?://www\.tumblr\.com/video/[^\']+)\'',