[common] fix get_output_filename

This commit is contained in:
Mort Yao 2019-05-19 16:38:16 +02:00
parent 9e9b2ce671
commit fc10ea1d06
No known key found for this signature in database
GPG Key ID: 07DA00CB78203251

View File

@ -894,7 +894,7 @@ def get_output_filename(urls, title, ext, output_dir, merge, **kwargs):
if kwargs.get('part', -1) >= 0: if kwargs.get('part', -1) >= 0:
result = '%s[%02d]' % (result, kwargs.get('part')) result = '%s[%02d]' % (result, kwargs.get('part'))
if ext: if ext:
result = result + '.' + ext result = '%s.%s' % (result, ext)
return result return result
merged_ext = ext merged_ext = ext
@ -912,7 +912,11 @@ def get_output_filename(urls, title, ext, output_dir, merge, **kwargs):
merged_ext = 'mkv' merged_ext = 'mkv'
else: else:
merged_ext = 'ts' merged_ext = 'ts'
return '%s.%s' % (title, merged_ext) result = title
if kwargs.get('part', -1) >= 0:
result = '%s[%02d]' % (result, kwargs.get('part'))
result = '%s.%s' % (result, merged_ext)
return result
def print_user_agent(faker=False): def print_user_agent(faker=False):
urllib_default_user_agent = 'Python-urllib/%d.%d' % sys.version_info[:2] urllib_default_user_agent = 'Python-urllib/%d.%d' % sys.version_info[:2]