Upstream/yt-dlp
1
0
Fork 0
mirror of https://github.com/yt-dlp/yt-dlp.git synced 2024-12-13 14:37:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

[cbs] Report appropriate error for DRM

Browse Source 
Closes #1056
This commit is contained in:
pukkandan 2021-09-24 04:09:03 +05:30
parent be867b03f5
commit 8f70b0b82f
No known key found for this signature in database
GPG Key ID: 0F00D95A001F4698
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
yt_dlp/extractor/cbs.py
View File

@ -130,6 +130,7 @@ def _extract_video_info(self, content_id, site='cbs', mpx_acc=2198311517):
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 @@ def _extract_video_info(self, content_id, site='cbs', mpx_acc=2198311517):
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 @@ def _extract_video_info(self, content_id, site='cbs', mpx_acc=2198311517):
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'),