[youtube] Encode subtitle track name in request (Fixes #1700)

[youtube-dl] / youtube_dl / YoutubeDL.py

diff --git a/youtube_dl/YoutubeDL.py b/youtube_dl/YoutubeDL.py
index 260cd2809b5eb35dffe5e6d0a0c4f58fc6c7fa19..7f73ea3605345d94db57dfaab0819cec35b8aca3 100644 (file)
--- a/youtube_dl/YoutubeDL.py
+++ b/youtube_dl/YoutubeDL.py
@@ -482,7 +482,7 @@ class YoutubeDL(object):
                 format['format'] = u'{id} - {res}{note}'.format(
                     id=format['format_id'],
                     res=self.format_resolution(format),
-                    note=u' ({})'.format(format['format_note']) if format.get('format_note') is not None else '',
+                    note=u' ({0})'.format(format['format_note']) if format.get('format_note') is not None else '',
                 )
             # Automatically determine file extension if missing
             if 'ext' not in format:
@@ -780,10 +780,11 @@ class YoutubeDL(object):
                 )
             )
 
-        formats_s = list(map(line, info_dict.get('formats', [info_dict])))
-        if len(formats_s) != 1:
-            formats_s[0] += (' ' if formats_s[0] else '') + '(worst)'
-            formats_s[-1] += (' ' if formats_s[-1] else '') + '(best)'
+        formats = info_dict.get('formats', [info_dict])
+        formats_s = list(map(line, formats))
+        if len(formats) > 1:
+            formats_s[0] += (' ' if formats[0].get('format_note') else '') + '(worst)'
+            formats_s[-1] += (' ' if formats[-1].get('format_note') else '') + '(best)'
 
         header_line = line({
             'format_id': u'format code', 'ext': u'extension',