schmittlauch/youtube-dl
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Set 'NA' as the default value for missing fields in the output template (fixes #1931)

Browse source 
Remove the `except KeyError` clause, it won't get raised anymore
This commit is contained in:
Jaime Marquínez Ferrándiz 2013-12-09 22:00:42 +01:00
parent 49929a20a7
commit 26e6393134
2 changed files with 17 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
youtube_dl/YoutubeDL.py
View file

@ -3,6 +3,7 @@
from __future__ import absolute_import
import collections
import errno
import io
import json
@ -401,13 +402,11 @@ class YoutubeDL(object):
is_id=(k == u'id'))
template_dict = dict((k, sanitize(k, v))
for k, v in template_dict.items())
template_dict = collections.defaultdict(lambda: u'NA', template_dict)
tmpl = os.path.expanduser(self.params['outtmpl'])
filename = tmpl % template_dict
return filename
except KeyError as err:
self.report_error(u'Erroneous output template')
return None
except ValueError as err:
self.report_error(u'Error in output template: ' + str(err) + u' (encoding: ' + repr(preferredencoding()) + ')')
return None