diff options
| author | Sergey M․ <dstftw@gmail.com> | 2017-12-05 23:01:57 +0700 |
|---|---|---|
| committer | Sergey M․ <dstftw@gmail.com> | 2017-12-05 23:01:57 +0700 |
| commit | 91328f26b05084a1ddd890866670a1133564ecd0 (patch) | |
| tree | f7d57f7068d76345318355086e419dd1fe007f85 | |
| parent | 61d18c8a4bc91602738bfd2e506c3cbbc3a3788b (diff) | |
| download | youtube-dl-91328f26b05084a1ddd890866670a1133564ecd0.zip youtube-dl-91328f26b05084a1ddd890866670a1133564ecd0.tar.gz youtube-dl-91328f26b05084a1ddd890866670a1133564ecd0.tar.bz2 | |
[ard] Skip invalid stream URLs (closes #14906)
| -rw-r--r-- | youtube_dl/extractor/ard.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/youtube_dl/extractor/ard.py b/youtube_dl/extractor/ard.py index 915f886..ef73d5a 100644 --- a/youtube_dl/extractor/ard.py +++ b/youtube_dl/extractor/ard.py @@ -5,6 +5,7 @@ import re from .common import InfoExtractor from .generic import GenericIE +from ..compat import compat_str from ..utils import ( determine_ext, ExtractorError, @@ -126,6 +127,8 @@ class ARDMediathekIE(InfoExtractor): quality = stream.get('_quality') server = stream.get('_server') for stream_url in stream_urls: + if not isinstance(stream_url, compat_str) or '//' not in stream_url: + continue ext = determine_ext(stream_url) if quality != 'auto' and ext in ('f4m', 'm3u8'): continue @@ -146,13 +149,11 @@ class ARDMediathekIE(InfoExtractor): 'play_path': stream_url, 'format_id': 'a%s-rtmp-%s' % (num, quality), } - elif stream_url.startswith('http'): + else: f = { 'url': stream_url, 'format_id': 'a%s-%s-%s' % (num, ext, quality) } - else: - continue m = re.search(r'_(?P<width>\d+)x(?P<height>\d+)\.mp4$', stream_url) if m: f.update({ |