projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
98676c0
)
[tumblr] Modernize
author
Philipp Hagemeister
<phihag@phihag.de>
Sun, 14 Sep 2014 10:20:14 +0000
(12:20 +0200)
committer
Philipp Hagemeister
<phihag@phihag.de>
Sun, 14 Sep 2014 10:20:14 +0000
(12:20 +0200)
youtube_dl/extractor/tumblr.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/tumblr.py
b/youtube_dl/extractor/tumblr.py
index 2882c1809e0bd55c1e6c8b441c19293aeb64d301..306fe89741cce8b3c281c94349be266f221028b3 100644
(file)
--- a/
youtube_dl/extractor/tumblr.py
+++ b/
youtube_dl/extractor/tumblr.py
@@
-10,7
+10,7
@@
from ..utils import (
class TumblrIE(InfoExtractor):
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',
_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
# 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,
+ }