projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
21b0846
)
[pornhub] Add support for downloading single pages and search pages (closes #15570)
author
Sergey M․
<dstftw@gmail.com>
Fri, 21 Jun 2019 23:01:43 +0000
(06:01 +0700)
committer
Sergey M․
<dstftw@gmail.com>
Fri, 21 Jun 2019 23:01:43 +0000
(06:01 +0700)
youtube_dl/extractor/pornhub.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/pornhub.py
b/youtube_dl/extractor/pornhub.py
index 72c351d56de2e6f95db1660ff6c7485818a0c644..7de58560499c2d3858c411d2f051775a970c07dd 100644
(file)
--- a/
youtube_dl/extractor/pornhub.py
+++ b/
youtube_dl/extractor/pornhub.py
@@
-409,14
+409,14
@@
class PornHubUserIE(PornHubPlaylistBaseIE):
@classmethod
def suitable(cls, url):
return (False
@classmethod
def suitable(cls, url):
return (False
- if PornHub
User
VideosIE.suitable(url) or PornHubUserVideosUploadIE.suitable(url)
+ if PornHub
Paged
VideosIE.suitable(url) or PornHubUserVideosUploadIE.suitable(url)
else super(PornHubUserIE, cls).suitable(url))
def _real_extract(self, url):
mobj = re.match(self._VALID_URL, url)
user_id = mobj.group('id')
return self.url_result(
else super(PornHubUserIE, cls).suitable(url))
def _real_extract(self, url):
mobj = re.match(self._VALID_URL, url)
user_id = mobj.group('id')
return self.url_result(
- '%s/videos' % mobj.group('url'), ie=PornHub
User
VideosIE.ie_key(),
+ '%s/videos' % mobj.group('url'), ie=PornHub
Paged
VideosIE.ie_key(),
video_id=user_id)
video_id=user_id)
@@
-426,10
+426,13
@@
class PornHubPagedPlaylistBaseIE(PornHubPlaylistBaseIE):
host = mobj.group('host')
user_id = mobj.group('id')
host = mobj.group('host')
user_id = mobj.group('id')
+ page = int_or_none(self._search_regex(
+ r'\bpage=(\d+)', url, 'page', default=None))
+
page_url = self._make_page_url(url)
entries = []
page_url = self._make_page_url(url)
entries = []
- for page_num in itertools.count(1):
+ for page_num in
(page, ) if page is not None else
itertools.count(1):
try:
webpage = self._download_webpage(
page_url, user_id, 'Downloading page %d' % page_num,
try:
webpage = self._download_webpage(
page_url, user_id, 'Downloading page %d' % page_num,
@@
-448,10
+451,17
@@
class PornHubPagedPlaylistBaseIE(PornHubPlaylistBaseIE):
return self.playlist_result(orderedSet(entries), user_id)
return self.playlist_result(orderedSet(entries), user_id)
-class PornHubUserVideosIE(PornHubPagedPlaylistBaseIE):
- _VALID_URL = r'https?://(?:[^/]+\.)?(?P<host>pornhub\.(?:com|net))/(?:(?:user|channel)s|model|pornstar)/(?P<id>[^/]+)/videos'
+class PornHubPagedVideosIE(PornHubPagedPlaylistBaseIE):
+ _VALID_URL = r'''(?x)
+ https?://
+ (?:[^/]+\.)?(?P<host>pornhub\.(?:com|net))/
+ (?:
+ (?:(?:user|channel)s|model|pornstar)/(?P<id>[^/]+)/videos|
+ video/search
+ )
+ '''
_TESTS = [{
_TESTS = [{
- 'url': 'https://www.pornhub.com/model/zoe_ph/videos
/upload
',
+ 'url': 'https://www.pornhub.com/model/zoe_ph/videos',
'only_matching': True,
}, {
'url': 'http://www.pornhub.com/users/rushandlia/videos',
'only_matching': True,
}, {
'url': 'http://www.pornhub.com/users/rushandlia/videos',
@@
-462,6
+472,12
@@
class PornHubUserVideosIE(PornHubPagedPlaylistBaseIE):
'id': 'jenny-blighe',
},
'playlist_mincount': 149,
'id': 'jenny-blighe',
},
'playlist_mincount': 149,
+ }, {
+ 'url': 'https://www.pornhub.com/pornstar/jenny-blighe/videos?page=3',
+ 'info_dict': {
+ 'id': 'jenny-blighe',
+ },
+ 'playlist_mincount': 40,
}, {
# default sorting as Top Rated Videos
'url': 'https://www.pornhub.com/channels/povd/videos',
}, {
# default sorting as Top Rated Videos
'url': 'https://www.pornhub.com/channels/povd/videos',
@@
-484,12
+500,6
@@
class PornHubUserVideosIE(PornHubPagedPlaylistBaseIE):
}, {
'url': 'http://www.pornhub.com/users/zoe_ph/videos/public',
'only_matching': True,
}, {
'url': 'http://www.pornhub.com/users/zoe_ph/videos/public',
'only_matching': True,
- }, {
- 'url': 'https://www.pornhub.com/model/jayndrea/videos/upload',
- 'only_matching': True,
- }, {
- 'url': 'https://www.pornhub.com/pornstar/jenny-blighe/videos/upload',
- 'only_matching': True,
}, {
# Most Viewed Videos
'url': 'https://www.pornhub.com/pornstar/liz-vicious/videos?o=mv',
}, {
# Most Viewed Videos
'url': 'https://www.pornhub.com/pornstar/liz-vicious/videos?o=mv',
@@
-506,9
+516,6
@@
class PornHubUserVideosIE(PornHubPagedPlaylistBaseIE):
# Newest Videos
'url': 'https://www.pornhub.com/pornstar/liz-vicious/videos?o=cm',
'only_matching': True,
# Newest Videos
'url': 'https://www.pornhub.com/pornstar/liz-vicious/videos?o=cm',
'only_matching': True,
- }, {
- 'url': 'https://www.pornhub.com/pornstar/liz-vicious/videos/upload',
- 'only_matching': True,
}, {
'url': 'https://www.pornhub.com/pornstar/liz-vicious/videos/paid',
'only_matching': True,
}, {
'url': 'https://www.pornhub.com/pornstar/liz-vicious/videos/paid',
'only_matching': True,
@@
-521,7
+528,7
@@
class PornHubUserVideosIE(PornHubPagedPlaylistBaseIE):
def suitable(cls, url):
return (False
if PornHubUserVideosUploadIE.suitable(url)
def suitable(cls, url):
return (False
if PornHubUserVideosUploadIE.suitable(url)
- else super(PornHub
User
VideosIE, cls).suitable(url))
+ else super(PornHub
Paged
VideosIE, cls).suitable(url))
def _make_page_url(self, url):
return url
def _make_page_url(self, url):
return url