R-yan/l1ving_youtube-dl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Better language selecting with Arte+7 videos

Browse Source
This commit is contained in:
Arthur Ouaki 2016-04-11 22:26:57 +02:00
parent 49f523ca50
commit 5b5ce69560
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
youtube_dl/extractor/arte.py
View File

@ -161,16 +161,20 @@ class ArteTVPlus7IE(InfoExtractor):
'es': 'E[ESP]', 'es': 'E[ESP]',
} }
langcode = LANGS.get(lang, lang)
formats = [] formats = []
for format_id, format_dict in player_info['VSR'].items(): for format_id, format_dict in player_info['VSR'].items():
f = dict(format_dict) f = dict(format_dict)
versionCode = f.get('versionCode') versionCode = f.get('versionCode')
langcode = LANGS.get(lang, lang)
lang_rexs = [r'VO?%s-' % re.escape(langcode), r'VO?.-ST%s$' % re.escape(langcode)] lang_rexs = [r'VO?%s-' % re.escape(langcode), r'VO?.-ST%s$' % re.escape(langcode)]
lang_pref = None lang_pref = None
if versionCode: if versionCode:
matched_lang_rexs = [r for r in lang_rexs if re.match(r, versionCode)] if versionCode == 'VO%s' % langcode:
lang_pref = -10 if not matched_lang_rexs else 10 * len(matched_lang_rexs) # versionCode exactly matches langCode
lang_pref = 20
else:
matched_lang_rexs = [r for r in lang_rexs if re.match(r, versionCode)]
lang_pref = -10 if not matched_lang_rexs else 10 * len(matched_lang_rexs)
source_pref = 0 source_pref = 0
if versionCode is not None: if versionCode is not None:
# The original version with subtitles has lower relevance # The original version with subtitles has lower relevance