]> gitweb @ CieloNegro.org - youtube-dl.git/commitdiff
[pornhub] Detect private videos (Closes #9987)
authorSergey M․ <dstftw@gmail.com>
Sun, 3 Jul 2016 20:27:00 +0000 (03:27 +0700)
committerSergey M․ <dstftw@gmail.com>
Sun, 3 Jul 2016 20:27:00 +0000 (03:27 +0700)
youtube_dl/extractor/pornhub.py

index c76afe1c4dbecc4819638af5d0946a4419ef338b..d2c92531b0745ed189da699f4392725f2d4cddd6 100644 (file)
@@ -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)<div[^>]+class=(["\']).*?\bremoved\b.*?\1[^>]*>(?P<error>.+?)</div>',
+            r'(?s)<div[^>]+class=(["\']).*?\b(?:removed|userMessageSection)\b.*?\1[^>]*>(?P<error>.+?)</div>',
             webpage, 'error message', default=None, group='error')
         if error_msg:
             error_msg = re.sub(r'\s+', ' ', error_msg)