|
|
@ -67,6 +67,7 @@ from .utils import (
|
|
|
|
float_or_none,
|
|
|
|
float_or_none,
|
|
|
|
format_bytes,
|
|
|
|
format_bytes,
|
|
|
|
format_field,
|
|
|
|
format_field,
|
|
|
|
|
|
|
|
FORMAT_RE,
|
|
|
|
formatSeconds,
|
|
|
|
formatSeconds,
|
|
|
|
GeoRestrictedError,
|
|
|
|
GeoRestrictedError,
|
|
|
|
int_or_none,
|
|
|
|
int_or_none,
|
|
|
@ -772,20 +773,26 @@ class YoutubeDL(object):
|
|
|
|
'Put from __future__ import unicode_literals at the top of your code file or consider switching to Python 3.x.')
|
|
|
|
'Put from __future__ import unicode_literals at the top of your code file or consider switching to Python 3.x.')
|
|
|
|
return outtmpl_dict
|
|
|
|
return outtmpl_dict
|
|
|
|
|
|
|
|
|
|
|
|
def _prepare_filename(self, info_dict, tmpl_type='default'):
|
|
|
|
def prepare_outtmpl(self, outtmpl, info_dict, sanitize=None):
|
|
|
|
try:
|
|
|
|
""" Make the template and info_dict suitable for substitution (outtmpl % info_dict)"""
|
|
|
|
template_dict = dict(info_dict)
|
|
|
|
template_dict = dict(info_dict)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# duration_string
|
|
|
|
template_dict['duration_string'] = ( # %(duration>%H-%M-%S)s is wrong if duration > 24hrs
|
|
|
|
template_dict['duration_string'] = ( # %(duration>%H-%M-%S)s is wrong if duration > 24hrs
|
|
|
|
formatSeconds(info_dict['duration'], '-')
|
|
|
|
formatSeconds(info_dict['duration'], '-')
|
|
|
|
if info_dict.get('duration', None) is not None
|
|
|
|
if info_dict.get('duration', None) is not None
|
|
|
|
else None)
|
|
|
|
else None)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# epoch
|
|
|
|
template_dict['epoch'] = int(time.time())
|
|
|
|
template_dict['epoch'] = int(time.time())
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# autonumber
|
|
|
|
autonumber_size = self.params.get('autonumber_size')
|
|
|
|
autonumber_size = self.params.get('autonumber_size')
|
|
|
|
if autonumber_size is None:
|
|
|
|
if autonumber_size is None:
|
|
|
|
autonumber_size = 5
|
|
|
|
autonumber_size = 5
|
|
|
|
template_dict['autonumber'] = self.params.get('autonumber_start', 1) - 1 + self._num_downloads
|
|
|
|
template_dict['autonumber'] = self.params.get('autonumber_start', 1) - 1 + self._num_downloads
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# resolution if not defined
|
|
|
|
if template_dict.get('resolution') is None:
|
|
|
|
if template_dict.get('resolution') is None:
|
|
|
|
if template_dict.get('width') and template_dict.get('height'):
|
|
|
|
if template_dict.get('width') and template_dict.get('height'):
|
|
|
|
template_dict['resolution'] = '%dx%d' % (template_dict['width'], template_dict['height'])
|
|
|
|
template_dict['resolution'] = '%dx%d' % (template_dict['width'], template_dict['height'])
|
|
|
@ -794,19 +801,14 @@ class YoutubeDL(object):
|
|
|
|
elif template_dict.get('width'):
|
|
|
|
elif template_dict.get('width'):
|
|
|
|
template_dict['resolution'] = '%dx?' % template_dict['width']
|
|
|
|
template_dict['resolution'] = '%dx?' % template_dict['width']
|
|
|
|
|
|
|
|
|
|
|
|
sanitize = lambda k, v: sanitize_filename(
|
|
|
|
if sanitize is None:
|
|
|
|
compat_str(v),
|
|
|
|
sanitize = lambda k, v: v
|
|
|
|
restricted=self.params.get('restrictfilenames'),
|
|
|
|
|
|
|
|
is_id=(k == 'id' or k.endswith('_id')))
|
|
|
|
|
|
|
|
template_dict = dict((k, v if isinstance(v, compat_numeric_types) else sanitize(k, v))
|
|
|
|
template_dict = dict((k, v if isinstance(v, compat_numeric_types) else sanitize(k, v))
|
|
|
|
for k, v in template_dict.items()
|
|
|
|
for k, v in template_dict.items()
|
|
|
|
if v is not None and not isinstance(v, (list, tuple, dict)))
|
|
|
|
if v is not None and not isinstance(v, (list, tuple, dict)))
|
|
|
|
na = self.params.get('outtmpl_na_placeholder', 'NA')
|
|
|
|
na = self.params.get('outtmpl_na_placeholder', 'NA')
|
|
|
|
template_dict = collections.defaultdict(lambda: na, template_dict)
|
|
|
|
template_dict = collections.defaultdict(lambda: na, template_dict)
|
|
|
|
|
|
|
|
|
|
|
|
outtmpl = self.outtmpl_dict.get(tmpl_type, self.outtmpl_dict['default'])
|
|
|
|
|
|
|
|
force_ext = OUTTMPL_TYPES.get(tmpl_type)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# For fields playlist_index and autonumber convert all occurrences
|
|
|
|
# For fields playlist_index and autonumber convert all occurrences
|
|
|
|
# of %(field)s to %(field)0Nd for backward compatibility
|
|
|
|
# of %(field)s to %(field)0Nd for backward compatibility
|
|
|
|
field_size_compat_map = {
|
|
|
|
field_size_compat_map = {
|
|
|
@ -821,20 +823,6 @@ class YoutubeDL(object):
|
|
|
|
r'%%(\1)0%dd' % field_size_compat_map[mobj.group('field')],
|
|
|
|
r'%%(\1)0%dd' % field_size_compat_map[mobj.group('field')],
|
|
|
|
outtmpl)
|
|
|
|
outtmpl)
|
|
|
|
|
|
|
|
|
|
|
|
# As of [1] format syntax is:
|
|
|
|
|
|
|
|
# %[mapping_key][conversion_flags][minimum_width][.precision][length_modifier]type
|
|
|
|
|
|
|
|
# 1. https://docs.python.org/2/library/stdtypes.html#string-formatting
|
|
|
|
|
|
|
|
FORMAT_RE = r'''(?x)
|
|
|
|
|
|
|
|
(?<!%)
|
|
|
|
|
|
|
|
%
|
|
|
|
|
|
|
|
\({0}\) # mapping key
|
|
|
|
|
|
|
|
(?:[#0\-+ ]+)? # conversion flags (optional)
|
|
|
|
|
|
|
|
(?:\d+)? # minimum field width (optional)
|
|
|
|
|
|
|
|
(?:\.\d+)? # precision (optional)
|
|
|
|
|
|
|
|
[hlL]? # length modifier (optional)
|
|
|
|
|
|
|
|
(?P<type>[diouxXeEfFgGcrs%]) # conversion type
|
|
|
|
|
|
|
|
'''
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
numeric_fields = list(self._NUMERIC_FIELDS)
|
|
|
|
numeric_fields = list(self._NUMERIC_FIELDS)
|
|
|
|
|
|
|
|
|
|
|
|
# Format date
|
|
|
|
# Format date
|
|
|
@ -862,6 +850,17 @@ class YoutubeDL(object):
|
|
|
|
FORMAT_RE.format(re.escape(numeric_field)),
|
|
|
|
FORMAT_RE.format(re.escape(numeric_field)),
|
|
|
|
r'%({0})s'.format(numeric_field), outtmpl)
|
|
|
|
r'%({0})s'.format(numeric_field), outtmpl)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return outtmpl, template_dict
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def _prepare_filename(self, info_dict, tmpl_type='default'):
|
|
|
|
|
|
|
|
try:
|
|
|
|
|
|
|
|
sanitize = lambda k, v: sanitize_filename(
|
|
|
|
|
|
|
|
compat_str(v),
|
|
|
|
|
|
|
|
restricted=self.params.get('restrictfilenames'),
|
|
|
|
|
|
|
|
is_id=(k == 'id' or k.endswith('_id')))
|
|
|
|
|
|
|
|
outtmpl = self.outtmpl_dict.get(tmpl_type, self.outtmpl_dict['default'])
|
|
|
|
|
|
|
|
outtmpl, template_dict = self.prepare_outtmpl(outtmpl, info_dict, sanitize)
|
|
|
|
|
|
|
|
|
|
|
|
# expand_path translates '%%' into '%' and '$$' into '$'
|
|
|
|
# expand_path translates '%%' into '%' and '$$' into '$'
|
|
|
|
# correspondingly that is not what we want since we need to keep
|
|
|
|
# correspondingly that is not what we want since we need to keep
|
|
|
|
# '%%' intact for template dict substitution step. Working around
|
|
|
|
# '%%' intact for template dict substitution step. Working around
|
|
|
@ -875,6 +874,7 @@ class YoutubeDL(object):
|
|
|
|
# title "Hello $PATH", we don't want `$PATH` to be expanded.
|
|
|
|
# title "Hello $PATH", we don't want `$PATH` to be expanded.
|
|
|
|
filename = expand_path(outtmpl).replace(sep, '') % template_dict
|
|
|
|
filename = expand_path(outtmpl).replace(sep, '') % template_dict
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
force_ext = OUTTMPL_TYPES.get(tmpl_type)
|
|
|
|
if force_ext is not None:
|
|
|
|
if force_ext is not None:
|
|
|
|
filename = replace_extension(filename, force_ext, template_dict.get('ext'))
|
|
|
|
filename = replace_extension(filename, force_ext, template_dict.get('ext'))
|
|
|
|
|
|
|
|
|
|
|
|