projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
dc1eed9
)
[noco] Retrieve video language according to user options
author
Aurélien Dunand
<aurelien@tassatux.net>
Tue, 28 Apr 2015 23:07:33 +0000
(
01:07
+0200)
committer
Aurélien Dunand
<aurelien@tassatux.net>
Mon, 4 May 2015 16:06:12 +0000
(18:06 +0200)
youtube_dl/extractor/noco.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/noco.py
b/youtube_dl/extractor/noco.py
index 251e6da07457b7e7be6b5703b5769214ae299c3d..20a6581498b94d19dffd4658aa05f120f022904c 100644
(file)
--- a/
youtube_dl/extractor/noco.py
+++ b/
youtube_dl/extractor/noco.py
@@
-86,22
+86,36
@@
class NocoIE(InfoExtractor):
mobj = re.match(self._VALID_URL, url)
video_id = mobj.group('id')
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')
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 = []
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(
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)
video_id, 'Downloading %s video JSON' % format_id_extended,
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'])
uploader = show['partner_name']
uploader_id = show['partner_key']
upload_date = unified_strdate(show['online_date_start_utc'])
uploader = show['partner_name']
uploader_id = show['partner_key']