Update upstream source from tag 'upstream/2018.09.10'

[youtubedl] / youtube_dl / extractor / tube8.py

diff --git a/youtube_dl/extractor/tube8.py b/youtube_dl/extractor/tube8.py
index 08a48c05acf34b6cd190ba52d58189935fe6b20f..368c45729af533eca244f4d0e8a29bfe5f4f7a8a 100644 (file)
--- a/youtube_dl/extractor/tube8.py
+++ b/youtube_dl/extractor/tube8.py
@@ -1,84 +1,86 @@
 from __future__ import unicode_literals
 
 from __future__ import unicode_literals
 

-import json

 import re
 
 import re
 

-from .common import InfoExtractor

 from ..utils import (
 from ..utils import (

-    compat_urllib_parse_urlparse,
-    compat_urllib_request,

     int_or_none,
     str_to_int,
 )
     int_or_none,
     str_to_int,
 )

-from ..aes import aes_decrypt_text
+from .keezmovies import KeezMoviesIE

 
 
 
 

-class Tube8IE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?tube8\.com/(?:[^/]+/){2}(?P<id>\d+)'
-    _TEST = {
+class Tube8IE(KeezMoviesIE):
+    _VALID_URL = r'https?://(?:www\.)?tube8\.com/(?:[^/]+/)+(?P<display_id>[^/]+)/(?P<id>\d+)'
+    _TESTS = [{

         'url': 'http://www.tube8.com/teen/kasia-music-video/229795/',
         'url': 'http://www.tube8.com/teen/kasia-music-video/229795/',

-        'md5': '44bf12b98313827dd52d35b8706a4ea0',
+        'md5': '65e20c48e6abff62ed0c3965fff13a39',

         'info_dict': {
             'id': '229795',
         'info_dict': {
             'id': '229795',

+            'display_id': 'kasia-music-video',

             'ext': 'mp4',
             'description': 'hot teen Kasia grinding',
             'uploader': 'unknown',
             'title': 'Kasia music video',
             'age_limit': 18,
             'ext': 'mp4',
             'description': 'hot teen Kasia grinding',
             'uploader': 'unknown',
             'title': 'Kasia music video',
             'age_limit': 18,

-        }
-    }
+            'duration': 230,
+            'categories': ['Teen'],
+            'tags': ['dancing'],
+        },
+    }, {
+        'url': 'http://www.tube8.com/shemale/teen/blonde-cd-gets-kidnapped-by-two-blacks-and-punished-for-being-a-slutty-girl/19569151/',
+        'only_matching': True,
+    }]

 
 

-    def _real_extract(self, url):
-        mobj = re.match(self._VALID_URL, url)
-        video_id = mobj.group('id')
-
-        req = compat_urllib_request.Request(url)
-        req.add_header('Cookie', 'age_verified=1')
-        webpage = self._download_webpage(req, video_id)
+    @staticmethod
+    def _extract_urls(webpage):
+        return re.findall(
+            r'<iframe[^>]+\bsrc=["\']((?:https?:)?//(?:www\.)?tube8\.com/embed/(?:[^/]+/)+\d+)',
+            webpage)

 
 

-        flashvars = json.loads(self._html_search_regex(
-            r'var flashvars\s*=\s*({.+?})', webpage, 'flashvars'))
-
-        video_url = flashvars['video_url']
-        if flashvars.get('encrypted') is True:
-            video_url = aes_decrypt_text(video_url, flashvars['video_title'], 32).decode('utf-8')
-        path = compat_urllib_parse_urlparse(video_url).path
-        format_id = '-'.join(path.split('/')[4].split('_')[:2])
+    def _real_extract(self, url):
+        webpage, info = self._extract_info(url)

 
 

-        thumbnail = flashvars.get('image_url')
+        if not info['title']:
+            info['title'] = self._html_search_regex(
+                r'videoTitle\s*=\s*"([^"]+)', webpage, 'title')

 
 

-        title = self._html_search_regex(
-            r'videotitle\s*=\s*"([^"]+)', webpage, 'title')

         description = self._html_search_regex(
         description = self._html_search_regex(

-            r'>Description:</strong>(.+?)<', webpage, 'description', fatal=False)
+            r'>Description:</strong>\s*(.+?)\s*<', webpage, 'description', fatal=False)

         uploader = self._html_search_regex(
         uploader = self._html_search_regex(

-            r'<strong class="video-username">(?:<a href="[^"]+">)?([^<]+)(?:</a>)?</strong>',
+            r'<span class="username">\s*(.+?)\s*<',

             webpage, 'uploader', fatal=False)
 
             webpage, 'uploader', fatal=False)
 

-        like_count = int_or_none(self._html_search_regex(
-            r"rupVar\s*=\s*'(\d+)'", webpage, 'like count', fatal=False))
-        dislike_count = int_or_none(self._html_search_regex(
-            r"rdownVar\s*=\s*'(\d+)'", webpage, 'dislike count', fatal=False))
-        view_count = self._html_search_regex(
-            r'<strong>Views: </strong>([\d,\.]+)</li>', webpage, 'view count', fatal=False)
-        if view_count:
-            view_count = str_to_int(view_count)
-        comment_count = self._html_search_regex(
-            r'<span id="allCommentsCount">(\d+)</span>', webpage, 'comment count', fatal=False)
-        if comment_count:
-            comment_count = str_to_int(comment_count)
+        like_count = int_or_none(self._search_regex(
+            r'rupVar\s*=\s*"(\d+)"', webpage, 'like count', fatal=False))
+        dislike_count = int_or_none(self._search_regex(
+            r'rdownVar\s*=\s*"(\d+)"', webpage, 'dislike count', fatal=False))
+        view_count = str_to_int(self._search_regex(
+            r'<strong>Views: </strong>([\d,\.]+)\s*</li>',
+            webpage, 'view count', fatal=False))
+        comment_count = str_to_int(self._search_regex(
+            r'<span id="allCommentsCount">(\d+)</span>',
+            webpage, 'comment count', fatal=False))

 
 

-        return {
-            'id': video_id,
-            'url': video_url,
-            'title': title,
+        category = self._search_regex(
+            r'Category:\s*</strong>\s*<a[^>]+href=[^>]+>([^<]+)',
+            webpage, 'category', fatal=False)
+        categories = [category] if category else None
+
+        tags_str = self._search_regex(
+            r'(?s)Tags:\s*</strong>(.+?)</(?!a)',
+            webpage, 'tags', fatal=False)
+        tags = [t for t in re.findall(
+            r'<a[^>]+href=[^>]+>([^<]+)', tags_str)] if tags_str else None
+
+        info.update({

             'description': description,
             'description': description,

-            'thumbnail': thumbnail,

             'uploader': uploader,
             'uploader': uploader,

-            'format_id': format_id,

             'view_count': view_count,
             'like_count': like_count,
             'dislike_count': dislike_count,
             'comment_count': comment_count,
             'view_count': view_count,
             'like_count': like_count,
             'dislike_count': dislike_count,
             'comment_count': comment_count,

-            'age_limit': 18,
-        }
+            'categories': categories,
+            'tags': tags,
+        })
+
+        return info