X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=youtube_dl%2Fextractor%2Fpornhub.py;h=0c8b731cf47267568e43ccd09ff21f1683b4d992;hb=363cf58645d021810b7fd579084de07471407ae3;hp=913995044c34171e038991b7b0e59029126bb3c0;hpb=e66e1a0046ca804461c4c9c3e890165ec9d865e1;p=youtube-dl.git
diff --git a/youtube_dl/extractor/pornhub.py b/youtube_dl/extractor/pornhub.py
index 913995044..0c8b731cf 100644
--- a/youtube_dl/extractor/pornhub.py
+++ b/youtube_dl/extractor/pornhub.py
@@ -33,10 +33,8 @@ class PornHubIE(InfoExtractor):
}
def _extract_count(self, pattern, webpage, name):
- count = self._html_search_regex(pattern, webpage, '%s count' % name, fatal=False)
- if count:
- count = str_to_int(count)
- return count
+ return str_to_int(self._search_regex(
+ pattern, webpage, '%s count' % name, fatal=False))
def _real_extract(self, url):
video_id = self._match_id(url)
@@ -56,17 +54,20 @@ class PornHubIE(InfoExtractor):
video_title = self._html_search_regex(r'
]+>([^<]+)', webpage, 'title')
video_uploader = self._html_search_regex(
- r'(?s)From: .+?<(?:a href="/users/|a href="/channels/|]+>(.+?)<',
webpage, 'uploader', fatal=False)
thumbnail = self._html_search_regex(r'"image_url":"([^"]+)', webpage, 'thumbnail', fatal=False)
if thumbnail:
thumbnail = compat_urllib_parse.unquote(thumbnail)
- view_count = self._extract_count(r'([\d,\.]+) views', webpage, 'view')
- like_count = self._extract_count(r'([\d,\.]+)', webpage, 'like')
- dislike_count = self._extract_count(r'([\d,\.]+)', webpage, 'dislike')
+ view_count = self._extract_count(
+ r'([\d,\.]+) views', webpage, 'view')
+ like_count = self._extract_count(
+ r'([\d,\.]+)', webpage, 'like')
+ dislike_count = self._extract_count(
+ r'([\d,\.]+)', webpage, 'dislike')
comment_count = self._extract_count(
- r'All comments \(', webpage, 'comment')
+ r'All Comments\s*\(([\d,.]+)\)', webpage, 'comment')
video_urls = list(map(compat_urllib_parse.unquote, re.findall(r'"quality_[0-9]{3}p":"([^"]+)', webpage)))
if webpage.find('"encrypted":true') != -1: