w/youtube-dl
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

[vgtv] support ap.vgtv.no and fix old videos extraction(fixes #8719)

Browse source
This commit is contained in:
remitamine 2016-03-05 17:51:46 +01:00
parent 1e501f6c40
commit 7177fd24f8
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
youtube_dl/extractor/vgtv.py
View file

@ -20,6 +20,7 @@ class VGTVIE(XstreamIE):
'aftenbladet.no/tv': 'satv', 'aftenbladet.no/tv': 'satv',
'fvn.no/fvntv': 'fvntv', 'fvn.no/fvntv': 'fvntv',
'aftenposten.no/webtv': 'aptv', 'aftenposten.no/webtv': 'aptv',
'ap.vgtv.no/webtv': 'aptv',
} }
_APP_NAME_TO_VENDOR = { _APP_NAME_TO_VENDOR = {
@ -35,7 +36,7 @@ class VGTVIE(XstreamIE):
(?P<host> (?P<host>
%s %s
) )
/ /?
(?: (?:
\#!/(?:video|live)/| \#!/(?:video|live)/|
embed?.*id= embed?.*id=
@ -107,19 +108,27 @@ class VGTVIE(XstreamIE):
'md5': 'fd828cd29774a729bf4d4425fe192972', 'md5': 'fd828cd29774a729bf4d4425fe192972',
'info_dict': { 'info_dict': {
'id': '21039', 'id': '21039',
'ext': 'mov', 'ext': 'mp4',
'title': 'TRAILER: «SWEATSHOP» - I can´t take any more', 'title': 'TRAILER: «SWEATSHOP» - I can´t take any more',
'description': 'md5:21891f2b0dd7ec2f78d84a50e54f8238', 'description': 'md5:21891f2b0dd7ec2f78d84a50e54f8238',
'duration': 66, 'duration': 66,
'timestamp': 1417002452, 'timestamp': 1417002452,
'upload_date': '20141126', 'upload_date': '20141126',
'view_count': int, 'view_count': int,
} },
'params': {
# m3u8 download
'skip_download': True,
},
}, },
{ {
'url': 'http://www.bt.no/tv/#!/video/100250/norling-dette-er-forskjellen-paa-1-divisjon-og-eliteserien', 'url': 'http://www.bt.no/tv/#!/video/100250/norling-dette-er-forskjellen-paa-1-divisjon-og-eliteserien',
'only_matching': True, 'only_matching': True,
}, },
{
'url': 'http://ap.vgtv.no/webtv#!/video/111084/de-nye-bysyklene-lettere-bedre-gir-stoerre-hjul-og-feste-til-mobil',
'only_matching': True,
},
] ]
def _real_extract(self, url): def _real_extract(self, url):
@ -144,8 +153,6 @@ class VGTVIE(XstreamIE):
if len(video_id) == 5: if len(video_id) == 5:
if appname == 'bttv': if appname == 'bttv':
info = self._extract_video_info('btno', video_id) info = self._extract_video_info('btno', video_id)
elif appname == 'aptv':
info = self._extract_video_info('ap', video_id)
streams = data['streamUrls'] streams = data['streamUrls']
stream_type = data.get('streamType') stream_type = data.get('streamType')