[noco] Retrieve video language according to user options

pull/2/head
Aurélien Dunand 10 years ago
parent dc1eed93be
commit 7212560f4d

@ -86,22 +86,36 @@ class NocoIE(InfoExtractor):
mobj = re.match(self._VALID_URL, url) mobj = re.match(self._VALID_URL, url)
video_id = mobj.group('id') video_id = mobj.group('id')
options = self._call_api('users/init', None, 'Downloading user options JSON')['options']
audio_lang = options.get('audio_language', 'fr')
medias = self._call_api( medias = self._call_api(
'shows/%s/medias' % video_id, 'shows/%s/medias' % video_id,
video_id, 'Downloading video JSON') video_id, 'Downloading video JSON')
show = self._call_api(
'shows/by_id/%s' % video_id,
video_id, 'Downloading show JSON')[0]
if audio_lang == 'original':
audio_lang = show['original_lang']
if len(medias) == 1:
audio_lang = list(medias.keys())[0]
elif not audio_lang in medias:
audio_lang = 'fr'
qualities = self._call_api( qualities = self._call_api(
'qualities', 'qualities',
video_id, 'Downloading qualities JSON') video_id, 'Downloading qualities JSON')
formats = [] formats = []
for lang, lang_dict in medias['fr']['video_list'].items(): for lang, lang_dict in medias[audio_lang]['video_list'].items():
for format_id, fmt in lang_dict['quality_list'].items(): for format_id, fmt in lang_dict['quality_list'].items():
format_id_extended = '%s-%s' % (lang, format_id) if lang != 'none' else format_id format_id_extended = '%s-%s' % (lang, format_id) if lang != 'none' else format_id
video = self._call_api( video = self._call_api(
'shows/%s/video/%s/fr' % (video_id, format_id.lower()), 'shows/%s/video/%s/%s' % (video_id, format_id.lower(), audio_lang),
video_id, 'Downloading %s video JSON' % format_id_extended, video_id, 'Downloading %s video JSON' % format_id_extended,
lang if lang != 'none' else None) lang if lang != 'none' else None)
@ -127,10 +141,6 @@ class NocoIE(InfoExtractor):
self._sort_formats(formats) self._sort_formats(formats)
show = self._call_api(
'shows/by_id/%s' % video_id,
video_id, 'Downloading show JSON')[0]
upload_date = unified_strdate(show['online_date_start_utc']) upload_date = unified_strdate(show['online_date_start_utc'])
uploader = show['partner_name'] uploader = show['partner_name']
uploader_id = show['partner_key'] uploader_id = show['partner_key']

Loading…
Cancel
Save