stepshal
8 years ago
committed by
Sergey M․
No known key found for this signature in database
GPG Key ID: 2C393E0F18A9236D
3 changed files with
3 additions and
3 deletions
-
youtube_dl/extractor/canvas.py
-
youtube_dl/extractor/nfl.py
-
youtube_dl/extractor/npo.py
|
|
@ -71,7 +71,7 @@ class CanvasIE(InfoExtractor): |
|
|
|
webpage)).strip() |
|
|
|
|
|
|
|
video_id = self._html_search_regex( |
|
|
|
r'data-video=(["\'])(?P<id>.+?)\1', webpage, 'video id', group='id') |
|
|
|
r'data-video=(["\'])(?P<id>(?:(?!\1).)+)\1', webpage, 'video id', group='id') |
|
|
|
|
|
|
|
data = self._download_json( |
|
|
|
'https://mediazone.vrt.be/api/v1/%s/assets/%s' |
|
|
|
|
|
@ -165,7 +165,7 @@ class NFLIE(InfoExtractor): |
|
|
|
group='config')) |
|
|
|
# For articles, the id in the url is not the video id |
|
|
|
video_id = self._search_regex( |
|
|
|
r'(?:<nflcs:avplayer[^>]+data-content[Ii]d\s*=\s*|content[Ii]d\s*:\s*)(["\'])(?P<id>.+?)\1', |
|
|
|
r'(?:<nflcs:avplayer[^>]+data-content[Ii]d\s*=\s*|content[Ii]d\s*:\s*)(["\'])(?P<id>(?:(?!\1).)+)\1', |
|
|
|
webpage, 'video id', default=video_id, group='id') |
|
|
|
config = self._download_json(config_url, video_id, 'Downloading player config') |
|
|
|
url_template = NFLIE.prepend_host( |
|
|
|
|
|
@ -429,7 +429,7 @@ class SchoolTVIE(InfoExtractor): |
|
|
|
display_id = self._match_id(url) |
|
|
|
webpage = self._download_webpage(url, display_id) |
|
|
|
video_id = self._search_regex( |
|
|
|
r'data-mid=(["\'])(?P<id>.+?)\1', webpage, 'video_id', group='id') |
|
|
|
r'data-mid=(["\'])(?P<id>(?:(?!\1).)+)\1', webpage, 'video_id', group='id') |
|
|
|
return { |
|
|
|
'_type': 'url_transparent', |
|
|
|
'ie_key': 'NPO', |
|
|
|