projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b9d52fb
)
[cbsinteractive] fix data extraction(closes #15451)
author
Remita Amine
<remitamine@gmail.com>
Mon, 29 Jan 2018 14:31:46 +0000
(15:31 +0100)
committer
Remita Amine
<remitamine@gmail.com>
Mon, 29 Jan 2018 14:33:24 +0000
(15:33 +0100)
youtube_dl/extractor/cbsinteractive.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/cbsinteractive.py
b/youtube_dl/extractor/cbsinteractive.py
index 681d63e29222715a0bb0d45462169edde0787330..6596e98a691d3013d0375f071e0978e16f73e71a 100644
(file)
--- a/
youtube_dl/extractor/cbsinteractive.py
+++ b/
youtube_dl/extractor/cbsinteractive.py
@@
-75,10
+75,10
@@
class CBSInteractiveIE(CBSIE):
webpage = self._download_webpage(url, display_id)
data_json = self._html_search_regex(
- r"data
-(?:cnet|zdnet)-video(?:-uvp(?:js)?
)?-options='([^']+)'",
+ r"data
(?:-(?:cnet|zdnet))?-video(?:-(?:uvp(?:js)?|player)
)?-options='([^']+)'",
webpage, 'data json')
data = self._parse_json(data_json, display_id)
- vdata = data.get('video') or
data['videos']
[0]
+ vdata = data.get('video') or
(data.get('videos') or data.get('playlist'))
[0]
video_id = vdata['mpxRefId']