浏览代码

[extractor/common] Support arbitrary format strings for template based identifiers in mpd manifests (Closes #9119, closes #9120)

Sergey M․ 9 年之前
父节点
当前提交
fb38aa8b53
共有 1 个文件被更改,包括 1 次插入1 次删除
  1. 1 1
      youtube_dl/extractor/common.py

+ 1 - 1
youtube_dl/extractor/common.py

@@ -1534,7 +1534,7 @@ class InfoExtractor(object):
                             media_template = representation_ms_info['media_template']
                             media_template = representation_ms_info['media_template']
                             media_template = media_template.replace('$RepresentationID$', representation_id)
                             media_template = media_template.replace('$RepresentationID$', representation_id)
                             media_template = re.sub(r'\$(Number|Bandwidth)\$', r'%(\1)d', media_template)
                             media_template = re.sub(r'\$(Number|Bandwidth)\$', r'%(\1)d', media_template)
-                            media_template = re.sub(r'\$(Number|Bandwidth)%(\d+)\$', r'%(\1)\2d', media_template)
+                            media_template = re.sub(r'\$(Number|Bandwidth)%([^$]+)\$', r'%(\1)\2', media_template)
                             media_template.replace('$$', '$')
                             media_template.replace('$$', '$')
                             representation_ms_info['segment_urls'] = [
                             representation_ms_info['segment_urls'] = [
                                 media_template % {
                                 media_template % {