projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #9747 from TRox1972/lynda
[youtube-dl]
/
youtube_dl
/
extractor
/
espn.py
diff --git
a/youtube_dl/extractor/espn.py
b/youtube_dl/extractor/espn.py
index 3762d874896487cc5a1ba12c18678f00ea043bd0..66c08bec47d8aa639cf758bb3e083b9772230c76 100644
(file)
--- a/
youtube_dl/extractor/espn.py
+++ b/
youtube_dl/extractor/espn.py
@@
-8,6
+8,7
@@
class ESPNIE(InfoExtractor):
_VALID_URL = r'https?://espn\.go\.com/(?:[^/]+/)*(?P<id>[^/]+)'
_TESTS = [{
'url': 'http://espn.go.com/video/clip?id=10365079',
_VALID_URL = r'https?://espn\.go\.com/(?:[^/]+/)*(?P<id>[^/]+)'
_TESTS = [{
'url': 'http://espn.go.com/video/clip?id=10365079',
+ 'md5': '60e5d097a523e767d06479335d1bdc58',
'info_dict': {
'id': 'FkYWtmazr6Ed8xmvILvKLWjd4QvYZpzG',
'ext': 'mp4',
'info_dict': {
'id': 'FkYWtmazr6Ed8xmvILvKLWjd4QvYZpzG',
'ext': 'mp4',
@@
-15,21
+16,22
@@
class ESPNIE(InfoExtractor):
'description': None,
},
'params': {
'description': None,
},
'params': {
- # m3u8 download
'skip_download': True,
},
'skip_download': True,
},
+ 'add_ie': ['OoyalaExternal'],
}, {
# intl video, from http://www.espnfc.us/video/mls-highlights/150/video/2743663/must-see-moments-best-of-the-mls-season
'url': 'http://espn.go.com/video/clip?id=2743663',
}, {
# intl video, from http://www.espnfc.us/video/mls-highlights/150/video/2743663/must-see-moments-best-of-the-mls-season
'url': 'http://espn.go.com/video/clip?id=2743663',
+ 'md5': 'f4ac89b59afc7e2d7dbb049523df6768',
'info_dict': {
'id': '50NDFkeTqRHB0nXBOK-RGdSG5YQPuxHg',
'ext': 'mp4',
'title': 'Must-See Moments: Best of the MLS season',
},
'params': {
'info_dict': {
'id': '50NDFkeTqRHB0nXBOK-RGdSG5YQPuxHg',
'ext': 'mp4',
'title': 'Must-See Moments: Best of the MLS season',
},
'params': {
- # m3u8 download
'skip_download': True,
},
'skip_download': True,
},
+ 'add_ie': ['OoyalaExternal'],
}, {
'url': 'https://espn.go.com/video/iframe/twitter/?cms=espn&id=10365079',
'only_matching': True,
}, {
'url': 'https://espn.go.com/video/iframe/twitter/?cms=espn&id=10365079',
'only_matching': True,
@@
-53,8
+55,8
@@
class ESPNIE(InfoExtractor):
webpage = self._download_webpage(url, video_id)
video_id = self._search_regex(
webpage = self._download_webpage(url, video_id)
video_id = self._search_regex(
- r'class=
"video-play-button"[^>]+data-id="(
\d+)',
- webpage, 'video id')
+ r'class=
(["\']).*?video-play-button.*?\1[^>]+data-id=["\'](?P<id>
\d+)',
+ webpage, 'video id'
, group='id'
)
cms = 'espn'
if 'data-source="intl"' in webpage:
cms = 'espn'
if 'data-source="intl"' in webpage: