mirror of
https://github.com/ytdl-org/youtube-dl.git
synced 2024-11-25 03:32:05 +00:00
[extremetube] Modernize
This commit is contained in:
parent
8804f10e6b
commit
ab19b46b88
1 changed files with 16 additions and 57 deletions
|
@ -1,22 +1,17 @@
|
||||||
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 ..utils import (
|
|
||||||
int_or_none,
|
|
||||||
sanitized_Request,
|
|
||||||
str_to_int,
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
class ExtremeTubeIE(InfoExtractor):
|
class ExtremeTubeIE(KeezMoviesIE):
|
||||||
_VALID_URL = r'https?://(?:www\.)?extremetube\.com/(?:[^/]+/)?video/(?P<id>[^/#?&]+)'
|
_VALID_URL = r'https?://(?:www\.)?extremetube\.com/(?:[^/]+/)?video/(?:(?P<display_id>[^/]+)-)(?P<id>\d+)'
|
||||||
_TESTS = [{
|
_TESTS = [{
|
||||||
'url': 'http://www.extremetube.com/video/music-video-14-british-euro-brit-european-cumshots-swallow-652431',
|
'url': 'http://www.extremetube.com/video/music-video-14-british-euro-brit-european-cumshots-swallow-652431',
|
||||||
'md5': '344d0c6d50e2f16b06e49ca011d8ac69',
|
'md5': '1fb9228f5e3332ec8c057d6ac36f33e0',
|
||||||
'info_dict': {
|
'info_dict': {
|
||||||
'id': 'music-video-14-british-euro-brit-european-cumshots-swallow-652431',
|
'id': '652431',
|
||||||
|
'display_id': 'music-video-14-british-euro-brit-european-cumshots-swallow',
|
||||||
'ext': 'mp4',
|
'ext': 'mp4',
|
||||||
'title': 'Music Video 14 british euro brit european cumshots swallow',
|
'title': 'Music Video 14 british euro brit european cumshots swallow',
|
||||||
'uploader': 'unknown',
|
'uploader': 'unknown',
|
||||||
|
@ -35,58 +30,22 @@ class ExtremeTubeIE(InfoExtractor):
|
||||||
}]
|
}]
|
||||||
|
|
||||||
def _real_extract(self, url):
|
def _real_extract(self, url):
|
||||||
video_id = self._match_id(url)
|
webpage, info = self._extract_info(url)
|
||||||
|
|
||||||
req = sanitized_Request(url)
|
if not info['title']:
|
||||||
req.add_header('Cookie', 'age_verified=1')
|
info['title'] = self._search_regex(
|
||||||
webpage = self._download_webpage(req, video_id)
|
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*</strong>\s*(.+?)\s*</div>',
|
||||||
webpage, 'uploader', fatal=False)
|
webpage, 'uploader', fatal=False)
|
||||||
view_count = str_to_int(self._html_search_regex(
|
view_count = str_to_int(self._search_regex(
|
||||||
r'Views:\s*</strong>\s*<span>([\d,\.]+)</span>',
|
r'Views:\s*</strong>\s*<span>([\d,\.]+)</span>',
|
||||||
webpage, 'view count', fatal=False))
|
webpage, 'view count', fatal=False))
|
||||||
|
|
||||||
flash_vars = self._parse_json(
|
info.update({
|
||||||
self._search_regex(
|
|
||||||
r'var\s+flashvars\s*=\s*({.+?});', webpage, 'flash vars'),
|
|
||||||
video_id)
|
|
||||||
|
|
||||||
formats = []
|
|
||||||
for quality_key, video_url in flash_vars.items():
|
|
||||||
height = int_or_none(self._search_regex(
|
|
||||||
r'quality_(\d+)[pP]$', quality_key, 'height', default=None))
|
|
||||||
if not height:
|
|
||||||
continue
|
|
||||||
f = {
|
|
||||||
'url': video_url,
|
|
||||||
}
|
|
||||||
mobj = re.search(
|
|
||||||
r'/(?P<height>\d{3,4})[pP]_(?P<bitrate>\d+)[kK]_\d+', video_url)
|
|
||||||
if mobj:
|
|
||||||
height = int(mobj.group('height'))
|
|
||||||
bitrate = int(mobj.group('bitrate'))
|
|
||||||
f.update({
|
|
||||||
'format_id': '%dp-%dk' % (height, bitrate),
|
|
||||||
'height': height,
|
|
||||||
'tbr': bitrate,
|
|
||||||
})
|
|
||||||
else:
|
|
||||||
f.update({
|
|
||||||
'format_id': '%dp' % height,
|
|
||||||
'height': height,
|
|
||||||
})
|
|
||||||
formats.append(f)
|
|
||||||
self._sort_formats(formats)
|
|
||||||
|
|
||||||
return {
|
|
||||||
'id': video_id,
|
|
||||||
'title': video_title,
|
|
||||||
'formats': formats,
|
|
||||||
'uploader': uploader,
|
'uploader': uploader,
|
||||||
'view_count': view_count,
|
'view_count': view_count,
|
||||||
'age_limit': 18,
|
})
|
||||||
}
|
|
||||||
|
return info
|
||||||
|
|
Loading…
Reference in a new issue