X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Ftumblr.py;h=ad5840ca2f4b8f2fe82c46cca261af86716f25dc;hb=444b1165975ded5b38111c623ae6005391c13051;hp=b0851b4f9cd360fc8d4ba58c725c7b04d4708c50;hpb=ae287755b7a0c22d061cea1b04f2fb1d1cdffacb;p=youtube-dl diff --git a/youtube_dl/extractor/tumblr.py b/youtube_dl/extractor/tumblr.py index b0851b4f9..ad5840ca2 100644 --- a/youtube_dl/extractor/tumblr.py +++ b/youtube_dl/extractor/tumblr.py @@ -8,6 +8,14 @@ from ..utils import ( class TumblrIE(InfoExtractor): _VALID_URL = r'http://(?P.*?)\.tumblr\.com/((post)|(video))/(?P\d*)/(.*?)' + _TEST = { + u'url': u'http://tatianamaslanydaily.tumblr.com/post/54196191430/orphan-black-dvd-extra-behind-the-scenes', + u'file': u'54196191430.mp4', + u'md5': u'479bb068e5b16462f5176a6828829767', + u'info_dict': { + u"title": u"tatiana maslany news" + } + } def _real_extract(self, url): m_url = re.match(self._VALID_URL, url) @@ -30,7 +38,7 @@ class TumblrIE(InfoExtractor): # The only place where you can get a title, it's not complete, # but searching in other places doesn't work for all videos - video_title = self._html_search_regex(r'(?P<title>.*?)', + video_title = self._html_search_regex(r'(?P<title>.*?)(?: \| Tumblr)?', webpage, u'title', flags=re.DOTALL) return [{'id': video_id,