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 1/5] [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 251e6da07..20a658149 100644 --- 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') + 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 @@ class NocoIE(InfoExtractor): 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'] From ff9d68e7be2dd01a21cc0ed90aaa594b5d36697f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Dunand?= Date: Mon, 4 May 2015 19:55:29 +0200 Subject: [PATCH 2/5] [noco] Add test for multi languages video --- youtube_dl/extractor/noco.py | 45 +++++++++++++++++++++++++----------- 1 file changed, 31 insertions(+), 14 deletions(-) diff --git a/youtube_dl/extractor/noco.py b/youtube_dl/extractor/noco.py index 20a658149..f86d210ee 100644 --- a/youtube_dl/extractor/noco.py +++ b/youtube_dl/extractor/noco.py @@ -25,21 +25,38 @@ class NocoIE(InfoExtractor): _SUB_LANG_TEMPLATE = '&sub_lang=%s' _NETRC_MACHINE = 'noco' - _TEST = { - 'url': 'http://noco.tv/emission/11538/nolife/ami-ami-idol-hello-france/', - 'md5': '0a993f0058ddbcd902630b2047ef710e', - 'info_dict': { - 'id': '11538', - 'ext': 'mp4', - 'title': 'Ami Ami Idol - Hello! France', - 'description': 'md5:4eaab46ab68fa4197a317a88a53d3b86', - 'upload_date': '20140412', - 'uploader': 'Nolife', - 'uploader_id': 'NOL', - 'duration': 2851.2, + _TESTS = [ + { + 'url': 'http://noco.tv/emission/11538/nolife/ami-ami-idol-hello-france/', + 'md5': '0a993f0058ddbcd902630b2047ef710e', + 'info_dict': { + 'id': '11538', + 'ext': 'mp4', + 'title': 'Ami Ami Idol - Hello! France', + 'description': 'md5:4eaab46ab68fa4197a317a88a53d3b86', + 'upload_date': '20140412', + 'uploader': 'Nolife', + 'uploader_id': 'NOL', + '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): self._login() From 6568382d6f3a986a773aa4d92b6bcbd367ccb794 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergey=20M=E2=80=A4?= Date: Tue, 5 May 2015 02:27:24 +0600 Subject: [PATCH 3/5] [noco] Extract all variations of audio/subtitles media --- youtube_dl/extractor/noco.py | 77 +++++++++++++++++++----------------- 1 file changed, 41 insertions(+), 36 deletions(-) diff --git a/youtube_dl/extractor/noco.py b/youtube_dl/extractor/noco.py index f86d210ee..e44ece5a2 100644 --- a/youtube_dl/extractor/noco.py +++ b/youtube_dl/extractor/noco.py @@ -103,9 +103,6 @@ class NocoIE(InfoExtractor): 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') @@ -114,12 +111,17 @@ class NocoIE(InfoExtractor): 'shows/by_id/%s' % video_id, video_id, 'Downloading show JSON')[0] - if audio_lang == 'original': - audio_lang = show['original_lang'] + options = self._call_api( + 'users/init', video_id, + 'Downloading user options JSON')['options'] + audio_lang_pref = options.get('audio_language') or options.get('language', 'fr') + + if audio_lang_pref == 'original': + audio_lang_pref = show['original_lang'] if len(medias) == 1: - audio_lang = list(medias.keys())[0] - elif not audio_lang in medias: - audio_lang = 'fr' + audio_lang_pref = list(medias.keys())[0] + elif audio_lang_pref not in medias: + audio_lang_pref = 'fr' qualities = self._call_api( 'qualities', @@ -127,34 +129,37 @@ class NocoIE(InfoExtractor): formats = [] - 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/%s' % (video_id, format_id.lower(), audio_lang), - video_id, 'Downloading %s video JSON' % format_id_extended, - lang if lang != 'none' else None) - - file_url = video['file'] - if not file_url: - continue - - if file_url in ['forbidden', 'not found']: - popmessage = video['popmessage'] - self._raise_error(popmessage['title'], popmessage['message']) - - formats.append({ - 'url': file_url, - 'format_id': format_id_extended, - 'width': fmt['res_width'], - 'height': fmt['res_lines'], - 'abr': fmt['audiobitrate'], - 'vbr': fmt['videobitrate'], - 'filesize': fmt['filesize'], - 'format_note': qualities[format_id]['quality_name'], - 'preference': qualities[format_id]['priority'], - }) + for audio_lang, audio_lang_dict in medias.items(): + preference = 1 if audio_lang == audio_lang_pref else 0 + for sub_lang, lang_dict in audio_lang_dict['video_list'].items(): + for format_id, fmt in lang_dict['quality_list'].items(): + format_id_extended = 'audio-%s_sub-%s_%s' % (audio_lang, sub_lang, format_id) + + video = self._call_api( + 'shows/%s/video/%s/%s' % (video_id, format_id.lower(), audio_lang), + video_id, 'Downloading %s video JSON' % format_id_extended, + sub_lang if sub_lang != 'none' else None) + + file_url = video['file'] + if not file_url: + continue + + if file_url in ['forbidden', 'not found']: + popmessage = video['popmessage'] + self._raise_error(popmessage['title'], popmessage['message']) + + formats.append({ + 'url': file_url, + 'format_id': format_id_extended, + 'width': fmt['res_width'], + 'height': fmt['res_lines'], + 'abr': fmt['audiobitrate'], + 'vbr': fmt['videobitrate'], + 'filesize': fmt['filesize'], + 'format_note': qualities[format_id]['quality_name'], + 'quality': qualities[format_id]['priority'], + 'preference': preference, + }) self._sort_formats(formats) From 815ac0293ee9d7f3771499cd71d833c83575bec9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergey=20M=E2=80=A4?= Date: Tue, 5 May 2015 02:38:13 +0600 Subject: [PATCH 4/5] [noco] Modernize --- youtube_dl/extractor/noco.py | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/youtube_dl/extractor/noco.py b/youtube_dl/extractor/noco.py index e44ece5a2..098c564bd 100644 --- a/youtube_dl/extractor/noco.py +++ b/youtube_dl/extractor/noco.py @@ -14,6 +14,9 @@ from ..compat import ( from ..utils import ( clean_html, ExtractorError, + int_or_none, + float_or_none, + parse_iso8601, unified_strdate, ) @@ -151,22 +154,22 @@ class NocoIE(InfoExtractor): formats.append({ 'url': file_url, 'format_id': format_id_extended, - 'width': fmt['res_width'], - 'height': fmt['res_lines'], - 'abr': fmt['audiobitrate'], - 'vbr': fmt['videobitrate'], - 'filesize': fmt['filesize'], - 'format_note': qualities[format_id]['quality_name'], - 'quality': qualities[format_id]['priority'], + 'width': int_or_none(fmt.get('res_width')), + 'height': int_or_none(fmt.get('res_lines')), + 'abr': int_or_none(fmt.get('audiobitrate')), + 'vbr': int_or_none(fmt.get('videobitrate')), + 'filesize': int_or_none(fmt.get('filesize')), + 'format_note': qualities[format_id].get('quality_name'), + 'quality': qualities[format_id].get('priority'), 'preference': preference, }) self._sort_formats(formats) - upload_date = unified_strdate(show['online_date_start_utc']) - uploader = show['partner_name'] - uploader_id = show['partner_key'] - duration = show['duration_ms'] / 1000.0 + timestamp = parse_iso8601(show.get('online_date_start_utc'), ' ') + uploader = show.get('partner_name') + uploader_id = show.get('partner_key') + duration = float_or_none(show.get('duration_ms'), 1000) thumbnails = [] for thumbnail_key, thumbnail_url in show.items(): @@ -198,7 +201,7 @@ class NocoIE(InfoExtractor): 'title': title, 'description': description, 'thumbnails': thumbnails, - 'upload_date': upload_date, + 'timestamp': timestamp, 'uploader': uploader, 'uploader_id': uploader_id, 'duration': duration, From 01e4b1ee14a3e9dedcb6a156c6eaf1603a8a0592 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergey=20M=E2=80=A4?= Date: Tue, 5 May 2015 02:50:39 +0600 Subject: [PATCH 5/5] [noco] Update tests --- youtube_dl/extractor/noco.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/youtube_dl/extractor/noco.py b/youtube_dl/extractor/noco.py index 098c564bd..5674ee2a4 100644 --- a/youtube_dl/extractor/noco.py +++ b/youtube_dl/extractor/noco.py @@ -51,7 +51,7 @@ class NocoIE(InfoExtractor): 'id': '12610', 'ext': 'mp4', 'title': 'The Guild #1 - Wake-Up Call', - 'description': '', + 'timestamp': 1403863200, 'upload_date': '20140627', 'uploader': 'LBL42', 'uploader_id': 'LBL',