diff options
| author | Allan Zhou <[email protected]> | 2013-08-20 23:51:05 -0700 |
|---|---|---|
| committer | Allan Zhou <[email protected]> | 2013-08-20 23:51:05 -0700 |
| commit | 37b6d5f684d409365bbac6d3f2b8074b57e643a8 (patch) | |
| tree | 3ad34ac6f0382d4475985d44159692a483fde2b6 | |
| parent | b7a68384078ec0d97fb3c8e4a3100e9c60f340d0 (diff) | |
| download | youtube-dl-37b6d5f684d409365bbac6d3f2b8074b57e643a8.tar.gz youtube-dl-37b6d5f684d409365bbac6d3f2b8074b57e643a8.zip | |
fix hls test
| -rw-r--r-- | youtube_dl/extractor/youtube.py | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/youtube_dl/extractor/youtube.py b/youtube_dl/extractor/youtube.py index e573b021d..1599dd484 100644 --- a/youtube_dl/extractor/youtube.py +++ b/youtube_dl/extractor/youtube.py @@ -778,13 +778,16 @@ class YoutubeIE(YoutubeBaseInfoExtractor): self.to_screen(u'%s: Encrypted signatures detected.' % video_id) video_info['url_encoded_fmt_stream_map'] = [args['url_encoded_fmt_stream_map']] m_s = re.search(r'[&,]s=', args.get('adaptive_fmts', u'')) - if 'url_encoded_fmt_stream_map' not in video_info or not video_info['url_encoded_fmt_stream_map']: - video_info['url_encoded_fmt_stream_map'] = [''] if m_s is not None: - video_info['url_encoded_fmt_stream_map'][0] += ','+args['adaptive_fmts'] + if 'url_encoded_fmt_stream_map' in video_info: + video_info['url_encoded_fmt_stream_map'][0] += ',' + args['adaptive_fmts'] + else: + video_info['url_encoded_fmt_stream_map'] = [args['adaptive_fmts']] elif 'adaptive_fmts' in video_info: - video_info['url_encoded_fmt_stream_map'][0] += ','+video_info['adaptive_fmts'][0] - + if 'url_encoded_fmt_stream_map' in video_info: + video_info['url_encoded_fmt_stream_map'][0] += ',' + video_info['adaptive_fmts'][0] + else: + video_info['url_encoded_fmt_stream_map'] = video_info['adaptive_fmts'] except ValueError: pass |