Start new release.

[youtubedl] / youtube_dl / extractor / cbs.py

diff --git a/youtube_dl/extractor/cbs.py b/youtube_dl/extractor/cbs.py
index 1268e38ef3c266bd5f4fac39b961f4788150ba71..1799d63ea86ad9f9b1d7048792b52385928e20f4 100644 (file)
--- a/youtube_dl/extractor/cbs.py
+++ b/youtube_dl/extractor/cbs.py
@@ -2,6 +2,7 @@ from __future__ import unicode_literals
 
 from .theplatform import ThePlatformFeedIE
 from ..utils import (
 
 from .theplatform import ThePlatformFeedIE
 from ..utils import (

+    ExtractorError,

     int_or_none,
     find_xpath_attr,
     xpath_element,
     int_or_none,
     find_xpath_attr,
     xpath_element,


@@ -61,9 +62,10 @@ class CBSIE(CBSBaseIE):
         asset_types = []
         subtitles = {}
         formats = []
         asset_types = []
         subtitles = {}
         formats = []

+        last_e = None

         for item in items_data.findall('.//item'):
             asset_type = xpath_text(item, 'assetType')
         for item in items_data.findall('.//item'):
             asset_type = xpath_text(item, 'assetType')

-            if not asset_type or asset_type in asset_types:
+            if not asset_type or asset_type in asset_types or asset_type in ('HLS_FPS', 'DASH_CENC'):

                 continue
             asset_types.append(asset_type)
             query = {
                 continue
             asset_types.append(asset_type)
             query = {


@@ -74,11 +76,17 @@ class CBSIE(CBSBaseIE):
                 query['formats'] = 'MPEG4,M3U'
             elif asset_type in ('RTMP', 'WIFI', '3G'):
                 query['formats'] = 'MPEG4,FLV'
                 query['formats'] = 'MPEG4,M3U'
             elif asset_type in ('RTMP', 'WIFI', '3G'):
                 query['formats'] = 'MPEG4,FLV'

-            tp_formats, tp_subtitles = self._extract_theplatform_smil(
-                update_url_query(tp_release_url, query), content_id,
-                'Downloading %s SMIL data' % asset_type)
+            try:
+                tp_formats, tp_subtitles = self._extract_theplatform_smil(
+                    update_url_query(tp_release_url, query), content_id,
+                    'Downloading %s SMIL data' % asset_type)
+            except ExtractorError as e:
+                last_e = e
+                continue

             formats.extend(tp_formats)
             subtitles = self._merge_subtitles(subtitles, tp_subtitles)
             formats.extend(tp_formats)
             subtitles = self._merge_subtitles(subtitles, tp_subtitles)

+        if last_e and not formats:
+            raise last_e

         self._sort_formats(formats)
 
         info = self._extract_theplatform_metadata(tp_path, content_id)
         self._sort_formats(formats)
 
         info = self._extract_theplatform_metadata(tp_path, content_id)