diff options
| author | remitamine <remitamine@gmail.com> | 2016-02-03 23:54:34 +0100 |
|---|---|---|
| committer | remitamine <remitamine@gmail.com> | 2016-02-03 23:54:34 +0100 |
| commit | 53c269c6fd1af690570d35acae1d170b125d9d3c (patch) | |
| tree | d2f131b72371e51ecb707b1838cbe61851f73388 | |
| parent | 675d001633c9446e9d53db2794614862d1d82607 (diff) | |
| download | youtube-dl-53c269c6fd1af690570d35acae1d170b125d9d3c.tar.gz youtube-dl-53c269c6fd1af690570d35acae1d170b125d9d3c.tar.xz youtube-dl-53c269c6fd1af690570d35acae1d170b125d9d3c.zip | |
[common] fix media_template string formating
| -rw-r--r-- | youtube_dl/extractor/common.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/youtube_dl/extractor/common.py b/youtube_dl/extractor/common.py index 4859b911a..b384e412e 100644 --- a/youtube_dl/extractor/common.py +++ b/youtube_dl/extractor/common.py @@ -1454,11 +1454,9 @@ class InfoExtractor(object): representation_ms_info['total_number'] = int(math.ceil(period_duration / segment_duration)) media_template = representation_ms_info['media_template'] media_template = media_template.replace('$RepresentationID$', representation_id) - media_template = re.sub(r'\$(Bandwidth)(?:%(0\d+)d)?\$', r'%(\1)\2d', media_template) - media_template = media_template % {'Bandwidth': representation_attrib.get('bandwidth')} - media_template = re.sub(r'\$(Number)(?:%(0\d+)d)?\$', r'%(\1)\2d', media_template) + media_template = re.sub(r'\$(Number|Bandwidth)(?:%(0\d+)d)?\$', r'%(\1)\2d', media_template) media_template.replace('$$', '$') - representation_ms_info['segment_urls'] = [media_template % {'Number': segment_number} for segment_number in range(representation_ms_info['start_number'], representation_ms_info['total_number'] + representation_ms_info['start_number'])] + representation_ms_info['segment_urls'] = [media_template % {'Number': segment_number, 'Bandwidth': representation_attrib.get('bandwidth')} for segment_number in range(representation_ms_info['start_number'], representation_ms_info['total_number'] + representation_ms_info['start_number'])] if 'segment_urls' in representation_ms_info: f.update({ 'segment_urls': representation_ms_info['segment_urls'], |