schmittlauch/youtube-dl
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

[extractor/generic] Improve support for pornhub embeds (closes #11100)

Browse source
This commit is contained in:
Sergey M․ 2016-11-06 21:52:00 +07:00
parent e28ed498e6
commit b52c9ef165
No known key found for this signature in database
GPG key ID: 2C393E0F18A9236D
2 changed files with 11 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

10
youtube_dl/extractor/generic.py
View file

@ -1983,11 +1983,6 @@ class GenericIE(InfoExtractor):
if sportbox_urls:
return _playlist_from_matches(sportbox_urls, ie='SportBoxEmbed')
# Look for embedded PornHub player
pornhub_url = PornHubIE._extract_url(webpage)
if pornhub_url:
return self.url_result(pornhub_url, 'PornHub')
# Look for embedded XHamster player
xhamster_urls = XHamsterEmbedIE._extract_urls(webpage)
if xhamster_urls:
@ -1998,6 +1993,11 @@ class GenericIE(InfoExtractor):
if tnaflix_urls:
return _playlist_from_matches(tnaflix_urls, ie=TNAFlixNetworkEmbedIE.ie_key())
# Look for embedded PornHub player
pornhub_urls = PornHubIE._extract_urls(webpage)
if pornhub_urls:
return _playlist_from_matches(pornhub_urls, ie=PornHubIE.ie_key())
# Look for embedded DrTuber player
drtuber_urls = DrTuberIE._extract_urls(webpage)
if drtuber_urls: