w/youtube-dl
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

[tvigle] Fix extraction and add support for HLS and DASH formats (closes #21967)

Browse source
This commit is contained in:
Sergey M․ 2019-08-02 05:25:01 +07:00
parent 33b529fabd
commit be306d6a31
No known key found for this signature in database
GPG key ID: 2C393E0F18A9236D
1 changed files with 36 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
youtube_dl/extractor/tvigle.py
View file

@ -9,6 +9,8 @@ from ..utils import (
float_or_none, float_or_none,
int_or_none, int_or_none,
parse_age_limit, parse_age_limit,
try_get,
url_or_none,
) )
@ -23,11 +25,10 @@ class TvigleIE(InfoExtractor):
_TESTS = [ _TESTS = [
{ {
'url': 'http://www.tvigle.ru/video/sokrat/', 'url': 'http://www.tvigle.ru/video/sokrat/',
'md5': '36514aed3657d4f70b4b2cef8eb520cd',
'info_dict': { 'info_dict': {
'id': '1848932', 'id': '1848932',
'display_id': 'sokrat', 'display_id': 'sokrat',
'ext': 'flv', 'ext': 'mp4',
'title': 'Сократ', 'title': 'Сократ',
'description': 'md5:d6b92ffb7217b4b8ebad2e7665253c17', 'description': 'md5:d6b92ffb7217b4b8ebad2e7665253c17',
'duration': 6586, 'duration': 6586,
@ -37,7 +38,6 @@ class TvigleIE(InfoExtractor):
}, },
{ {
'url': 'http://www.tvigle.ru/video/vladimir-vysotskii/vedushchii-teleprogrammy-60-minut-ssha-o-vladimire-vysotskom/', 'url': 'http://www.tvigle.ru/video/vladimir-vysotskii/vedushchii-teleprogrammy-60-minut-ssha-o-vladimire-vysotskom/',
'md5': 'e7efe5350dd5011d0de6550b53c3ba7b',
'info_dict': { 'info_dict': {
'id': '5142516', 'id': '5142516',
'ext': 'flv', 'ext': 'flv',
@ -62,7 +62,7 @@ class TvigleIE(InfoExtractor):
webpage = self._download_webpage(url, display_id) webpage = self._download_webpage(url, display_id)
video_id = self._html_search_regex( video_id = self._html_search_regex(
(r'<div[^>]+class=["\']player["\'][^>]+id=["\'](\d+)', (r'<div[^>]+class=["\']player["\'][^>]+id=["\'](\d+)',
r'var\s+cloudId\s*=\s*["\'](\d+)', r'cloudId\s*=\s*["\'](\d+)',
r'class="video-preview current_playing" id="(\d+)"'), r'class="video-preview current_playing" id="(\d+)"'),
webpage, 'video id') webpage, 'video id')
@ -90,20 +90,39 @@ class TvigleIE(InfoExtractor):
age_limit = parse_age_limit(item.get('ageRestrictions')) age_limit = parse_age_limit(item.get('ageRestrictions'))
formats = [] formats = []
for vcodec, fmts in item['videos'].items(): for vcodec, url_or_fmts in item['videos'].items():
if vcodec == 'hls': if vcodec == 'hls':
m3u8_url = url_or_none(url_or_fmts)
if not m3u8_url:
continue continue
for format_id, video_url in fmts.items(): formats.extend(self._extract_m3u8_formats(
m3u8_url, video_id, ext='mp4', entry_protocol='m3u8_native',
m3u8_id='hls', fatal=False))
elif vcodec == 'dash':
mpd_url = url_or_none(url_or_fmts)
if not mpd_url:
continue
formats.extend(self._extract_mpd_formats(
mpd_url, video_id, mpd_id='dash', fatal=False))
else:
if not isinstance(url_or_fmts, dict):
continue
for format_id, video_url in url_or_fmts.items():
if format_id == 'm3u8': if format_id == 'm3u8':
continue continue
video_url = url_or_none(video_url)
if not video_url:
continue
height = self._search_regex( height = self._search_regex(
r'^(\d+)[pP]$', format_id, 'height', default=None) r'^(\d+)[pP]$', format_id, 'height', default=None)
filesize = int_or_none(try_get(
item, lambda x: x['video_files_size'][vcodec][format_id]))
formats.append({ formats.append({
'url': video_url, 'url': video_url,
'format_id': '%s-%s' % (vcodec, format_id), 'format_id': '%s-%s' % (vcodec, format_id),
'vcodec': vcodec, 'vcodec': vcodec,
'height': int_or_none(height), 'height': int_or_none(height),
'filesize': int_or_none(item.get('video_files_size', {}).get(vcodec, {}).get(format_id)), 'filesize': filesize,
}) })
self._sort_formats(formats) self._sort_formats(formats)