From: Sergey M․ Date: Sun, 3 Jul 2016 20:27:00 +0000 (+0700) Subject: [pornhub] Detect private videos (Closes #9987) X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=195f0845421b005a08f12634b56ea31089fd3808;p=youtube-dl [pornhub] Detect private videos (Closes #9987) --- diff --git a/youtube_dl/extractor/pornhub.py b/youtube_dl/extractor/pornhub.py index c76afe1c4..d2c92531b 100644 --- a/youtube_dl/extractor/pornhub.py +++ b/youtube_dl/extractor/pornhub.py @@ -82,6 +82,10 @@ class PornHubIE(InfoExtractor): # removed by uploader 'url': 'http://www.pornhub.com/view_video.php?viewkey=ph572716d15a111', 'only_matching': True, + }, { + # private video + 'url': 'http://www.pornhub.com/view_video.php?viewkey=ph56fd731fce6b7', + 'only_matching': True, }, { 'url': 'https://www.thumbzilla.com/video/ph56c6114abd99a/horny-girlfriend-sex', 'only_matching': True, @@ -107,7 +111,7 @@ class PornHubIE(InfoExtractor): webpage = self._download_webpage(req, video_id) error_msg = self._html_search_regex( - r'(?s)]+class=(["\']).*?\bremoved\b.*?\1[^>]*>(?P.+?)', + r'(?s)]+class=(["\']).*?\b(?:removed|userMessageSection)\b.*?\1[^>]*>(?P.+?)', webpage, 'error message', default=None, group='error') if error_msg: error_msg = re.sub(r'\s+', ' ', error_msg)