fenix
/
yt-dlp
mirror of https://github.com/yt-dlp/yt-dlp.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Download subtitles in order of `--sub-langs` 

Closes #1041
This commit is contained in:
pukkandan 2021-09-24 05:10:04 +05:30
parent 8f70b0b82f
commit 77c4a9ef68
No known key found for this signature in database
GPG Key ID: 0F00D95A001F4698
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
yt_dlp/YoutubeDL.py
View File

@ -2363,20 +2363,24 @@ class YoutubeDL(object):
if self.params.get('allsubtitles', False):
requested_langs = all_sub_langs
elif self.params.get('subtitleslangs', False):
requested_langs = set()
for lang in self.params.get('subtitleslangs'):
if lang == 'all':
requested_langs.update(all_sub_langs)
# A list is used so that the order of languages will be the same as
# given in subtitleslangs. See https://github.com/yt-dlp/yt-dlp/issues/1041
requested_langs = []
for lang_re in self.params.get('subtitleslangs'):
if lang_re == 'all':
requested_langs.extend(all_sub_langs)
continue
discard = lang[0] == '-'
discard = lang_re[0] == '-'
if discard:
lang = lang[1:]
current_langs = filter(re.compile(lang + '$').match, all_sub_langs)
lang_re = lang_re[1:]
current_langs = filter(re.compile(lang_re + '$').match, all_sub_langs)
if discard:
for lang in current_langs:
requested_langs.discard(lang)
while lang in requested_langs:
requested_langs.remove(lang)
else:
requested_langs.update(current_langs)
requested_langs.extend(current_langs)
requested_langs = orderedSet(requested_langs)
elif 'en' in available_subs:
requested_langs = ['en']
else: