projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[extractor/common] Add durations for DASH fragments with bare SegmentURLs
[youtube-dl]
/
youtube_dl
/
extractor
/
nbc.py
diff --git
a/youtube_dl/extractor/nbc.py
b/youtube_dl/extractor/nbc.py
index 62db70b438d365eb60609beaa6bbad9e2d9fc7d4..554dec36e62dc246ea314ac07f9cff6b3c1323fe 100644
(file)
--- a/
youtube_dl/extractor/nbc.py
+++ b/
youtube_dl/extractor/nbc.py
@@
-15,7
+15,7
@@
from ..utils import (
class NBCIE(AdobePassIE):
class NBCIE(AdobePassIE):
- _VALID_URL = r'
(?P<permalink>https?://(?:www\.)?nbc\.com/
[^/]+/video/[^/]+/(?P<id>n?\d+))'
+ _VALID_URL = r'
https?(?P<permalink>://(?:www\.)?nbc\.com/(?:classic-tv/)?
[^/]+/video/[^/]+/(?P<id>n?\d+))'
_TESTS = [
{
_TESTS = [
{
@@
-67,11
+67,16
@@
class NBCIE(AdobePassIE):
'skip_download': True,
},
'skip': 'Only works from US',
'skip_download': True,
},
'skip': 'Only works from US',
- }
+ },
+ {
+ 'url': 'https://www.nbc.com/classic-tv/charles-in-charge/video/charles-in-charge-pilot/n3310',
+ 'only_matching': True,
+ },
]
def _real_extract(self, url):
permalink, video_id = re.match(self._VALID_URL, url).groups()
]
def _real_extract(self, url):
permalink, video_id = re.match(self._VALID_URL, url).groups()
+ permalink = 'http' + permalink
video_data = self._download_json(
'https://api.nbc.com/v3/videos', video_id, query={
'filter[permalink]': permalink,
video_data = self._download_json(
'https://api.nbc.com/v3/videos', video_id, query={
'filter[permalink]': permalink,
@@
-109,10
+114,10
@@
class NBCSportsVPlayerIE(InfoExtractor):
_VALID_URL = r'https?://vplayer\.nbcsports\.com/(?:[^/]+/)+(?P<id>[0-9a-zA-Z_]+)'
_TESTS = [{
_VALID_URL = r'https?://vplayer\.nbcsports\.com/(?:[^/]+/)+(?P<id>[0-9a-zA-Z_]+)'
_TESTS = [{
- 'url': 'https://vplayer.nbcsports.com/p/BxmELC/nbcsports_
share
/select/9CsDKds0kvHI',
+ 'url': 'https://vplayer.nbcsports.com/p/BxmELC/nbcsports_
embed
/select/9CsDKds0kvHI',
'info_dict': {
'id': '9CsDKds0kvHI',
'info_dict': {
'id': '9CsDKds0kvHI',
- 'ext': '
flv
',
+ 'ext': '
mp4
',
'description': 'md5:df390f70a9ba7c95ff1daace988f0d8d',
'title': 'Tyler Kalinoski hits buzzer-beater to lift Davidson',
'timestamp': 1426270238,
'description': 'md5:df390f70a9ba7c95ff1daace988f0d8d',
'title': 'Tyler Kalinoski hits buzzer-beater to lift Davidson',
'timestamp': 1426270238,
@@
-120,7
+125,7
@@
class NBCSportsVPlayerIE(InfoExtractor):
'uploader': 'NBCU-SPORTS',
}
}, {
'uploader': 'NBCU-SPORTS',
}
}, {
- 'url': 'http
://vplayer.nbcsports.com/p/BxmELC/nbc_embedshare/select
/_hqLjQ95yx8Z',
+ 'url': 'http
s://vplayer.nbcsports.com/p/BxmELC/nbcsports_embed/select/media
/_hqLjQ95yx8Z',
'only_matching': True,
}]
'only_matching': True,
}]
@@
-134,7
+139,8
@@
class NBCSportsVPlayerIE(InfoExtractor):
def _real_extract(self, url):
video_id = self._match_id(url)
webpage = self._download_webpage(url, video_id)
def _real_extract(self, url):
video_id = self._match_id(url)
webpage = self._download_webpage(url, video_id)
- theplatform_url = self._og_search_video_url(webpage)
+ theplatform_url = self._og_search_video_url(webpage).replace(
+ 'vplayer.nbcsports.com', 'player.theplatform.com')
return self.url_result(theplatform_url, 'ThePlatform')
return self.url_result(theplatform_url, 'ThePlatform')