|
|
@ -130,6 +130,7 @@ class CBSIE(CBSBaseIE):
|
|
|
|
title = xpath_text(video_data, 'videoTitle', 'title') or xpath_text(video_data, 'videotitle', 'title')
|
|
|
|
title = xpath_text(video_data, 'videoTitle', 'title') or xpath_text(video_data, 'videotitle', 'title')
|
|
|
|
|
|
|
|
|
|
|
|
asset_types = {}
|
|
|
|
asset_types = {}
|
|
|
|
|
|
|
|
has_drm = False
|
|
|
|
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')
|
|
|
|
query = {
|
|
|
|
query = {
|
|
|
@ -144,6 +145,8 @@ class CBSIE(CBSBaseIE):
|
|
|
|
if asset_type in asset_types:
|
|
|
|
if asset_type in asset_types:
|
|
|
|
continue
|
|
|
|
continue
|
|
|
|
elif any(excluded in asset_type for excluded in ('HLS_FPS', 'DASH_CENC', 'OnceURL')):
|
|
|
|
elif any(excluded in asset_type for excluded in ('HLS_FPS', 'DASH_CENC', 'OnceURL')):
|
|
|
|
|
|
|
|
if 'DASH_CENC' in asset_type:
|
|
|
|
|
|
|
|
has_drm = True
|
|
|
|
continue
|
|
|
|
continue
|
|
|
|
if asset_type.startswith('HLS') or 'StreamPack' in asset_type:
|
|
|
|
if asset_type.startswith('HLS') or 'StreamPack' in asset_type:
|
|
|
|
query['formats'] = 'MPEG4,M3U'
|
|
|
|
query['formats'] = 'MPEG4,M3U'
|
|
|
@ -151,6 +154,9 @@ class CBSIE(CBSBaseIE):
|
|
|
|
query['formats'] = 'MPEG4,FLV'
|
|
|
|
query['formats'] = 'MPEG4,FLV'
|
|
|
|
asset_types[asset_type] = query
|
|
|
|
asset_types[asset_type] = query
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if not asset_types and has_drm:
|
|
|
|
|
|
|
|
self.report_drm(content_id)
|
|
|
|
|
|
|
|
|
|
|
|
return self._extract_common_video_info(content_id, asset_types, mpx_acc, extra_info={
|
|
|
|
return self._extract_common_video_info(content_id, asset_types, mpx_acc, extra_info={
|
|
|
|
'title': title,
|
|
|
|
'title': title,
|
|
|
|
'series': xpath_text(video_data, 'seriesTitle'),
|
|
|
|
'series': xpath_text(video_data, 'seriesTitle'),
|
|
|
|