Merge branch 'Tassatux-noco'

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,
 )
 
@@ -25,7 +28,8 @@ class NocoIE(InfoExtractor):
     _SUB_LANG_TEMPLATE = '&sub_lang=%s'
     _NETRC_MACHINE = 'noco'
 
-    _TEST = {
+    _TESTS = [
+        {
             'url': 'http://noco.tv/emission/11538/nolife/ami-ami-idol-hello-france/',
             'md5': '0a993f0058ddbcd902630b2047ef710e',
             'info_dict': {
@@ -39,7 +43,23 @@ class NocoIE(InfoExtractor):
                 'duration': 2851.2,
             },
             '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',
+                'timestamp': 1403863200,
+                'upload_date': '20140627',
+                'uploader': 'LBL42',
+                'uploader_id': 'LBL',
+                'duration': 233.023,
+            },
+            'skip': 'Requires noco account',
         }
+    ]
 
     def _real_initialize(self):
         self._login()
@@ -90,20 +110,38 @@ class NocoIE(InfoExtractor):
             '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]
+
+        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_pref = list(medias.keys())[0]
+        elif audio_lang_pref not in medias:
+            audio_lang_pref = 'fr'
+
         qualities = self._call_api(
             'qualities',
             video_id, 'Downloading qualities JSON')
 
         formats = []
 
-        for lang, lang_dict in medias['fr']['video_list'].items():
+        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 = '%s-%s' % (lang, format_id) if lang != 'none' else format_id
+                    format_id_extended = 'audio-%s_sub-%s_%s' % (audio_lang, sub_lang, 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)
+                        sub_lang if sub_lang != 'none' else None)
 
                     file_url = video['file']
                     if not file_url:
@@ -116,25 +154,22 @@ class NocoIE(InfoExtractor):
                     formats.append({
                         'url': file_url,
                         'format_id': format_id_extended,
-                    'width': fmt['res_width'],
+                        'width': int_or_none(fmt.get('res_width')),
-                    'height': fmt['res_lines'],
+                        'height': int_or_none(fmt.get('res_lines')),
-                    'abr': fmt['audiobitrate'],
+                        'abr': int_or_none(fmt.get('audiobitrate')),
-                    'vbr': fmt['videobitrate'],
+                        'vbr': int_or_none(fmt.get('videobitrate')),
-                    'filesize': fmt['filesize'],
+                        'filesize': int_or_none(fmt.get('filesize')),
-                    'format_note': qualities[format_id]['quality_name'],
+                        'format_note': qualities[format_id].get('quality_name'),
-                    'preference': qualities[format_id]['priority'],
+                        'quality': qualities[format_id].get('priority'),
+                        'preference': preference,
                     })
 
         self._sort_formats(formats)
 
-        show = self._call_api(
+        timestamp = parse_iso8601(show.get('online_date_start_utc'), ' ')
-            'shows/by_id/%s' % video_id,
+        uploader = show.get('partner_name')
-            video_id, 'Downloading show JSON')[0]
+        uploader_id = show.get('partner_key')
-
+        duration = float_or_none(show.get('duration_ms'), 1000)
-        upload_date = unified_strdate(show['online_date_start_utc'])
-        uploader = show['partner_name']
-        uploader_id = show['partner_key']
-        duration = show['duration_ms'] / 1000.0
 
         thumbnails = []
         for thumbnail_key, thumbnail_url in show.items():
@@ -166,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,