diff options
author | Sergey M․ <dstftw@gmail.com> | 2015-03-08 20:57:30 +0600 |
---|---|---|
committer | Sergey M․ <dstftw@gmail.com> | 2015-03-08 20:57:30 +0600 |
commit | 1bb5c511a551ba7c5d3179d2d3a124f0977e74b4 (patch) | |
tree | c2a4b3b7ae5a3dcff1be33cf826178bb73d4d502 | |
parent | d55de57b67bceca5d9116ddcc2ada2fa1957d89d (diff) |
[YoutubeDL] Sanitize outtmpl as path
-rwxr-xr-x | youtube_dl/YoutubeDL.py | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/youtube_dl/YoutubeDL.py b/youtube_dl/YoutubeDL.py index bae52e9c7..4b9151163 100755 --- a/youtube_dl/YoutubeDL.py +++ b/youtube_dl/YoutubeDL.py @@ -61,6 +61,7 @@ from .utils import ( render_table, SameFileError, sanitize_filename, + sanitize_path, std_headers, subtitles_filename, takewhile_inclusive, @@ -553,20 +554,16 @@ class YoutubeDL(object): elif template_dict.get('width'): template_dict['resolution'] = '?x%d' % template_dict['width'] - restrict_filenames = self.params.get('restrictfilenames') - sanitize = lambda k, v: sanitize_filename( compat_str(v), - restricted=restrict_filenames, + restricted=self.params.get('restrictfilenames'), is_id=(k == 'id')) template_dict = dict((k, sanitize(k, v)) for k, v in template_dict.items() if v is not None) template_dict = collections.defaultdict(lambda: 'NA', template_dict) - outtmpl = sanitize_filename( - self.params.get('outtmpl', DEFAULT_OUTTMPL), - restricted=restrict_filenames) + outtmpl = sanitize_path(self.params.get('outtmpl', DEFAULT_OUTTMPL)) tmpl = compat_expanduser(outtmpl) filename = tmpl % template_dict # Temporary fix for #4787 |