diff options
| author | Yen Chi Hsuan <yan12125@gmail.com> | 2015-06-03 10:26:39 +0800 |
|---|---|---|
| committer | Yen Chi Hsuan <yan12125@gmail.com> | 2015-06-03 10:26:39 +0800 |
| commit | 8f9478412424b87e4fb77be53d239c13932b078a (patch) | |
| tree | a23cc4ef77d977ca21b60baa9f218c1f3719f5f4 /youtube_dl/extractor/tumblr.py | |
| parent | 23dd1fc74c36329ed40855301ac499a0ad2a0009 (diff) | |
| download | youtube-dl-8f9478412424b87e4fb77be53d239c13932b078a.zip youtube-dl-8f9478412424b87e4fb77be53d239c13932b078a.tar.gz youtube-dl-8f9478412424b87e4fb77be53d239c13932b078a.tar.bz2 | |
[tumblr] Detect vid.me embeds (fixes #5883)
Diffstat (limited to 'youtube_dl/extractor/tumblr.py')
| -rw-r--r-- | youtube_dl/extractor/tumblr.py | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/youtube_dl/extractor/tumblr.py b/youtube_dl/extractor/tumblr.py index 828c808..e621880 100644 --- 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', } + }, { + '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): @@ -38,6 +49,12 @@ class TumblrIE(InfoExtractor): 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') |