projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[youtube] Add support for invidious.drycat.fr (#22451)
[youtube-dl]
/
youtube_dl
/
extractor
/
cbsinteractive.py
diff --git
a/youtube_dl/extractor/cbsinteractive.py
b/youtube_dl/extractor/cbsinteractive.py
index 86f7eee2053771b47c98a05c9fbc609121160fe3..6596e98a691d3013d0375f071e0978e16f73e71a 100644
(file)
--- a/
youtube_dl/extractor/cbsinteractive.py
+++ b/
youtube_dl/extractor/cbsinteractive.py
@@
-8,7
+8,7
@@
from ..utils import int_or_none
class CBSInteractiveIE(CBSIE):
class CBSInteractiveIE(CBSIE):
- _VALID_URL = r'https?://(?:www\.)?(?P<site>cnet|zdnet)\.com/(?:videos|video
/share
)/(?P<id>[^/?]+)'
+ _VALID_URL = r'https?://(?:www\.)?(?P<site>cnet|zdnet)\.com/(?:videos|video
(?:/share)?
)/(?P<id>[^/?]+)'
_TESTS = [{
'url': 'http://www.cnet.com/videos/hands-on-with-microsofts-windows-8-1-update/',
'info_dict': {
_TESTS = [{
'url': 'http://www.cnet.com/videos/hands-on-with-microsofts-windows-8-1-update/',
'info_dict': {
@@
-60,6
+60,9
@@
class CBSInteractiveIE(CBSIE):
# m3u8 download
'skip_download': True,
},
# m3u8 download
'skip_download': True,
},
+ }, {
+ 'url': 'http://www.zdnet.com/video/huawei-matebook-x-video/',
+ 'only_matching': True,
}]
MPX_ACCOUNTS = {
}]
MPX_ACCOUNTS = {
@@
-72,10
+75,10
@@
class CBSInteractiveIE(CBSIE):
webpage = self._download_webpage(url, display_id)
data_json = self._html_search_regex(
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)
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']
video_id = vdata['mpxRefId']