From 8f70b0b82f4b8d0c9f40ff60893ffc8601b3dab6 Mon Sep 17 00:00:00 2001 From: pukkandan Date: Fri, 24 Sep 2021 04:09:03 +0530 Subject: [PATCH] [cbs] Report appropriate error for DRM Closes #1056 --- yt_dlp/extractor/cbs.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/yt_dlp/extractor/cbs.py b/yt_dlp/extractor/cbs.py index ed5dc84a7..ae9ce5862 100644 --- a/yt_dlp/extractor/cbs.py +++ b/yt_dlp/extractor/cbs.py @@ -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') asset_types = {} + has_drm = False for item in items_data.findall('.//item'): asset_type = xpath_text(item, 'assetType') query = { @@ -144,6 +145,8 @@ def _extract_video_info(self, content_id, site='cbs', mpx_acc=2198311517): if asset_type in asset_types: continue elif any(excluded in asset_type for excluded in ('HLS_FPS', 'DASH_CENC', 'OnceURL')): + if 'DASH_CENC' in asset_type: + has_drm = True continue if asset_type.startswith('HLS') or 'StreamPack' in asset_type: query['formats'] = 'MPEG4,M3U' @@ -151,6 +154,9 @@ def _extract_video_info(self, content_id, site='cbs', mpx_acc=2198311517): query['formats'] = 'MPEG4,FLV' 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={ 'title': title, 'series': xpath_text(video_data, 'seriesTitle'),