aboutsummaryrefslogtreecommitdiffstats
path: root/youtube_dl/extractor/cbsnews.py
diff options
context:
space:
mode:
authorParmjit Virk <pvirk@mts.net>2017-06-28 10:21:35 -0500
committerSergey M <dstftw@gmail.com>2017-06-28 22:21:35 +0700
commit88d6b7c2bde239ad3593de54ab894ff43020142d (patch)
treef7c5113ee08e3b805f971ba36767858b7a7cc98f /youtube_dl/extractor/cbsnews.py
parentfd1c5fba6bee4de36cc3276d86c84c0abc054a2f (diff)
downloadyoutube-dl-88d6b7c2bde239ad3593de54ab894ff43020142d.zip
youtube-dl-88d6b7c2bde239ad3593de54ab894ff43020142d.tar.gz
youtube-dl-88d6b7c2bde239ad3593de54ab894ff43020142d.tar.bz2
[cbsnews] Relax video info regex (fixes #13284)
Diffstat (limited to 'youtube_dl/extractor/cbsnews.py')
-rw-r--r--youtube_dl/extractor/cbsnews.py17
1 files changed, 16 insertions, 1 deletions
diff --git a/youtube_dl/extractor/cbsnews.py b/youtube_dl/extractor/cbsnews.py
index 5b61c3f..ef5911b 100644
--- a/youtube_dl/extractor/cbsnews.py
+++ b/youtube_dl/extractor/cbsnews.py
@@ -52,6 +52,21 @@ class CBSNewsIE(CBSIE):
'skip_download': True,
},
},
+ {
+ 'url': 'http://www.cbsnews.com/news/maria-ridulph-murder-will-the-nations-oldest-cold-case-to-go-to-trial-ever-get-solved/',
+ 'info_dict': {
+ 'id': 'QpM5BJjBVEAUFi7ydR9LusS69DPLqPJ1',
+ 'ext': 'mp4',
+ 'title': 'Cold as Ice',
+ 'description': 'Can a childhood memory of a friend\'s murder solve a 1957 cold case? "48 Hours" correspondent Erin Moriarty has the latest.',
+ 'upload_date': '20170604',
+ 'timestamp': 1496538000,
+ 'uploader': 'CBSI-NEW',
+ },
+ 'params': {
+ 'skip_download': True,
+ },
+ },
]
def _real_extract(self, url):
@@ -60,7 +75,7 @@ class CBSNewsIE(CBSIE):
webpage = self._download_webpage(url, video_id)
video_info = self._parse_json(self._html_search_regex(
- r'(?:<ul class="media-list items" id="media-related-items"><li data-video-info|<div id="cbsNewsVideoPlayer" data-video-player-options)=\'({.+?})\'',
+ r'(?:<ul class="media-list items" id="media-related-items"[^>]*><li data-video-info|<div id="cbsNewsVideoPlayer" data-video-player-options)=\'({.+?})\'',
webpage, 'video JSON info', default='{}'), video_id, fatal=False)
if video_info: