logo

youtube-dl

[mirror] Download/Watch videos from video hosters
commit: f28aeff26416515fbaf46ce087e8332a15958c23
parent 242a14a1f6ea14b8e7de9aa1eddaf938de825e1e
Author: Sergey M․ <dstftw@gmail.com>
Date:   Tue,  7 Feb 2017 01:52:59 +0700

[pornhub] Fix extraction (closes #11997)

Diffstat:

Myoutube_dl/extractor/pornhub.py7++++++-
1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/youtube_dl/extractor/pornhub.py b/youtube_dl/extractor/pornhub.py @@ -156,7 +156,12 @@ class PornHubIE(InfoExtractor): comment_count = self._extract_count( r'All Comments\s*<span>\(([\d,.]+)\)', webpage, 'comment') - video_urls = list(map(compat_urllib_parse_unquote, re.findall(r"player_quality_[0-9]{3}p\s*=\s*'([^']+)'", webpage))) + video_urls = [] + for quote, video_url in re.findall( + r'player_quality_[0-9]{3,4}p\s*=\s*(["\'])(.+?)\1;', webpage): + video_urls.append(compat_urllib_parse_unquote(re.sub( + r'{0}\s*\+\s*{0}'.format(quote), '', video_url))) + if webpage.find('"encrypted":true') != -1: password = compat_urllib_parse_unquote_plus( self._search_regex(r'"video_title":"([^"]+)', webpage, 'password'))