projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[tumblr] Add support for pornhub embeds (Closes #5963)
[youtube-dl]
/
youtube_dl
/
extractor
/
tumblr.py
diff --git
a/youtube_dl/extractor/tumblr.py
b/youtube_dl/extractor/tumblr.py
index e6218808f29116e8d2d0d39f2a61342eef1bc823..63c20310d8e54f98f2c19bd23f9ebca947ae23d3 100644
(file)
--- a/
youtube_dl/extractor/tumblr.py
+++ b/
youtube_dl/extractor/tumblr.py
@@
-4,6
+4,7
@@
from __future__ import unicode_literals
import re
from .common import InfoExtractor
import re
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:
return self.url_result(vid_me_embed_url, 'Vidme')
if vid_me_embed_url is not None:
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(
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')