diff options
Diffstat (limited to 'hypervideo_dl/extractor/byutv.py')
| -rw-r--r-- | hypervideo_dl/extractor/byutv.py | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/hypervideo_dl/extractor/byutv.py b/hypervideo_dl/extractor/byutv.py index 0b11bf1..f4d5086 100644 --- a/hypervideo_dl/extractor/byutv.py +++ b/hypervideo_dl/extractor/byutv.py @@ -1,6 +1,5 @@ from __future__ import unicode_literals -import re from .common import InfoExtractor from ..utils import ( @@ -52,7 +51,7 @@ class BYUtvIE(InfoExtractor): }] def _real_extract(self, url): - mobj = re.match(self._VALID_URL, url) + mobj = self._match_valid_url(url) video_id = mobj.group('id') display_id = mobj.group('display_id') or video_id @@ -82,6 +81,7 @@ class BYUtvIE(InfoExtractor): info = {} formats = [] + subtitles = {} for format_id, ep in video.items(): if not isinstance(ep, dict): continue @@ -90,12 +90,16 @@ class BYUtvIE(InfoExtractor): continue ext = determine_ext(video_url) if ext == 'm3u8': - formats.extend(self._extract_m3u8_formats( + m3u8_fmts, m3u8_subs = self._extract_m3u8_formats_and_subtitles( video_url, video_id, 'mp4', entry_protocol='m3u8_native', - m3u8_id='hls', fatal=False)) + m3u8_id='hls', fatal=False) + formats.extend(m3u8_fmts) + subtitles = self._merge_subtitles(subtitles, m3u8_subs) elif ext == 'mpd': - formats.extend(self._extract_mpd_formats( - video_url, video_id, mpd_id='dash', fatal=False)) + mpd_fmts, mpd_subs = self._extract_mpd_formats_and_subtitles( + video_url, video_id, mpd_id='dash', fatal=False) + formats.extend(mpd_fmts) + subtitles = self._merge_subtitles(subtitles, mpd_subs) else: formats.append({ 'url': video_url, @@ -114,4 +118,5 @@ class BYUtvIE(InfoExtractor): 'display_id': display_id, 'title': display_id, 'formats': formats, + 'subtitles': subtitles, }) |