[extractor/common] Support arbitrary format strings for template based identifiers...
authorSergey M․ <dstftw@gmail.com>
Fri, 8 Apr 2016 16:48:08 +0000 (22:48 +0600)
committerSergey M․ <dstftw@gmail.com>
Fri, 8 Apr 2016 16:48:08 +0000 (22:48 +0600)
youtube_dl/extractor/common.py

index 2b40f3b7c70e2440401ca73f95fe733f74301cae..a7324af5cf8e8b302758440a577ae02e23a8faa3 100644 (file)
@@ -1534,7 +1534,7 @@ class InfoExtractor(object):
                             media_template = representation_ms_info['media_template']
                             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)%(\d+)\$', r'%(\1)\2d', media_template)
+                            media_template = re.sub(r'\$(Number|Bandwidth)%([^$]+)\$', r'%(\1)\2', media_template)
                             media_template.replace('$$', '$')
                             representation_ms_info['segment_urls'] = [
                                 media_template % {