kumi/yt-dlp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[ParamountPlus,CBS] Change VALID_URL (#3098)

Browse source 
Closes #3096

Authored by: Sipherdrakon
This commit is contained in:
Sipherdrakon 2022-03-18 05:49:31 -04:00 committed by GitHub
parent e4b98809cf
commit 43c38abd1f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
yt_dlp/extractor/cbs.py
View file

@ -77,21 +77,21 @@ class CBSIE(CBSBaseIE):
(?: (?:
cbs:| cbs:|
https?://(?:www\.)?(?: https?://(?:www\.)?(?:
cbs\.com/(?:shows/[^/]+/video|movies/[^/]+)/| cbs\.com/(?:shows|movies)/(?:video|[^/]+/video|[^/]+)/|
colbertlateshow\.com/(?:video|podcasts)/) colbertlateshow\.com/(?:video|podcasts)/)
)(?P<id>[\w-]+)''' )(?P<id>[\w-]+)'''
# All tests are blocked outside US # All tests are blocked outside US
_TESTS = [{ _TESTS = [{
'url': 'https://www.cbs.com/shows/garth-brooks/video/_u7W953k6la293J7EPTd9oHkSPs6Xn6_/connect-chat-feat-garth-brooks/', 'url': 'https://www.cbs.com/shows/video/xrUyNLtl9wd8D_RWWAg9NU2F_V6QpB3R/',
'info_dict': { 'info_dict': {
'id': '_u7W953k6la293J7EPTd9oHkSPs6Xn6_', 'id': 'xrUyNLtl9wd8D_RWWAg9NU2F_V6QpB3R',
'ext': 'mp4', 'ext': 'mp4',
'title': 'Connect Chat feat. Garth Brooks', 'title': 'Tough As Nails - Dreams Never Die',
'description': 'Connect with country music singer Garth Brooks, as he chats with fans on Wednesday November 27, 2013. Be sure to tune in to Garth Brooks: Live from Las Vegas, Friday November 29, at 9/8c on CBS!', 'description': 'md5:a3535a62531cdd52b0364248a2c1ae33',
'duration': 1495, 'duration': 2588,
'timestamp': 1385585425, 'timestamp': 1639015200,
'upload_date': '20131127', 'upload_date': '20211209',
'uploader': 'CBSI-NEW', 'uploader': 'CBSI-NEW',
}, },
'params': { 'params': {
@ -99,14 +99,14 @@ class CBSIE(CBSBaseIE):
'skip_download': True, 'skip_download': True,
}, },
}, { }, {
'url': 'https://www.cbs.com/shows/the-late-show-with-stephen-colbert/video/60icOhMb9NcjbcWnF_gub9XXHdeBcNk2/the-late-show-6-23-21-christine-baranski-joy-oladokun-', 'url': 'https://www.cbs.com/shows/video/sZH1MGgomIosZgxGJ1l263MFq16oMtW1/',
'info_dict': { 'info_dict': {
'id': '60icOhMb9NcjbcWnF_gub9XXHdeBcNk2', 'id': 'sZH1MGgomIosZgxGJ1l263MFq16oMtW1',
'title': 'The Late Show - 6/23/21 (Christine Baranski, Joy Oladokun)', 'title': 'The Late Show - 3/16/22 (Michael Buble, Rose Matafeo)',
'timestamp': 1624507140, 'timestamp': 1647488100,
'description': 'md5:e01af24e95c74d55e8775aef86117b95', 'description': 'md5:d0e6ec23c544b7fa8e39a8e6844d2439',
'uploader': 'CBSI-NEW', 'uploader': 'CBSI-NEW',
'upload_date': '20210624', 'upload_date': '20220317',
}, },
'params': { 'params': {
'ignore_no_formats_error': True, 'ignore_no_formats_error': True,

20
yt_dlp/extractor/paramountplus.py
View file

@ -14,12 +14,12 @@ class ParamountPlusIE(CBSBaseIE):
(?: (?:
paramountplus:| paramountplus:|
https?://(?:www\.)?(?: https?://(?:www\.)?(?:
paramountplus\.com/(?:shows/[^/]+/video|movies/[^/]+)/ paramountplus\.com/(?:shows|movies)/(?:video|[^/]+/video|[^/]+)/
)(?P<id>[\w-]+))''' )(?P<id>[\w-]+))'''
# All tests are blocked outside US # All tests are blocked outside US
_TESTS = [{ _TESTS = [{
'url': 'https://www.paramountplus.com/shows/catdog/video/Oe44g5_NrlgiZE3aQVONleD6vXc8kP0k/catdog-climb-every-catdog-the-canine-mutiny/', 'url': 'https://www.paramountplus.com/shows/video/Oe44g5_NrlgiZE3aQVONleD6vXc8kP0k/',
'info_dict': { 'info_dict': {
'id': 'Oe44g5_NrlgiZE3aQVONleD6vXc8kP0k', 'id': 'Oe44g5_NrlgiZE3aQVONleD6vXc8kP0k',
'ext': 'mp4', 'ext': 'mp4',
@ -34,7 +34,7 @@ class ParamountPlusIE(CBSBaseIE):
'skip_download': 'm3u8', 'skip_download': 'm3u8',
}, },
}, { }, {
'url': 'https://www.paramountplus.com/shows/tooning-out-the-news/video/6hSWYWRrR9EUTz7IEe5fJKBhYvSUfexd/7-23-21-week-in-review-rep-jahana-hayes-howard-fineman-sen-michael-bennet-sheera-frenkel-cecilia-kang-/', 'url': 'https://www.paramountplus.com/shows/video/6hSWYWRrR9EUTz7IEe5fJKBhYvSUfexd/',
'info_dict': { 'info_dict': {
'id': '6hSWYWRrR9EUTz7IEe5fJKBhYvSUfexd', 'id': '6hSWYWRrR9EUTz7IEe5fJKBhYvSUfexd',
'ext': 'mp4', 'ext': 'mp4',
@ -49,7 +49,7 @@ class ParamountPlusIE(CBSBaseIE):
'skip_download': 'm3u8', 'skip_download': 'm3u8',
}, },
}, { }, {
'url': 'https://www.paramountplus.com/movies/daddys-home/vM2vm0kE6vsS2U41VhMRKTOVHyQAr6pC', 'url': 'https://www.paramountplus.com/movies/video/vM2vm0kE6vsS2U41VhMRKTOVHyQAr6pC/',
'info_dict': { 'info_dict': {
'id': 'vM2vm0kE6vsS2U41VhMRKTOVHyQAr6pC', 'id': 'vM2vm0kE6vsS2U41VhMRKTOVHyQAr6pC',
'ext': 'mp4', 'ext': 'mp4',
@ -64,7 +64,7 @@ class ParamountPlusIE(CBSBaseIE):
}, },
'expected_warnings': ['Ignoring subtitle tracks'], # TODO: Investigate this 'expected_warnings': ['Ignoring subtitle tracks'], # TODO: Investigate this
}, { }, {
'url': 'https://www.paramountplus.com/movies/sonic-the-hedgehog/5EKDXPOzdVf9voUqW6oRuocyAEeJGbEc', 'url': 'https://www.paramountplus.com/movies/video/5EKDXPOzdVf9voUqW6oRuocyAEeJGbEc/',
'info_dict': { 'info_dict': {
'id': '5EKDXPOzdVf9voUqW6oRuocyAEeJGbEc', 'id': '5EKDXPOzdVf9voUqW6oRuocyAEeJGbEc',
'ext': 'mp4', 'ext': 'mp4',
@ -79,10 +79,16 @@ class ParamountPlusIE(CBSBaseIE):
}, },
'expected_warnings': ['Ignoring subtitle tracks'], 'expected_warnings': ['Ignoring subtitle tracks'],
}, { }, {
'url': 'https://www.paramountplus.com/shows/all-rise/video/QmR1WhNkh1a_IrdHZrbcRklm176X_rVc/all-rise-space/', 'url': 'https://www.paramountplus.com/shows/the-real-world/video/mOVeHeL9ub9yWdyzSZFYz8Uj4ZBkVzQg/the-real-world-reunion/',
'only_matching': True, 'only_matching': True,
}, { }, {
'url': 'https://www.paramountplus.com/movies/million-dollar-american-princesses-meghan-and-harry/C0LpgNwXYeB8txxycdWdR9TjxpJOsdCq', 'url': 'https://www.paramountplus.com/shows/video/mOVeHeL9ub9yWdyzSZFYz8Uj4ZBkVzQg/',
'only_matching': True,
}, {
'url': 'https://www.paramountplus.com/movies/video/W0VyStQqUnqKzJkrpSAIARuCc9YuYGNy/',
'only_matching': True,
}, {
'url': 'https://www.paramountplus.com/movies/paw-patrol-the-movie/W0VyStQqUnqKzJkrpSAIARuCc9YuYGNy/',
'only_matching': True, 'only_matching': True,
}] }]