mirror
/
youtube-dl
mirror of https://codeberg.org/polarisfm/youtube-dl.git
1
0
Fork 0
Code Releases Activity

Improve some id regexes

This commit is contained in:
stepshal 2016-09-14 23:03:26 +07:00 committed by Sergey M․
parent 1dec2c8a0e
commit 490b755769
No known key found for this signature in database
GPG Key ID: 2C393E0F18A9236D
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
youtube_dl/extractor/canvas.py
View File

@ -71,7 +71,7 @@ class CanvasIE(InfoExtractor):
webpage)).strip() webpage)).strip()
video_id = self._html_search_regex( 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( data = self._download_json(
'https://mediazone.vrt.be/api/v1/%s/assets/%s' 'https://mediazone.vrt.be/api/v1/%s/assets/%s'

2
youtube_dl/extractor/nfl.py
View File

@ -165,7 +165,7 @@ class NFLIE(InfoExtractor):
group='config')) group='config'))
# For articles, the id in the url is not the video id # For articles, the id in the url is not the video id
video_id = self._search_regex( 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') webpage, 'video id', default=video_id, group='id')
config = self._download_json(config_url, video_id, 'Downloading player config') config = self._download_json(config_url, video_id, 'Downloading player config')
url_template = NFLIE.prepend_host( url_template = NFLIE.prepend_host(

2
youtube_dl/extractor/npo.py
View File

@ -429,7 +429,7 @@ class SchoolTVIE(InfoExtractor):
display_id = self._match_id(url) display_id = self._match_id(url)
webpage = self._download_webpage(url, display_id) webpage = self._download_webpage(url, display_id)
video_id = self._search_regex( 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 { return {
'_type': 'url_transparent', '_type': 'url_transparent',
'ie_key': 'NPO', 'ie_key': 'NPO',