New upstream version 2018.11.07

[youtubedl] / youtube_dl / extractor / ccma.py

diff --git a/youtube_dl/extractor/ccma.py b/youtube_dl/extractor/ccma.py
index 39938c9acbae573b56346093fae599b669a09f7b..544647f92b7594e50be813b9666a7d381a7722fe 100644 (file)
--- a/youtube_dl/extractor/ccma.py
+++ b/youtube_dl/extractor/ccma.py
@@ -5,10 +5,12 @@ import re
 
 from .common import InfoExtractor
 from ..utils import (
 
 from .common import InfoExtractor
 from ..utils import (

+    clean_html,

     int_or_none,
     parse_duration,
     parse_iso8601,
     int_or_none,
     parse_duration,
     parse_iso8601,

-    clean_html,
+    parse_resolution,
+    url_or_none,

 )
 
 
 )
 
 


@@ -40,34 +42,42 @@ class CCMAIE(InfoExtractor):
 
     def _real_extract(self, url):
         media_type, media_id = re.match(self._VALID_URL, url).groups()
 
     def _real_extract(self, url):
         media_type, media_id = re.match(self._VALID_URL, url).groups()

-        media_data = {}
-        formats = []
-        profiles = ['pc'] if media_type == 'audio' else ['mobil', 'pc']
-        for i, profile in enumerate(profiles):
-            md = self._download_json('http://dinamics.ccma.cat/pvideo/media.jsp', media_id, query={
+
+        media = self._download_json(
+            'http://dinamics.ccma.cat/pvideo/media.jsp', media_id, query={

                 'media': media_type,
                 'idint': media_id,
                 'media': media_type,
                 'idint': media_id,

-                'profile': profile,
-            }, fatal=False)
-            if md:
-                media_data = md
-                media_url = media_data.get('media', {}).get('url')
-                if media_url:
-                    formats.append({
-                        'format_id': profile,
-                        'url': media_url,
-                        'quality': i,
-                    })
+            })
+
+        formats = []
+        media_url = media['media']['url']
+        if isinstance(media_url, list):
+            for format_ in media_url:
+                format_url = url_or_none(format_.get('file'))
+                if not format_url:
+                    continue
+                label = format_.get('label')
+                f = parse_resolution(label)
+                f.update({
+                    'url': format_url,
+                    'format_id': label,
+                })
+                formats.append(f)
+        else:
+            formats.append({
+                'url': media_url,
+                'vcodec': 'none' if media_type == 'audio' else None,
+            })

         self._sort_formats(formats)
 
         self._sort_formats(formats)
 

-        informacio = media_data['informacio']
+        informacio = media['informacio']

         title = informacio['titol']
         durada = informacio.get('durada', {})
         duration = int_or_none(durada.get('milisegons'), 1000) or parse_duration(durada.get('text'))
         timestamp = parse_iso8601(informacio.get('data_emissio', {}).get('utc'))
 
         subtitles = {}
         title = informacio['titol']
         durada = informacio.get('durada', {})
         duration = int_or_none(durada.get('milisegons'), 1000) or parse_duration(durada.get('text'))
         timestamp = parse_iso8601(informacio.get('data_emissio', {}).get('utc'))
 
         subtitles = {}

-        subtitols = media_data.get('subtitols', {})
+        subtitols = media.get('subtitols', {})

         if subtitols:
             sub_url = subtitols.get('url')
             if sub_url:
         if subtitols:
             sub_url = subtitols.get('url')
             if sub_url:


@@ -77,7 +87,7 @@ class CCMAIE(InfoExtractor):
                     })
 
         thumbnails = []
                     })
 
         thumbnails = []

-        imatges = media_data.get('imatges', {})
+        imatges = media.get('imatges', {})

         if imatges:
             thumbnail_url = imatges.get('url')
             if thumbnail_url:
         if imatges:
             thumbnail_url = imatges.get('url')
             if thumbnail_url:


@@ -93,7 +103,7 @@ class CCMAIE(InfoExtractor):
             'description': clean_html(informacio.get('descripcio')),
             'duration': duration,
             'timestamp': timestamp,
             'description': clean_html(informacio.get('descripcio')),
             'duration': duration,
             'timestamp': timestamp,

-            'thumnails': thumbnails,
+            'thumbnails': thumbnails,

             'subtitles': subtitles,
             'formats': formats,
         }
             'subtitles': subtitles,
             'formats': formats,
         }