mirror of
https://github.com/yt-dlp/yt-dlp.git
synced 2024-08-16 12:20:45 +02:00
This commit is contained in:
parent
6780154e6b
commit
21dedcb580
@ -2,6 +2,7 @@
|
|||||||
|
|
||||||
from .theplatform import ThePlatformFeedIE
|
from .theplatform import ThePlatformFeedIE
|
||||||
from ..utils import (
|
from ..utils import (
|
||||||
|
ExtractorError,
|
||||||
int_or_none,
|
int_or_none,
|
||||||
find_xpath_attr,
|
find_xpath_attr,
|
||||||
xpath_element,
|
xpath_element,
|
||||||
@ -61,6 +62,7 @@ def _extract_video_info(self, content_id, site='cbs', mpx_acc=2198311517):
|
|||||||
asset_types = []
|
asset_types = []
|
||||||
subtitles = {}
|
subtitles = {}
|
||||||
formats = []
|
formats = []
|
||||||
|
last_e = None
|
||||||
for item in items_data.findall('.//item'):
|
for item in items_data.findall('.//item'):
|
||||||
asset_type = xpath_text(item, 'assetType')
|
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:
|
||||||
@ -74,11 +76,17 @@ def _extract_video_info(self, content_id, site='cbs', mpx_acc=2198311517):
|
|||||||
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 as e:
|
||||||
|
last_e = e
|
||||||
|
continue
|
||||||
formats.extend(tp_formats)
|
formats.extend(tp_formats)
|
||||||
subtitles = self._merge_subtitles(subtitles, tp_subtitles)
|
subtitles = self._merge_subtitles(subtitles, tp_subtitles)
|
||||||
|
if last_e and not formats:
|
||||||
|
raise last_e
|
||||||
self._sort_formats(formats)
|
self._sort_formats(formats)
|
||||||
|
|
||||||
info = self._extract_theplatform_metadata(tp_path, content_id)
|
info = self._extract_theplatform_metadata(tp_path, content_id)
|
||||||
|
Loading…
Reference in New Issue
Block a user