projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
8a48223
)
[YoutubeDL] Sanitize outtmpl as it may contain forbidden characters
author
Sergey M․
<dstftw@gmail.com>
Sat, 7 Mar 2015 19:13:23 +0000
(
01:13
+0600)
committer
Sergey M․
<dstftw@gmail.com>
Sat, 7 Mar 2015 19:13:23 +0000
(
01:13
+0600)
youtube_dl/YoutubeDL.py
patch
|
blob
|
history
diff --git
a/youtube_dl/YoutubeDL.py
b/youtube_dl/YoutubeDL.py
index df2aebb59f836e7255ccaa6fcce545154d58b65d..bae52e9c72dad218e99879522a59ca5ed5fc0c0d 100755
(executable)
--- a/
youtube_dl/YoutubeDL.py
+++ b/
youtube_dl/YoutubeDL.py
@@
-553,16
+553,20
@@
class YoutubeDL(object):
elif template_dict.get('width'):
template_dict['resolution'] = '?x%d' % template_dict['width']
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),
sanitize = lambda k, v: sanitize_filename(
compat_str(v),
- restricted=
self.params.get('restrictfilenames')
,
+ restricted=
restrict_filenames
,
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)
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 = self.params.get('outtmpl', DEFAULT_OUTTMPL)
+ outtmpl = sanitize_filename(
+ self.params.get('outtmpl', DEFAULT_OUTTMPL),
+ restricted=restrict_filenames)
tmpl = compat_expanduser(outtmpl)
filename = tmpl % template_dict
# Temporary fix for #4787
tmpl = compat_expanduser(outtmpl)
filename = tmpl % template_dict
# Temporary fix for #4787