R-yan/l1ving_youtube-dl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PornHub] Applied requested fixes for PR #15614

Browse Source
This commit is contained in:
Parmjit Virk 2018-02-16 11:13:40 -06:00
parent 748c147a05
commit 539dd2b83c
2 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
youtube_dl/extractor/extractors.py
View File

@ -829,7 +829,6 @@ from .pornflip import PornFlipIE
from .pornhd import PornHdIE from .pornhd import PornHdIE
from .pornhub import ( from .pornhub import (
PornHubIE, PornHubIE,
PornHubChannelVideosIE,
PornHubPlaylistIE, PornHubPlaylistIE,
PornHubUserVideosIE, PornHubUserVideosIE,
) )

44
youtube_dl/extractor/pornhub.py
View File

@ -275,7 +275,7 @@ class PornHubPlaylistIE(PornHubPlaylistBaseIE):
class PornHubUserVideosIE(PornHubPlaylistBaseIE): class PornHubUserVideosIE(PornHubPlaylistBaseIE):
_VALID_URL = r'https?://(?:www\.)?pornhub\.com/users/(?P<id>[^/]+)/videos' _VALID_URL = r'https?://(?:www\.)?pornhub\.com/(?:user|channel)s/(?P<id>[^/]+)/videos'
_TESTS = [{ _TESTS = [{
'url': 'http://www.pornhub.com/users/zoe_ph/videos/public', 'url': 'http://www.pornhub.com/users/zoe_ph/videos/public',
'info_dict': { 'info_dict': {
@ -285,6 +285,28 @@ class PornHubUserVideosIE(PornHubPlaylistBaseIE):
}, { }, {
'url': 'http://www.pornhub.com/users/rushandlia/videos', 'url': 'http://www.pornhub.com/users/rushandlia/videos',
'only_matching': True, 'only_matching': True,
}, {
# default sorting as Top Rated Videos
'url': 'https://www.pornhub.com/channels/povd/videos',
'info_dict': {
'id': 'povd',
},
'playlist_mincount': 293,
'params': {
'skip_download': True,
},
}, {
# Top Rated Videos
'url': 'https://www.pornhub.com/channels/povd/videos?o=ra',
'only_matching': True,
}, {
# Most Recent Videos
'url': 'https://www.pornhub.com/channels/povd/videos?o=da',
'only_matching': True,
}, {
# Most Viewed Videos
'url': 'https://www.pornhub.com/channels/povd/videos?o=vi',
'only_matching': True,
}] }]
def _real_extract(self, url): def _real_extract(self, url):
@ -306,23 +328,3 @@ class PornHubUserVideosIE(PornHubPlaylistBaseIE):
entries.extend(page_entries) entries.extend(page_entries)
return self.playlist_result(entries, user_id) return self.playlist_result(entries, user_id)
class PornHubChannelVideosIE(PornHubUserVideosIE):
_VALID_URL = r'https?://(?:www\.)?pornhub\.com/channels/(?P<id>[^/]+)/videos'
_TESTS = [{
# sorted as Top Rated Videos
'url': 'https://www.pornhub.com/channels/povd/videos?o=ra',
'info_dict': {
'id': 'povd',
},
'playlist_mincount': 293,
}, {
# Most Recent Videos
'url': 'https://www.pornhub.com/channels/povd/videos?o=da',
'only_matching': True,
}, {
# Most Viewed Videos
'url': 'https://www.pornhub.com/channels/povd/videos?o=vi',
'only_matching': True,
}]