|
|
@ -10,14 +10,27 @@ 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>\d*)($|/)'
|
|
|
|
_TEST = {
|
|
|
|
_TESTS = [{
|
|
|
|
'url': 'http://tatianamaslanydaily.tumblr.com/post/54196191430/orphan-black-dvd-extra-behind-the-scenes',
|
|
|
|
'url': 'http://tatianamaslanydaily.tumblr.com/post/54196191430/orphan-black-dvd-extra-behind-the-scenes',
|
|
|
|
'file': '54196191430.mp4',
|
|
|
|
|
|
|
|
'md5': '479bb068e5b16462f5176a6828829767',
|
|
|
|
'md5': '479bb068e5b16462f5176a6828829767',
|
|
|
|
'info_dict': {
|
|
|
|
'info_dict': {
|
|
|
|
"title": "tatiana maslany news"
|
|
|
|
'id': '54196191430',
|
|
|
|
|
|
|
|
'ext': 'mp4',
|
|
|
|
|
|
|
|
'title': 'tatiana maslany news, Orphan Black || DVD extra - behind the scenes ↳...',
|
|
|
|
|
|
|
|
'description': 'md5:dfac39636969fe6bf1caa2d50405f069',
|
|
|
|
|
|
|
|
'thumbnail': 're:http://.*\.jpg',
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
}, {
|
|
|
|
|
|
|
|
'url': 'http://5sostrum.tumblr.com/post/90208453769/yall-forgetting-the-greatest-keek-of-them-all',
|
|
|
|
|
|
|
|
'md5': 'bf348ef8c0ef84fbf1cbd6fa6e000359',
|
|
|
|
|
|
|
|
'info_dict': {
|
|
|
|
|
|
|
|
'id': '90208453769',
|
|
|
|
|
|
|
|
'ext': 'mp4',
|
|
|
|
|
|
|
|
'title': '5SOS STRUM ;)',
|
|
|
|
|
|
|
|
'description': 'md5:dba62ac8639482759c8eb10ce474586a',
|
|
|
|
|
|
|
|
'thumbnail': 're:http://.*\.jpg',
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
}]
|
|
|
|
|
|
|
|
|
|
|
|
def _real_extract(self, url):
|
|
|
|
def _real_extract(self, url):
|
|
|
|
m_url = re.match(self._VALID_URL, url)
|
|
|
|
m_url = re.match(self._VALID_URL, url)
|
|
|
@ -48,6 +61,7 @@ class TumblrIE(InfoExtractor):
|
|
|
|
return [{'id': video_id,
|
|
|
|
return [{'id': video_id,
|
|
|
|
'url': video_url,
|
|
|
|
'url': video_url,
|
|
|
|
'title': video_title,
|
|
|
|
'title': video_title,
|
|
|
|
|
|
|
|
'description': self._html_search_meta('description', webpage),
|
|
|
|
'thumbnail': video_thumbnail,
|
|
|
|
'thumbnail': video_thumbnail,
|
|
|
|
'ext': ext
|
|
|
|
'ext': ext
|
|
|
|
}]
|
|
|
|
}]
|
|
|
|