Allow download to continue even if it can't find AssetType
This doesn't necesserily result in a successful download due to ffmpeg not supporting SAMPLE-AES encryption, but will let you see formats in -F, and you'll likely find a working one not far down the list
This commit is contained in:
parent
2e25f80d5d
commit
fbaa4a8b82
@ -7,6 +7,7 @@ from ..utils import (
|
|||||||
xpath_element,
|
xpath_element,
|
||||||
xpath_text,
|
xpath_text,
|
||||||
update_url_query,
|
update_url_query,
|
||||||
|
ExtractorError
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
@ -74,9 +75,12 @@ class CBSIE(CBSBaseIE):
|
|||||||
query['formats'] = 'MPEG4,M3U'
|
query['formats'] = 'MPEG4,M3U'
|
||||||
elif asset_type in ('RTMP', 'WIFI', '3G'):
|
elif asset_type in ('RTMP', 'WIFI', '3G'):
|
||||||
query['formats'] = 'MPEG4,FLV'
|
query['formats'] = 'MPEG4,FLV'
|
||||||
tp_formats, tp_subtitles = self._extract_theplatform_smil(
|
try:
|
||||||
update_url_query(tp_release_url, query), content_id,
|
tp_formats, tp_subtitles = self._extract_theplatform_smil(
|
||||||
'Downloading %s SMIL data' % asset_type)
|
update_url_query(tp_release_url, query), content_id,
|
||||||
|
'Downloading %s SMIL data' % asset_type)
|
||||||
|
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)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user