daniel/youtube-dl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[vgtv] improve _VALID_URL regex

Browse Source
This commit is contained in:
remitamine 2015-10-30 10:20:38 +01:00
parent 00d24327ef
commit 804afc5871
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
youtube_dl/extractor/vgtv.py
View File

@ -11,17 +11,19 @@ from ..utils import (
class VGTVIE(InfoExtractor): class VGTVIE(InfoExtractor):
IE_DESC = 'VGTV, BTTV, FTV, Aftenposten, Aftonbladet' IE_DESC = 'VGTV, BTTV, FTV, Aftenposten and Aftonbladet'
_VALID_URL = r'''(?x) _VALID_URL = r'''(?x)
(?: http://(?:www\.)?
vgtv:| (?P<host>
http://(?:www\.)? 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)/|
/\#!/(?:video|live)/| embed?.*id=
/embed?id=
) )
(?P<id>[0-9]+) (?P<id>[0-9]+)
''' '''
@ -211,7 +213,7 @@ class BTArticleIE(InfoExtractor):
webpage = self._download_webpage(url, self._match_id(url)) webpage = self._download_webpage(url, self._match_id(url))
video_id = self._search_regex( video_id = self._search_regex(
r'SVP\.Player\.load\(\s*(\d+)', webpage, 'video id') 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): class BTVestlendingenIE(InfoExtractor):