commit: 218c15ab5935082f3e5c8589f6eaf0e437919a5d
parent 17ab4d3b5e3075d32a0a93422e40f61ef4919d7d
Author: Philipp Hagemeister <phihag@phihag.de>
Date: Tue, 28 Jan 2014 03:35:52 +0100
Merge remote-tracking branch 'mike/tumblr-url'
Diffstat:
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/youtube_dl/extractor/tumblr.py b/youtube_dl/extractor/tumblr.py
@@ -9,7 +9,7 @@ from ..utils import (
class TumblrIE(InfoExtractor):
- _VALID_URL = r'http://(?P<blog_name>.*?)\.tumblr\.com/((post)|(video))/(?P<id>\d*)/(.*?)'
+ _VALID_URL = r'http://(?P<blog_name>.*?)\.tumblr\.com/((post)|(video))/(?P<id>\d*)($|/)'
_TEST = {
'url': 'http://tatianamaslanydaily.tumblr.com/post/54196191430/orphan-black-dvd-extra-behind-the-scenes',
'file': '54196191430.mp4',