mirrors/youtube-dl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[utils] Improve prepend_extension

Browse Source 
Now `ext` is appended to filename if real extension != expected extension.
This commit is contained in:
Sergey M․
2015-05-02 23:06:01 +06:00
parent 21f6330274
commit e65e4c8874
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
youtube_dl/utils.py
View File

@@ -1349,9 +1349,12 @@ def parse_duration(s):
return res return res
def prepend_extension(filename, ext): def prepend_extension(filename, ext, expected_real_ext=None):
name, real_ext = os.path.splitext(filename) name, real_ext = os.path.splitext(filename)
return '{0}.{1}{2}'.format(name, ext, real_ext) return (
'{0}.{1}{2}'.format(name, ext, real_ext)
if not expected_real_ext or real_ext[1:] == expected_real_ext
else '{0}.{1}'.format(filename, ext))
def check_executable(exe, args=[]): def check_executable(exe, args=[]):