mirror of
				https://gitlab.com/ytdl-org/youtube-dl.git
				synced 2025-11-03 23:57:06 -05:00 
			
		
		
		
	[extremetube] Modernize
This commit is contained in:
		@@ -1,3 +1,5 @@
 | 
			
		||||
from __future__ import unicode_literals
 | 
			
		||||
 | 
			
		||||
import os
 | 
			
		||||
import re
 | 
			
		||||
 | 
			
		||||
@@ -8,16 +10,18 @@ from ..utils import (
 | 
			
		||||
    compat_urllib_parse,
 | 
			
		||||
)
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
class ExtremeTubeIE(InfoExtractor):
 | 
			
		||||
    _VALID_URL = r'^(?:https?://)?(?:www\.)?(?P<url>extremetube\.com/.*?video/.+?(?P<videoid>[0-9]+))(?:[/?&]|$)'
 | 
			
		||||
    _TESTS = [{
 | 
			
		||||
        u'url': u'http://www.extremetube.com/video/music-video-14-british-euro-brit-european-cumshots-swallow-652431',
 | 
			
		||||
        u'file': u'652431.mp4',
 | 
			
		||||
        u'md5': u'1fb9228f5e3332ec8c057d6ac36f33e0',
 | 
			
		||||
        u'info_dict': {
 | 
			
		||||
            u"title": u"Music Video 14 british euro brit european cumshots swallow",
 | 
			
		||||
            u"uploader": u"unknown",
 | 
			
		||||
            u"age_limit": 18,
 | 
			
		||||
        'url': 'http://www.extremetube.com/video/music-video-14-british-euro-brit-european-cumshots-swallow-652431',
 | 
			
		||||
        'md5': '1fb9228f5e3332ec8c057d6ac36f33e0',
 | 
			
		||||
        'info_dict': {
 | 
			
		||||
            'id': '652431',
 | 
			
		||||
            'ext': 'mp4',
 | 
			
		||||
            'title': 'Music Video 14 british euro brit european cumshots swallow',
 | 
			
		||||
            'uploader': 'unknown',
 | 
			
		||||
            'age_limit': 18,
 | 
			
		||||
        }
 | 
			
		||||
    }, {
 | 
			
		||||
        'url': 'http://www.extremetube.com/gay/video/abcde-1234',
 | 
			
		||||
@@ -33,11 +37,14 @@ class ExtremeTubeIE(InfoExtractor):
 | 
			
		||||
        req.add_header('Cookie', 'age_verified=1')
 | 
			
		||||
        webpage = self._download_webpage(req, video_id)
 | 
			
		||||
 | 
			
		||||
        video_title = self._html_search_regex(r'<h1 [^>]*?title="([^"]+)"[^>]*>\1<', webpage, u'title')
 | 
			
		||||
        uploader = self._html_search_regex(r'>Posted by:(?=<)(?:\s|<[^>]*>)*(.+?)\|', webpage, u'uploader', fatal=False)
 | 
			
		||||
        video_url = compat_urllib_parse.unquote(self._html_search_regex(r'video_url=(.+?)&', webpage, u'video_url'))
 | 
			
		||||
        video_title = self._html_search_regex(
 | 
			
		||||
            r'<h1 [^>]*?title="([^"]+)"[^>]*>\1<', webpage, 'title')
 | 
			
		||||
        uploader = self._html_search_regex(
 | 
			
		||||
            r'>Posted by:(?=<)(?:\s|<[^>]*>)*(.+?)\|', webpage, 'uploader',
 | 
			
		||||
            fatal=False)
 | 
			
		||||
        video_url = compat_urllib_parse.unquote(self._html_search_regex(
 | 
			
		||||
            r'video_url=(.+?)&', webpage, 'video_url'))
 | 
			
		||||
        path = compat_urllib_parse_urlparse(video_url).path
 | 
			
		||||
        extension = os.path.splitext(path)[1][1:]
 | 
			
		||||
        format = path.split('/')[5].split('_')[:2]
 | 
			
		||||
        format = "-".join(format)
 | 
			
		||||
 | 
			
		||||
@@ -46,7 +53,6 @@ class ExtremeTubeIE(InfoExtractor):
 | 
			
		||||
            'title': video_title,
 | 
			
		||||
            'uploader': uploader,
 | 
			
		||||
            'url': video_url,
 | 
			
		||||
            'ext': extension,
 | 
			
		||||
            'format': format,
 | 
			
		||||
            'format_id': format,
 | 
			
		||||
            'age_limit': 18,
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user