projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into subtitles_rework
[youtube-dl]
/
youtube_dl
/
utils.py
diff --git
a/youtube_dl/utils.py
b/youtube_dl/utils.py
index 5dd5b2923d2a773a526006d71769d10486fe8730..52cfb8a6d18e69be0db213bbf3f4da63f1fcd7d9 100644
(file)
--- a/
youtube_dl/utils.py
+++ b/
youtube_dl/utils.py
@@
-657,6
+657,9
@@
def determine_ext(url, default_ext=u'unknown_video'):
else:
return default_ext
else:
return default_ext
+def subtitles_filename(filename, sub_lang, sub_format):
+ return filename.rsplit('.', 1)[0] + u'.' + sub_lang + u'.' + sub_format
+
def date_from_str(date_str):
"""
Return a datetime object from a string in the format YYYYMMDD or
def date_from_str(date_str):
"""
Return a datetime object from a string in the format YYYYMMDD or