X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Ftumblr.py;h=ad5840ca2f4b8f2fe82c46cca261af86716f25dc;hb=9ed3bdc64d0310e568883b9e81e3dd5114efd7ed;hp=618199d6b93f6ab86ad24d3c3d846c8df357c2c3;hpb=6f5ac90cf314e8e1a7c5c416fb51e3a7b8483e9c;p=youtube-dl diff --git a/youtube_dl/extractor/tumblr.py b/youtube_dl/extractor/tumblr.py index 618199d6b..ad5840ca2 100644 --- a/youtube_dl/extractor/tumblr.py +++ b/youtube_dl/extractor/tumblr.py @@ -9,11 +9,11 @@ from ..utils import ( class TumblrIE(InfoExtractor): _VALID_URL = r'http://(?P.*?)\.tumblr\.com/((post)|(video))/(?P\d*)/(.*?)' _TEST = { - u'url': u'http://resigno.tumblr.com/post/53364321212/e-de-extrema-importancia-que-esse-video-seja', - u'file': u'53364321212.mp4', - u'md5': u'0716d3dd51baf68a28b40fdf1251494e', + 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"Rafael Lemos | Tumblr" + u"title": u"tatiana maslany news" } } @@ -38,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,