dbrun
/
youtube-dl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[byutv] Improve extraction and update DVR test (closes #20676)

This commit is contained in:
Sergey M․ 2019-05-11 03:05:34 +07:00
parent ab11674502
commit 0db2b275dd
No known key found for this signature in database
GPG Key ID: 2C393E0F18A9236D
1 changed files with 29 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
youtube_dl/extractor/byutv.py
View File

@ -3,15 +3,13 @@ from __future__ import unicode_literals
import re import re
from .common import InfoExtractor from .common import InfoExtractor
from ..utils import ( from ..utils import parse_duration
url_basename,
parse_duration,
)
class BYUtvIE(InfoExtractor): class BYUtvIE(InfoExtractor):
_VALID_URL = r'https?://(?:www\.)?byutv\.org/(?:watch|player)/(?!event/)(?P<id>[0-9a-f-]+)(?:/(?P<display_id>[^/?#&]+))?' _VALID_URL = r'https?://(?:www\.)?byutv\.org/(?:watch|player)/(?!event/)(?P<id>[0-9a-f-]+)(?:/(?P<display_id>[^/?#&]+))?'
_TESTS = [{ _TESTS = [{
# ooyalaVOD
'url': 'http://www.byutv.org/watch/6587b9a3-89d2-42a6-a7f7-fd2f81840a7d/studio-c-season-5-episode-5', 'url': 'http://www.byutv.org/watch/6587b9a3-89d2-42a6-a7f7-fd2f81840a7d/studio-c-season-5-episode-5',
'info_dict': { 'info_dict': {
'id': 'ZvanRocTpW-G5_yZFeltTAMv6jxOU9KH', 'id': 'ZvanRocTpW-G5_yZFeltTAMv6jxOU9KH',
@ -27,13 +25,15 @@ class BYUtvIE(InfoExtractor):
}, },
'add_ie': ['Ooyala'], 'add_ie': ['Ooyala'],
}, { }, {
'url': 'https://www.byutv.org/player/a5467e14-c7f2-46f9-b3c2-cb31a56749c6/byu-soccer-w-argentina-vs-byu-4419', # dvr
'url': 'https://www.byutv.org/player/8f1dab9b-b243-47c8-b525-3e2d021a3451/byu-softball-pacific-vs-byu-41219---game-2',
'info_dict': { 'info_dict': {
'id': 'a5467e14-c7f2-46f9-b3c2-cb31a56749c6', 'id': '8f1dab9b-b243-47c8-b525-3e2d021a3451',
'display_id': 'byu-soccer-w-argentina-vs-byu-4419', 'display_id': 'byu-softball-pacific-vs-byu-41219---game-2',
'ext': 'mp4', 'ext': 'mp4',
'title': 'Argentina vs. BYU (4/4/19)', 'title': 'Pacific vs. BYU (4/12/19)',
'duration': 7543.0, 'description': 'md5:1ac7b57cb9a78015910a4834790ce1f3',
'duration': 11645,
}, },
'params': { 'params': {
'skip_download': True 'skip_download': True
@ -49,10 +49,11 @@ class BYUtvIE(InfoExtractor):
def _real_extract(self, url): def _real_extract(self, url):
mobj = re.match(self._VALID_URL, url) mobj = re.match(self._VALID_URL, url)
video_id = mobj.group('id') video_id = mobj.group('id')
display_id = mobj.group('display_id') or video_id
info = self._download_json( info = self._download_json(
'https://api.byutv.org/api3/catalog/getvideosforcontent', video_id, 'https://api.byutv.org/api3/catalog/getvideosforcontent',
query={ display_id, query={
'contentid': video_id, 'contentid': video_id,
'channel': 'byutv', 'channel': 'byutv',
'x-byutv-context': 'web$US', 'x-byutv-context': 'web$US',
@ -68,23 +69,24 @@ class BYUtvIE(InfoExtractor):
'ie_key': 'Ooyala', 'ie_key': 'Ooyala',
'url': 'ooyala:%s' % ep['providerId'], 'url': 'ooyala:%s' % ep['providerId'],
'id': video_id, 'id': video_id,
'display_id': mobj.group('display_id') or video_id, 'display_id': display_id,
'title': ep.get('title'), 'title': ep.get('title'),
'description': ep.get('description'), 'description': ep.get('description'),
'thumbnail': ep.get('imageThumbnail'), 'thumbnail': ep.get('imageThumbnail'),
} }
else:
ep = info['dvr'] ep = info['dvr']
formats = self._extract_m3u8_formats( title = ep['title']
ep['videoUrl'], video_id, 'mp4', entry_protocol='m3u8_native' formats = self._extract_m3u8_formats(
) ep['videoUrl'], video_id, 'mp4', entry_protocol='m3u8_native',
self._sort_formats(formats) m3u8_id='hls')
return { self._sort_formats(formats)
'formats': formats, return {
'id': video_id, 'id': video_id,
'display_id': url_basename(url), 'display_id': display_id,
'title': ep['title'], 'title': title,
'description': ep.get('description'), 'description': ep.get('description'),
'thumbnail': ep.get('imageThumbnail'), 'thumbnail': ep.get('imageThumbnail'),
'duration': parse_duration(ep.get('length')), 'duration': parse_duration(ep.get('length')),
} 'formats': formats,
}