[tumblr] Improve _VALID_URL (Closes #9027)
authorSergey M․ <dstftw@gmail.com>
Wed, 30 Mar 2016 16:26:43 +0000 (22:26 +0600)
committerSergey M․ <dstftw@gmail.com>
Wed, 30 Mar 2016 16:26:43 +0000 (22:26 +0600)
youtube_dl/extractor/tumblr.py

index e5bcf7798d69f55e8725fee2dc7ada9c7bf6ef85..4d8b57111897f3c936e11f55fcea60d6a6bd30d6 100644 (file)
@@ -8,7 +8,7 @@ from ..utils import int_or_none
 
 
 class TumblrIE(InfoExtractor):
-    _VALID_URL = r'https?://(?P<blog_name>.*?)\.tumblr\.com/(?:post|video)/(?P<id>[0-9]+)(?:$|[/?#])'
+    _VALID_URL = r'https?://(?P<blog_name>[^/?#&]+)\.tumblr\.com/(?:post|video)/(?P<id>[0-9]+)(?:$|[/?#])'
     _TESTS = [{
         'url': 'http://tatianamaslanydaily.tumblr.com/post/54196191430/orphan-black-dvd-extra-behind-the-scenes',
         'md5': '479bb068e5b16462f5176a6828829767',