|
|
@ -27,7 +27,7 @@ class PornHubIE(InfoExtractor): |
|
|
|
_VALID_URL = r'''(?x) |
|
|
|
https?:// |
|
|
|
(?: |
|
|
|
(?:[^/]+\.)?pornhub\.com/(?:(?:view_video\.php|video/show)\?viewkey=|embed/)| |
|
|
|
(?:[^/]+\.)?pornhub\.(?:com|net)/(?:(?:view_video\.php|video/show)\?viewkey=|embed/)| |
|
|
|
(?:www\.)?thumbzilla\.com/video/ |
|
|
|
) |
|
|
|
(?P<id>[\da-z]+) |
|
|
@ -340,7 +340,7 @@ class PornHubPlaylistBaseIE(InfoExtractor): |
|
|
|
|
|
|
|
|
|
|
|
class PornHubPlaylistIE(PornHubPlaylistBaseIE): |
|
|
|
_VALID_URL = r'https?://(?:[^/]+\.)?pornhub\.com/playlist/(?P<id>\d+)' |
|
|
|
_VALID_URL = r'https?://(?:[^/]+\.)?pornhub\.(?:com|net)/playlist/(?P<id>\d+)' |
|
|
|
_TESTS = [{ |
|
|
|
'url': 'http://www.pornhub.com/playlist/4667351', |
|
|
|
'info_dict': { |
|
|
@ -355,7 +355,7 @@ class PornHubPlaylistIE(PornHubPlaylistBaseIE): |
|
|
|
|
|
|
|
|
|
|
|
class PornHubUserVideosIE(PornHubPlaylistBaseIE): |
|
|
|
_VALID_URL = r'https?://(?:[^/]+\.)?pornhub\.com/(?:(?:user|channel)s|model|pornstar)/(?P<id>[^/]+)/videos' |
|
|
|
_VALID_URL = r'https?://(?:[^/]+\.)?pornhub\.(?:com|net)/(?:(?:user|channel)s|model|pornstar)/(?P<id>[^/]+)/videos' |
|
|
|
_TESTS = [{ |
|
|
|
'url': 'http://www.pornhub.com/users/zoe_ph/videos/public', |
|
|
|
'info_dict': { |
|
|
@ -393,6 +393,9 @@ class PornHubUserVideosIE(PornHubPlaylistBaseIE): |
|
|
|
}, { |
|
|
|
'url': 'https://www.pornhub.com/pornstar/jenny-blighe/videos/upload', |
|
|
|
'only_matching': True, |
|
|
|
}, { |
|
|
|
'url': 'https://www.pornhub.net/view_video.php?viewkey=203640933', |
|
|
|
'only_matching': True, |
|
|
|
}] |
|
|
|
|
|
|
|
def _real_extract(self, url): |
|
|
|