aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2015-03-07 22:18:16 +0100
committerPhilipp Hagemeister <phihag@phihag.de>2015-03-07 22:18:22 +0100
commitab205b9dc8dcee37786dac597f2c3760c89b191c (patch)
treef1d3de3ca6cbaa848e236c6ae188bad16acc9733
parent7dcad95d4faa91adfaa4d87d411c4bc55ab000e4 (diff)
Revert "[YoutubeDL] Sanitize outtmpl as it may contain forbidden characters"
This reverts commit 7dcad95d4faa91adfaa4d87d411c4bc55ab000e4. The output template is most definitly allowed to contain forbidden characters; otherwise -o /foo/bar/vid.mp4 wouldn't work.
-rwxr-xr-xyoutube_dl/YoutubeDL.py8
1 files changed, 2 insertions, 6 deletions
diff --git a/youtube_dl/YoutubeDL.py b/youtube_dl/YoutubeDL.py
index bae52e9c7..df2aebb59 100755
--- a/youtube_dl/YoutubeDL.py
+++ b/youtube_dl/YoutubeDL.py
@@ -553,20 +553,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 = self.params.get('outtmpl', DEFAULT_OUTTMPL)
tmpl = compat_expanduser(outtmpl)
filename = tmpl % template_dict
# Temporary fix for #4787