diff options
| author | remitamine <remitamine@gmail.com> | 2015-10-30 10:20:38 +0100 |
|---|---|---|
| committer | remitamine <remitamine@gmail.com> | 2015-10-30 10:20:38 +0100 |
| commit | 804afc5871a88eaa32a6c161df67e6b37383d7d1 (patch) | |
| tree | b0f917814a75daeac0c303f806412adce0b583a6 /youtube_dl | |
| parent | 00d24327efcac74b11dbc4d813aed74da9a501e0 (diff) | |
[vgtv] improve _VALID_URL regex
Diffstat (limited to 'youtube_dl')
| -rw-r--r-- | youtube_dl/extractor/vgtv.py | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/youtube_dl/extractor/vgtv.py b/youtube_dl/extractor/vgtv.py index 17213d9b6..e8039ec7f 100644 --- a/youtube_dl/extractor/vgtv.py +++ b/youtube_dl/extractor/vgtv.py @@ -11,17 +11,19 @@ from ..utils import ( class VGTVIE(InfoExtractor): - IE_DESC = 'VGTV, BTTV, FTV, Aftenposten, Aftonbladet' + IE_DESC = 'VGTV, BTTV, FTV, Aftenposten and Aftonbladet' _VALID_URL = r'''(?x) - (?: - vgtv:| - http://(?:www\.)? + http://(?:www\.)? + (?P<host> + vgtv.no| + (?:bt|aftenbladet).no/tv| + fvn.no/fvntv| + aftenposten.no/webtv ) - (?P<host>vgtv.no|(?:bt.no|aftenbladet.no)/tv|fvn.no/fvntv|aftenposten.no/webtv) + / (?: - :| - /\#!/(?:video|live)/| - /embed?id= + \#!/(?:video|live)/| + embed?.*id= ) (?P<id>[0-9]+) ''' @@ -211,7 +213,7 @@ class BTArticleIE(InfoExtractor): webpage = self._download_webpage(url, self._match_id(url)) video_id = self._search_regex( r'SVP\.Player\.load\(\s*(\d+)', webpage, 'video id') - return self.url_result('vgtv:bt:%s' % video_id, 'VGTV') + return self.url_result('http://bt.no/tv/embed?id=%s' % video_id, 'VGTV') class BTVestlendingenIE(InfoExtractor): |