projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
23dd1fc
)
[tumblr] Detect vid.me embeds (fixes #5883)
author
Yen Chi Hsuan
<yan12125@gmail.com>
Wed, 3 Jun 2015 02:26:39 +0000
(10:26 +0800)
committer
Yen Chi Hsuan
<yan12125@gmail.com>
Wed, 3 Jun 2015 02:26:39 +0000
(10:26 +0800)
youtube_dl/extractor/tumblr.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/tumblr.py
b/youtube_dl/extractor/tumblr.py
index 828c808a6456b6b99b134cb7ae9d9017de9ad3aa..e6218808f29116e8d2d0d39f2a61342eef1bc823 100644
(file)
--- a/
youtube_dl/extractor/tumblr.py
+++ b/
youtube_dl/extractor/tumblr.py
@@
-28,6
+28,17
@@
class TumblrIE(InfoExtractor):
'description': 'md5:dba62ac8639482759c8eb10ce474586a',
'thumbnail': 're:http://.*\.jpg',
}
'description': 'md5:dba62ac8639482759c8eb10ce474586a',
'thumbnail': 're:http://.*\.jpg',
}
+ }, {
+ 'url': 'http://naked-yogi.tumblr.com/post/118312946248/naked-smoking-stretching',
+ 'md5': 'de07e5211d60d4f3a2c3df757ea9f6ab',
+ 'info_dict': {
+ 'id': 'Wmur',
+ 'ext': 'mp4',
+ 'title': 'naked smoking & stretching',
+ 'upload_date': '20150506',
+ 'timestamp': 1430931613,
+ },
+ 'add_ie': ['Vidme'],
}]
def _real_extract(self, url):
}]
def _real_extract(self, url):
@@
-38,6
+49,12
@@
class TumblrIE(InfoExtractor):
url = 'http://%s.tumblr.com/post/%s/' % (blog, video_id)
webpage = self._download_webpage(url, video_id)
url = 'http://%s.tumblr.com/post/%s/' % (blog, video_id)
webpage = self._download_webpage(url, video_id)
+ vid_me_embed_url = self._search_regex(
+ r'src=[\'"](https?://vid\.me/[^\'"]+)[\'"]',
+ webpage, 'vid.me embed', default=None)
+ if vid_me_embed_url is not None:
+ return self.url_result(vid_me_embed_url, 'Vidme')
+
iframe_url = self._search_regex(
r'src=\'(https?://www\.tumblr\.com/video/[^\']+)\'',
webpage, 'iframe url')
iframe_url = self._search_regex(
r'src=\'(https?://www\.tumblr\.com/video/[^\']+)\'',
webpage, 'iframe url')