pepepper/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl synced 2024-12-23 12:40:11 +09:00
Code Issues Projects Releases Wiki Activity

Merge 34e1010545 into c5098961b0

Browse Source
This commit is contained in:
DarkFighterLuke 2024-08-21 22:32:57 -04:00 committed by GitHub
commit d1dc5be0dc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
youtube_dl/extractor/pornhub.py
View File

@ -20,8 +20,8 @@ from ..utils import (
merge_dicts, merge_dicts,
NO_DEFAULT, NO_DEFAULT,
orderedSet, orderedSet,
parse_count,
remove_quotes, remove_quotes,
str_to_int,
update_url_query, update_url_query,
urlencode_postdata, urlencode_postdata,
url_or_none, url_or_none,
@ -132,7 +132,7 @@ class PornHubIE(PornHubBaseIE):
''' % PornHubBaseIE._PORNHUB_HOST_RE ''' % PornHubBaseIE._PORNHUB_HOST_RE
_TESTS = [{ _TESTS = [{
'url': 'http://www.pornhub.com/view_video.php?viewkey=648719015', 'url': 'http://www.pornhub.com/view_video.php?viewkey=648719015',
'md5': 'a6391306d050e4547f62b3f485dd9ba9', 'md5': 'fc5caada049bee2e944229ad850ef5db',
'info_dict': { 'info_dict': {
'id': '648719015', 'id': '648719015',
'ext': 'mp4', 'ext': 'mp4',
@ -255,7 +255,7 @@ class PornHubIE(PornHubBaseIE):
webpage) webpage)
def _extract_count(self, pattern, webpage, name): def _extract_count(self, pattern, webpage, name):
return str_to_int(self._search_regex( return parse_count(self._search_regex(
pattern, webpage, '%s count' % name, fatal=False)) pattern, webpage, '%s count' % name, fatal=False))
def _real_extract(self, url): def _real_extract(self, url):
@ -466,7 +466,7 @@ class PornHubIE(PornHubBaseIE):
webpage, name) webpage, name)
view_count = self._extract_count( view_count = self._extract_count(
r'<span class="count">([\d,\.]+)</span> [Vv]iews', webpage, 'view') r'<span class="count">(?P<views>.+?)</span> [Vv]iews', webpage, 'view')
like_count = extract_vote_count('Up', 'like') like_count = extract_vote_count('Up', 'like')
dislike_count = extract_vote_count('Down', 'dislike') dislike_count = extract_vote_count('Down', 'dislike')
comment_count = self._extract_count( comment_count = self._extract_count(