]> gitweb @ CieloNegro.org - youtube-dl.git/commitdiff
[cbs] extract rtmp formats
authorremitamine <remitamine@gmail.com>
Fri, 15 Apr 2016 21:38:37 +0000 (22:38 +0100)
committerremitamine <remitamine@gmail.com>
Fri, 15 Apr 2016 21:38:37 +0000 (22:38 +0100)
youtube_dl/extractor/cbs.py

index c621a08d54a2dc405e1863345941485439691fe3..62f52ec8edcd7d98993d1cb9f02769f3606539b5 100644 (file)
@@ -64,7 +64,7 @@ class CBSIE(CBSBaseIE):
         'url': 'http://www.colbertlateshow.com/podcasts/dYSwjqPs_X1tvbV_P2FcPWRa_qT6akTC/in-the-bad-room-with-stephen/',
         'only_matching': True,
     }]
-    TP_RELEASE_URL_TEMPLATE = 'http://link.theplatform.com/s/dJ5BDC/%s?manifest=m3u&mbr=true'
+    TP_RELEASE_URL_TEMPLATE = 'http://link.theplatform.com/s/dJ5BDC/%s?mbr=true'
 
     def _real_extract(self, url):
         display_id = self._match_id(url)
@@ -85,8 +85,11 @@ class CBSIE(CBSBaseIE):
             if not pid:
                 continue
             try:
+                tp_release_url = self.TP_RELEASE_URL_TEMPLATE % pid
+                if '.m3u8' in xpath_text(item, 'contentUrl', default=''):
+                    tp_release_url += '&manifest=m3u'
                 tp_formats, tp_subtitles = self._extract_theplatform_smil(
-                    self.TP_RELEASE_URL_TEMPLATE % pid, content_id, 'Downloading %s SMIL data' % pid)
+                    tp_release_url, content_id, 'Downloading %s SMIL data' % pid)
             except ExtractorError:
                 continue
             formats.extend(tp_formats)