mirror of
				https://gitlab.com/ytdl-org/youtube-dl.git
				synced 2025-11-03 19:57:06 -05:00 
			
		
		
		
	[YoutubeDL] Sanitize outtmpl as path
This commit is contained in:
		@@ -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
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user