mirror of
https://gitlab.com/dstftw/youtube-dl.git
synced 2020-11-16 09:42:26 +00:00
parent
9b724d7277
commit
1b734adb2d
|
@ -4,17 +4,23 @@ import itertools
|
||||||
import re
|
import re
|
||||||
|
|
||||||
from .common import InfoExtractor
|
from .common import InfoExtractor
|
||||||
from ..compat import compat_urllib_parse_unquote
|
|
||||||
from ..utils import (
|
from ..utils import (
|
||||||
int_or_none,
|
int_or_none,
|
||||||
orderedSet,
|
orderedSet,
|
||||||
|
parse_duration,
|
||||||
sanitized_Request,
|
sanitized_Request,
|
||||||
str_to_int,
|
str_to_int,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
class XTubeIE(InfoExtractor):
|
class XTubeIE(InfoExtractor):
|
||||||
_VALID_URL = r'(?:xtube:|https?://(?:www\.)?xtube\.com/(?:watch\.php\?.*\bv=|video-watch/(?P<display_id>[^/]+)-))(?P<id>[^/?&#]+)'
|
_VALID_URL = r'''(?x)
|
||||||
|
(?:
|
||||||
|
xtube:|
|
||||||
|
https?://(?:www\.)?xtube\.com/(?:watch\.php\?.*\bv=|video-watch/(?P<display_id>[^/]+)-)
|
||||||
|
)
|
||||||
|
(?P<id>[^/?&#]+)
|
||||||
|
'''
|
||||||
|
|
||||||
_TESTS = [{
|
_TESTS = [{
|
||||||
# old URL schema
|
# old URL schema
|
||||||
|
@ -27,6 +33,8 @@ class XTubeIE(InfoExtractor):
|
||||||
'description': 'contains:an ET kind of thing',
|
'description': 'contains:an ET kind of thing',
|
||||||
'uploader': 'greenshowers',
|
'uploader': 'greenshowers',
|
||||||
'duration': 450,
|
'duration': 450,
|
||||||
|
'view_count': int,
|
||||||
|
'comment_count': int,
|
||||||
'age_limit': 18,
|
'age_limit': 18,
|
||||||
}
|
}
|
||||||
}, {
|
}, {
|
||||||
|
@ -51,21 +59,30 @@ class XTubeIE(InfoExtractor):
|
||||||
req.add_header('Cookie', 'age_verified=1; cookiesAccepted=1')
|
req.add_header('Cookie', 'age_verified=1; cookiesAccepted=1')
|
||||||
webpage = self._download_webpage(req, display_id)
|
webpage = self._download_webpage(req, display_id)
|
||||||
|
|
||||||
flashvars = self._parse_json(
|
sources = self._parse_json(self._search_regex(
|
||||||
self._search_regex(
|
r'sources\s*:\s*({.+?}),', webpage, 'sources'), video_id)
|
||||||
r'xt\.playerOps\s*=\s*({.+?});', webpage, 'player ops'),
|
|
||||||
video_id)['flashvars']
|
|
||||||
|
|
||||||
title = flashvars.get('title') or self._search_regex(
|
formats = []
|
||||||
r'<h1>([^<]+)</h1>', webpage, 'title')
|
for format_id, format_url in sources.items():
|
||||||
video_url = compat_urllib_parse_unquote(flashvars['video_url'])
|
formats.append({
|
||||||
duration = int_or_none(flashvars.get('video_duration'))
|
'url': format_url,
|
||||||
|
'format_id': format_id,
|
||||||
|
'height': int_or_none(format_id),
|
||||||
|
})
|
||||||
|
self._sort_formats(formats)
|
||||||
|
|
||||||
uploader = self._search_regex(
|
title = self._search_regex(
|
||||||
r'<input[^>]+name="contentOwnerId"[^>]+value="([^"]+)"',
|
(r'<h1>(?P<title>[^<]+)</h1>', r'videoTitle\s*:\s*(["\'])(?P<title>.+?)\1'),
|
||||||
webpage, 'uploader', fatal=False)
|
webpage, 'title', group='title')
|
||||||
description = self._search_regex(
|
description = self._search_regex(
|
||||||
r'</h1>\s*<p>([^<]+)', webpage, 'description', fatal=False)
|
r'</h1>\s*<p>([^<]+)', webpage, 'description', fatal=False)
|
||||||
|
uploader = self._search_regex(
|
||||||
|
(r'<input[^>]+name="contentOwnerId"[^>]+value="([^"]+)"',
|
||||||
|
r'<span[^>]+class="nickname"[^>]*>([^<]+)'),
|
||||||
|
webpage, 'uploader', fatal=False)
|
||||||
|
duration = parse_duration(self._search_regex(
|
||||||
|
r'<dt>Runtime:</dt>\s*<dd>([^<]+)</dd>',
|
||||||
|
webpage, 'duration', fatal=False))
|
||||||
view_count = str_to_int(self._search_regex(
|
view_count = str_to_int(self._search_regex(
|
||||||
r'<dt>Views:</dt>\s*<dd>([\d,\.]+)</dd>',
|
r'<dt>Views:</dt>\s*<dd>([\d,\.]+)</dd>',
|
||||||
webpage, 'view count', fatal=False))
|
webpage, 'view count', fatal=False))
|
||||||
|
@ -76,7 +93,6 @@ class XTubeIE(InfoExtractor):
|
||||||
return {
|
return {
|
||||||
'id': video_id,
|
'id': video_id,
|
||||||
'display_id': display_id,
|
'display_id': display_id,
|
||||||
'url': video_url,
|
|
||||||
'title': title,
|
'title': title,
|
||||||
'description': description,
|
'description': description,
|
||||||
'uploader': uploader,
|
'uploader': uploader,
|
||||||
|
@ -84,6 +100,7 @@ class XTubeIE(InfoExtractor):
|
||||||
'view_count': view_count,
|
'view_count': view_count,
|
||||||
'comment_count': comment_count,
|
'comment_count': comment_count,
|
||||||
'age_limit': 18,
|
'age_limit': 18,
|
||||||
|
'formats': formats,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue