|
|
@ -4,6 +4,7 @@ from __future__ import unicode_literals
|
|
|
|
import re
|
|
|
|
import re
|
|
|
|
|
|
|
|
|
|
|
|
from .common import InfoExtractor
|
|
|
|
from .common import InfoExtractor
|
|
|
|
|
|
|
|
from .pornhub import PornHubIE
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
class TumblrIE(InfoExtractor):
|
|
|
|
class TumblrIE(InfoExtractor):
|
|
|
@ -55,6 +56,10 @@ class TumblrIE(InfoExtractor):
|
|
|
|
if vid_me_embed_url is not None:
|
|
|
|
if vid_me_embed_url is not None:
|
|
|
|
return self.url_result(vid_me_embed_url, 'Vidme')
|
|
|
|
return self.url_result(vid_me_embed_url, 'Vidme')
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
pornhub_url = PornHubIE._extract_url(webpage)
|
|
|
|
|
|
|
|
if pornhub_url:
|
|
|
|
|
|
|
|
return self.url_result(pornhub_url, 'PornHub')
|
|
|
|
|
|
|
|
|
|
|
|
iframe_url = self._search_regex(
|
|
|
|
iframe_url = self._search_regex(
|
|
|
|
r'src=\'(https?://www\.tumblr\.com/video/[^\']+)\'',
|
|
|
|
r'src=\'(https?://www\.tumblr\.com/video/[^\']+)\'',
|
|
|
|
webpage, 'iframe url')
|
|
|
|
webpage, 'iframe url')
|
|
|
|