From 7212560f4d6b0de5b76eb41090c639855915946e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Dunand?= Date: Wed, 29 Apr 2015 01:07:33 +0200 Subject: [PATCH] [noco] Retrieve video language according to user options --- youtube_dl/extractor/noco.py | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/youtube_dl/extractor/noco.py b/youtube_dl/extractor/noco.py index 251e6da074..20a6581498 100644 --- a/youtube_dl/extractor/noco.py +++ b/youtube_dl/extractor/noco.py @@ -86,22 +86,36 @@ def _real_extract(self, url): mobj = re.match(self._VALID_URL, url) 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( 'shows/%s/medias' % video_id, 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', video_id, 'Downloading qualities JSON') 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(): format_id_extended = '%s-%s' % (lang, format_id) if lang != 'none' else format_id 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, lang if lang != 'none' else None) @@ -127,10 +141,6 @@ def _real_extract(self, url): 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']) uploader = show['partner_name'] uploader_id = show['partner_key']