From: Philipp Hagemeister Date: Tue, 10 Dec 2013 10:23:35 +0000 (+0100) Subject: [YoutubeDL] Simplify filename preparation X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=45598aab0873c31dd6200899192ddeb07bd2c472;p=youtube-dl [YoutubeDL] Simplify filename preparation --- diff --git a/youtube_dl/YoutubeDL.py b/youtube_dl/YoutubeDL.py index 11d4972dd..cabe30980 100644 --- a/youtube_dl/YoutubeDL.py +++ b/youtube_dl/YoutubeDL.py @@ -397,11 +397,12 @@ class YoutubeDL(object): template_dict['playlist_index'] = u'%05d' % template_dict['playlist_index'] sanitize = lambda k, v: sanitize_filename( - u'NA' if v is None else compat_str(v), + compat_str(v), restricted=self.params.get('restrictfilenames'), is_id=(k == u'id')) 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) template_dict = collections.defaultdict(lambda: u'NA', template_dict) tmpl = os.path.expanduser(self.params['outtmpl'])