fenix
/
ytdl-nightly
mirror of https://github.com/ytdl-org/ytdl-nightly.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[vgtv] Properly handle lives

This commit is contained in:
Sergey M․ 2015-05-30 16:12:07 +06:00
parent 181c7053e3
commit b4dd98358f
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
youtube_dl/extractor/vgtv.py
View File

@ -62,16 +62,16 @@ class VGTVIE(InfoExtractor):
}, },
{ {
# streamType: live # streamType: live
'url': 'http://www.vgtv.no/#!/live/100015/direkte-her-kan-du-se-laksen-live-fra-suldalslaagen', 'url': 'http://www.vgtv.no/#!/live/113063/direkte-v75-fra-solvalla',
'info_dict': { 'info_dict': {
'id': '100015', 'id': '113063',
'ext': 'flv', 'ext': 'flv',
'title': 'DIREKTE: Her kan du se laksen live fra Suldalslågen!', 'title': 're:^DIREKTE: V75 fra Solvalla [0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}$',
'description': 'md5:9a60cc23fa349f761628924e56eeec2d', 'description': 'md5:b3743425765355855f88e096acc93231',
'thumbnail': 're:^https?://.*\.jpg', 'thumbnail': 're:^https?://.*\.jpg',
'duration': 0, 'duration': 0,
'timestamp': 1407423348, 'timestamp': 1432975582,
'upload_date': '20140807', 'upload_date': '20150530',
'view_count': int, 'view_count': int,
}, },
'params': { 'params': {
@ -105,6 +105,7 @@ class VGTVIE(InfoExtractor):
'Video %s is no longer available' % video_id, expected=True) 'Video %s is no longer available' % video_id, expected=True)
streams = data['streamUrls'] streams = data['streamUrls']
stream_type = data.get('streamType')
formats = [] formats = []
@ -115,7 +116,7 @@ class VGTVIE(InfoExtractor):
hds_url = streams.get('hds') hds_url = streams.get('hds')
# wasLive hds are always 404 # wasLive hds are always 404
if hds_url and data.get('streamType') != 'wasLive': if hds_url and stream_type != 'wasLive':
formats.extend(self._extract_f4m_formats( formats.extend(self._extract_f4m_formats(
hds_url + '?hdcore=3.2.0&plugin=aasp-3.2.0.77.18', hds_url + '?hdcore=3.2.0&plugin=aasp-3.2.0.77.18',
video_id, f4m_id='hds')) video_id, f4m_id='hds'))
@ -143,13 +144,14 @@ class VGTVIE(InfoExtractor):
return { return {
'id': video_id, 'id': video_id,
'title': data['title'], 'title': self._live_title(data['title']),
'description': data['description'], 'description': data['description'],
'thumbnail': data['images']['main'] + '?t[]=900x506q80', 'thumbnail': data['images']['main'] + '?t[]=900x506q80',
'timestamp': data['published'], 'timestamp': data['published'],
'duration': float_or_none(data['duration'], 1000), 'duration': float_or_none(data['duration'], 1000),
'view_count': data['displays'], 'view_count': data['displays'],
'formats': formats, 'formats': formats,
'is_live': True if stream_type == 'live' else False,
} }