projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
675d001
)
[common] fix media_template string formating
author
remitamine
<remitamine@gmail.com>
Wed, 3 Feb 2016 22:54:34 +0000
(23:54 +0100)
committer
remitamine
<remitamine@gmail.com>
Wed, 3 Feb 2016 22:54:34 +0000
(23:54 +0100)
youtube_dl/extractor/common.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/common.py
b/youtube_dl/extractor/common.py
index 4859b911a01f600bc16e403bc7785113fd40bf95..b384e412e7e48151cb27d6b5cc3d32496e75cd6e 100644
(file)
--- 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)
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('$$', '$')
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'],
if 'segment_urls' in representation_ms_info:
f.update({
'segment_urls': representation_ms_info['segment_urls'],