diff options
| author | Philipp Hagemeister <phihag@phihag.de> | 2014-09-14 12:20:14 +0200 |
|---|---|---|
| committer | Philipp Hagemeister <phihag@phihag.de> | 2014-09-14 12:20:14 +0200 |
| commit | 3da0e1f8cd366fe64e0c1d072b77f5ce5ad9ba93 (patch) | |
| tree | 3259e8749d2255ee3558001f8d778141d57df46b | |
| parent | 98676c08a1c4977f945f8e83c31c227f337176ca (diff) | |
| download | youtube-dl-3da0e1f8cd366fe64e0c1d072b77f5ce5ad9ba93.tar.gz youtube-dl-3da0e1f8cd366fe64e0c1d072b77f5ce5ad9ba93.tar.xz youtube-dl-3da0e1f8cd366fe64e0c1d072b77f5ce5ad9ba93.zip | |
[tumblr] Modernize
| -rw-r--r-- | youtube_dl/extractor/tumblr.py | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/youtube_dl/extractor/tumblr.py b/youtube_dl/extractor/tumblr.py index 2882c1809..306fe8974 100644 --- a/youtube_dl/extractor/tumblr.py +++ b/youtube_dl/extractor/tumblr.py @@ -10,7 +10,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>[0-9]+)(?:$|[/?#])' _TESTS = [{ 'url': 'http://tatianamaslanydaily.tumblr.com/post/54196191430/orphan-black-dvd-extra-behind-the-scenes', 'md5': '479bb068e5b16462f5176a6828829767', @@ -56,13 +56,15 @@ 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'<title>(?P<title>.*?)(?: \| Tumblr)?</title>', - webpage, 'title', flags=re.DOTALL) + video_title = self._html_search_regex( + r'(?s)<title>(?P<title>.*?)(?: \| Tumblr)?</title>', + webpage, 'title') - return [{'id': video_id, - 'url': video_url, - 'title': video_title, - 'description': self._html_search_meta('description', webpage), - 'thumbnail': video_thumbnail, - 'ext': ext - }] + return { + 'id': video_id, + 'url': video_url, + 'title': video_title, + 'description': self._html_search_meta('description', webpage), + 'thumbnail': video_thumbnail, + 'ext': ext, + } |