youtube-dl

Another place where youtube-dl lives on
git clone git://git.oshgnacknak.de/youtube-dl.git
Log | Files | Refs | README | LICENSE

commit 50789175edbe3aaad77f45e6fe883ba09580cc6f
parent dc1b027cd4672c6b4772c12daf2a6a2a93469270
Author: Philipp Hagemeister <phihag@phihag.de>
Date:   Thu, 22 Jan 2015 23:48:58 +0100

[pornhub] Detect private videos and emit an error message (Closes #4764)

Diffstat:
Myoutube_dl/extractor/pornhub.py | 10++++++++++
1 file changed, 10 insertions(+), 0 deletions(-)

diff --git a/youtube_dl/extractor/pornhub.py b/youtube_dl/extractor/pornhub.py @@ -10,6 +10,7 @@ from ..compat import ( compat_urllib_request, ) from ..utils import ( + ExtractorError, str_to_int, ) from ..aes import ( @@ -44,6 +45,15 @@ class PornHubIE(InfoExtractor): req.add_header('Cookie', 'age_verified=1') webpage = self._download_webpage(req, video_id) + error_msg = self._html_search_regex( + r'(?s)<div class="userMessageSection[^"]*".*?>(.*?)</div>', + webpage, 'error message', default=None) + if error_msg: + error_msg = re.sub(r'\s+', ' ', error_msg) + raise ExtractorError( + 'PornHub said: %s' % error_msg, + expected=True, video_id=video_id) + video_title = self._html_search_regex(r'<h1 [^>]+>([^<]+)', webpage, 'title') video_uploader = self._html_search_regex( r'(?s)From:&nbsp;.+?<(?:a href="/users/|a href="/channels/|<span class="username)[^>]+>(.+?)<',