mirror of
https://github.com/ytdl-org/youtube-dl.git
synced 2024-11-15 11:33:30 +01:00
Merge branch 'noco' of https://github.com/Tassatux/youtube-dl into Tassatux-noco
This commit is contained in:
commit
f943b7ddce
@ -25,7 +25,8 @@ class NocoIE(InfoExtractor):
|
|||||||
_SUB_LANG_TEMPLATE = '&sub_lang=%s'
|
_SUB_LANG_TEMPLATE = '&sub_lang=%s'
|
||||||
_NETRC_MACHINE = 'noco'
|
_NETRC_MACHINE = 'noco'
|
||||||
|
|
||||||
_TEST = {
|
_TESTS = [
|
||||||
|
{
|
||||||
'url': 'http://noco.tv/emission/11538/nolife/ami-ami-idol-hello-france/',
|
'url': 'http://noco.tv/emission/11538/nolife/ami-ami-idol-hello-france/',
|
||||||
'md5': '0a993f0058ddbcd902630b2047ef710e',
|
'md5': '0a993f0058ddbcd902630b2047ef710e',
|
||||||
'info_dict': {
|
'info_dict': {
|
||||||
@ -39,7 +40,23 @@ class NocoIE(InfoExtractor):
|
|||||||
'duration': 2851.2,
|
'duration': 2851.2,
|
||||||
},
|
},
|
||||||
'skip': 'Requires noco account',
|
'skip': 'Requires noco account',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
'url': 'http://noco.tv/emission/12610/lbl42/the-guild/s01e01-wake-up-call',
|
||||||
|
'md5': 'c190f1f48e313c55838f1f412225934d',
|
||||||
|
'info_dict': {
|
||||||
|
'id': '12610',
|
||||||
|
'ext': 'mp4',
|
||||||
|
'title': 'The Guild #1 - Wake-Up Call',
|
||||||
|
'description': '',
|
||||||
|
'upload_date': '20140627',
|
||||||
|
'uploader': 'LBL42',
|
||||||
|
'uploader_id': 'LBL',
|
||||||
|
'duration': 233.023,
|
||||||
|
},
|
||||||
|
'skip': 'Requires noco account',
|
||||||
}
|
}
|
||||||
|
]
|
||||||
|
|
||||||
def _real_initialize(self):
|
def _real_initialize(self):
|
||||||
self._login()
|
self._login()
|
||||||
@ -86,22 +103,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 +158,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…
Reference in New Issue
Block a user