From: Sergey M․ <dstftw@gmail.com>
Date: Sat, 2 May 2015 17:06:01 +0000 (+0600)
Subject: [utils] Improve prepend_extension
X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=e65e4c88748f2d245aa683116a2c6de907186751;p=youtube-dl

[utils] Improve prepend_extension

Now `ext` is appended to filename if real extension != expected extension.
---

diff --git a/youtube_dl/utils.py b/youtube_dl/utils.py
index f07679c76..b3abfbc11 100644
--- a/youtube_dl/utils.py
+++ b/youtube_dl/utils.py
@@ -1349,9 +1349,12 @@ def parse_duration(s):
     return res
 
 
-def prepend_extension(filename, ext):
+def prepend_extension(filename, ext, expected_real_ext=None):
     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=[]):