diff options
| author | Sergey M․ <dstftw@gmail.com> | 2020-05-20 03:39:41 +0700 |
|---|---|---|
| committer | Sergey M․ <dstftw@gmail.com> | 2020-05-20 03:39:41 +0700 |
| commit | cd13343ad8c5f6e1cbd47ae0ae1eed00d27ff69a (patch) | |
| tree | 6822f2325ff514a47ca6edbb195dd33605e8717d | |
| parent | 9cd5f54e31bcfde1f0491d2c7c3e2b467386f3d6 (diff) | |
| download | youtube-dl-cd13343ad8c5f6e1cbd47ae0ae1eed00d27ff69a.tar.xz | |
[redtube] Improve formats extraction and extract m3u8 formats (closes #25311, closes #25321)
| -rw-r--r-- | youtube_dl/extractor/redtube.py | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/youtube_dl/extractor/redtube.py b/youtube_dl/extractor/redtube.py index deb3ad52c..2d2f6a98c 100644 --- a/youtube_dl/extractor/redtube.py +++ b/youtube_dl/extractor/redtube.py @@ -4,6 +4,7 @@ import re from .common import InfoExtractor from ..utils import ( + determine_ext, ExtractorError, int_or_none, merge_dicts, @@ -77,7 +78,7 @@ class RedTubeIE(InfoExtractor): }) medias = self._parse_json( self._search_regex( - r'mediaDefinition\s*:\s*(\[.+?\])', webpage, + r'mediaDefinition["\']?\s*:\s*(\[.+?}\s*\])', webpage, 'media definitions', default='{}'), video_id, fatal=False) if medias and isinstance(medias, list): @@ -85,6 +86,12 @@ class RedTubeIE(InfoExtractor): format_url = url_or_none(media.get('videoUrl')) if not format_url: continue + if media.get('format') == 'hls' or determine_ext(format_url) == 'm3u8': + formats.extend(self._extract_m3u8_formats( + format_url, video_id, 'mp4', + entry_protocol='m3u8_native', m3u8_id='hls', + fatal=False)) + continue format_id = media.get('quality') formats.append({ 'url': format_url, |