diff --git a/youtube_dl/extractor/tumblr.py b/youtube_dl/extractor/tumblr.py index 3d3b635e4..8037decab 100644 --- a/youtube_dl/extractor/tumblr.py +++ b/youtube_dl/extractor/tumblr.py @@ -5,6 +5,7 @@ import re from .common import InfoExtractor +from ..utils import RegexNotFoundError class TumblrIE(InfoExtractor): _VALID_URL = r'http://(?P.*?)\.tumblr\.com/(?:post|video)/(?P[0-9]+)(?:$|[/?#])' @@ -28,6 +29,34 @@ class TumblrIE(InfoExtractor): 'description': 'md5:dba62ac8639482759c8eb10ce474586a', 'thumbnail': 're:http://.*\.jpg', } + }, { + 'url': 'http://larastonesbitch.tumblr.com/post/130035771559/honestlyiconic', + 'md5': 'f0c88985bd7e85d13603771a8647f270', + 'resolution': 'hd', + 'info_dict': { + 'id': '130035771559', + 'ext': 'mp4', + 'title': 'larastonesbitch', + 'description': 'md5:d9184c8b9396bb5b027b3d8658a43de0', + 'thumbnail': 're:http://.*\.jpg', + }, + 'params': { + 'format': 'sd', + }, + }, { + 'url': 'http://larastonesbitch.tumblr.com/post/130035771559/honestlyiconic', + 'md5': 'a88dea4c03a9cc208cf44eb2dd12248b', + 'resolution': 'hd', + 'info_dict': { + 'id': '130035771559', + 'ext': 'mp4', + 'title': 'larastonesbitch', + 'description': 'md5:d9184c8b9396bb5b027b3d8658a43de0', + 'thumbnail': 're:http://.*\.jpg', + }, + 'params': { + 'format': 'hd', + }, }, { 'url': 'http://naked-yogi.tumblr.com/post/118312946248/naked-smoking-stretching', 'md5': 'de07e5211d60d4f3a2c3df757ea9f6ab', @@ -57,6 +86,8 @@ class TumblrIE(InfoExtractor): video_id = m_url.group('id') blog = m_url.group('blog_name') + video_urls = [] + url = 'http://%s.tumblr.com/post/%s/' % (blog, video_id) webpage, urlh = self._download_webpage_handle(url, video_id) @@ -68,8 +99,35 @@ class TumblrIE(InfoExtractor): iframe = self._download_webpage(iframe_url, video_id, 'Downloading iframe page') - video_url = self._search_regex(r'