@ -553,20 +553,16 @@ class YoutubeDL(object):
elif template_dict . get ( ' width ' ) :
elif template_dict . get ( ' width ' ) :
template_dict [ ' resolution ' ] = ' ?x %d ' % template_dict [ ' width ' ]
template_dict [ ' resolution ' ] = ' ?x %d ' % template_dict [ ' width ' ]
restrict_filenames = self . params . get ( ' restrictfilenames ' )
sanitize = lambda k , v : sanitize_filename (
sanitize = lambda k , v : sanitize_filename (
compat_str ( v ) ,
compat_str ( v ) ,
restricted = restrict_ filenames,
restricted = self . params. get ( ' restrictfilenames' ) ,
is_id = ( k == ' id ' ) )
is_id = ( k == ' id ' ) )
template_dict = dict ( ( k , sanitize ( k , v ) )
template_dict = dict ( ( k , sanitize ( k , v ) )
for k , v in template_dict . items ( )
for k , v in template_dict . items ( )
if v is not None )
if v is not None )
template_dict = collections . defaultdict ( lambda : ' NA ' , template_dict )
template_dict = collections . defaultdict ( lambda : ' NA ' , template_dict )
outtmpl = sanitize_filename (
outtmpl = self . params . get ( ' outtmpl ' , DEFAULT_OUTTMPL )
self . params . get ( ' outtmpl ' , DEFAULT_OUTTMPL ) ,
restricted = restrict_filenames )
tmpl = compat_expanduser ( outtmpl )
tmpl = compat_expanduser ( outtmpl )
filename = tmpl % template_dict
filename = tmpl % template_dict
# Temporary fix for #4787
# Temporary fix for #4787