Mirror
/
youtube-dl
mirror of https://github.com/ytdl-org/youtube-dl.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[cbs] do not catch Exceptions raised by by _extract_theplatform_smil

pull/9216/head
remitamine 2016-04-16 10:25:59 +01:00
parent a71fca8577
commit 0841d5013c
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
youtube_dl/extractor/cbs.py
View File

@ -84,14 +84,11 @@ class CBSIE(CBSBaseIE):
pid = xpath_text(item, 'pid') pid = xpath_text(item, 'pid')
if not pid: if not pid:
continue continue
try: tp_release_url = self.TP_RELEASE_URL_TEMPLATE % pid
tp_release_url = self.TP_RELEASE_URL_TEMPLATE % pid if '.m3u8' in xpath_text(item, 'contentUrl', default=''):
if '.m3u8' in xpath_text(item, 'contentUrl', default=''): tp_release_url += '&manifest=m3u'
tp_release_url += '&manifest=m3u' tp_formats, tp_subtitles = self._extract_theplatform_smil(
tp_formats, tp_subtitles = self._extract_theplatform_smil( tp_release_url, content_id, 'Downloading %s SMIL data' % pid)
tp_release_url, content_id, 'Downloading %s SMIL data' % pid)
except ExtractorError:
continue
formats.extend(tp_formats) formats.extend(tp_formats)
subtitles = self._merge_subtitles(subtitles, tp_subtitles) subtitles = self._merge_subtitles(subtitles, tp_subtitles)
self._sort_formats(formats) self._sort_formats(formats)