Update upstream source from tag 'upstream/2019.09.28'

[youtubedl] / youtube_dl / extractor / extremetube.py

diff --git a/youtube_dl/extractor/extremetube.py b/youtube_dl/extractor/extremetube.py
index c826a5404a4f7da298927460f1f8e41dd013d3a7..acd4090fa351c56147245983b3b1b7dd0c1e5495 100644 (file)
--- a/youtube_dl/extractor/extremetube.py
+++ b/youtube_dl/extractor/extremetube.py
@@ -1,75 +1,50 @@
 from __future__ import unicode_literals
 
 from __future__ import unicode_literals
 

-import re
+from ..utils import str_to_int
+from .keezmovies import KeezMoviesIE

 
 

-from .common import InfoExtractor
-from ..compat import (
-    compat_parse_qs,
-    compat_urllib_request,
-)
-from ..utils import (
-    qualities,
-    str_to_int,
-)

 
 

-
-class ExtremeTubeIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?(?P<url>extremetube\.com/.*?video/.+?(?P<id>[0-9]+))(?:[/?&]|$)'
+class ExtremeTubeIE(KeezMoviesIE):
+    _VALID_URL = r'https?://(?:www\.)?extremetube\.com/(?:[^/]+/)?video/(?P<id>[^/#?&]+)'

     _TESTS = [{
         'url': 'http://www.extremetube.com/video/music-video-14-british-euro-brit-european-cumshots-swallow-652431',
     _TESTS = [{
         'url': 'http://www.extremetube.com/video/music-video-14-british-euro-brit-european-cumshots-swallow-652431',

-        'md5': '344d0c6d50e2f16b06e49ca011d8ac69',
+        'md5': '92feaafa4b58e82f261e5419f39c60cb',

         'info_dict': {
         'info_dict': {

-            'id': '652431',
+            'id': 'music-video-14-british-euro-brit-european-cumshots-swallow-652431',

             'ext': 'mp4',
             'title': 'Music Video 14 british euro brit european cumshots swallow',
             'ext': 'mp4',
             'title': 'Music Video 14 british euro brit european cumshots swallow',

-            'uploader': 'unknown',
+            'uploader': 'anonim',

             'view_count': int,
             'age_limit': 18,
         }
     }, {
         'url': 'http://www.extremetube.com/gay/video/abcde-1234',
         'only_matching': True,
             'view_count': int,
             'age_limit': 18,
         }
     }, {
         'url': 'http://www.extremetube.com/gay/video/abcde-1234',
         'only_matching': True,

+    }, {
+        'url': 'http://www.extremetube.com/video/latina-slut-fucked-by-fat-black-dick',
+        'only_matching': True,
+    }, {
+        'url': 'http://www.extremetube.com/video/652431',
+        'only_matching': True,

     }]
 
     def _real_extract(self, url):
     }]
 
     def _real_extract(self, url):

-        mobj = re.match(self._VALID_URL, url)
-        video_id = mobj.group('id')
-        url = 'http://www.' + mobj.group('url')
+        webpage, info = self._extract_info(url)

 
 

-        req = compat_urllib_request.Request(url)
-        req.add_header('Cookie', 'age_verified=1')
-        webpage = self._download_webpage(req, video_id)
+        if not info['title']:
+            info['title'] = self._search_regex(
+                r'<h1[^>]+title="([^"]+)"[^>]*>', webpage, 'title')

 
 

-        video_title = self._html_search_regex(
-            r'<h1 [^>]*?title="([^"]+)"[^>]*>', webpage, 'title')

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

-            r'Uploaded by:\s*</strong>\s*(.+?)\s*</div>',
+            r'Uploaded by:\s*</[^>]+>\s*<a[^>]+>(.+?)</a>',

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

-        view_count = str_to_int(self._html_search_regex(
-            r'Views:\s*</strong>\s*<span>([\d,\.]+)</span>',
+        view_count = str_to_int(self._search_regex(
+            r'Views:\s*</[^>]+>\s*<[^>]+>([\d,\.]+)</',

             webpage, 'view count', fatal=False))
 
             webpage, 'view count', fatal=False))
 

-        flash_vars = compat_parse_qs(self._search_regex(
-            r'<param[^>]+?name="flashvars"[^>]+?value="([^"]+)"', webpage, 'flash vars'))
-
-        formats = []
-        quality = qualities(['180p', '240p', '360p', '480p', '720p', '1080p'])
-        for k, vals in flash_vars.items():
-            m = re.match(r'quality_(?P<quality>[0-9]+p)$', k)
-            if m is not None:
-                formats.append({
-                    'format_id': m.group('quality'),
-                    'quality': quality(m.group('quality')),
-                    'url': vals[0],
-                })
-
-        self._sort_formats(formats)
-
-        return {
-            'id': video_id,
-            'title': video_title,
-            'formats': formats,
+        info.update({

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

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