aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl
diff options
context:
space:
mode:
authorSergey M․ <dstftw@gmail.com>2015-05-30 16:12:07 +0600
committerSergey M․ <dstftw@gmail.com>2015-05-30 16:12:07 +0600
commitb4dd98358f0a68650f6154e8de4e12b8881248aa (patch)
treecd47cea1d761d29798c1f9dfb1ca838116754028 /youtube_dl
parent181c7053e377700c1615bdff2b0fb19235762c57 (diff)
[vgtv] Properly handle lives
Diffstat (limited to 'youtube_dl')
-rw-r--r--youtube_dl/extractor/vgtv.py18
1 files changed, 10 insertions, 8 deletions
diff --git a/youtube_dl/extractor/vgtv.py b/youtube_dl/extractor/vgtv.py
index 472feb7f0..f38a72fde 100644
--- a/youtube_dl/extractor/vgtv.py
+++ b/youtube_dl/extractor/vgtv.py
@@ -62,16 +62,16 @@ class VGTVIE(InfoExtractor):
},
{
# 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': {
- 'id': '100015',
+ 'id': '113063',
'ext': 'flv',
- 'title': 'DIREKTE: Her kan du se laksen live fra Suldalslågen!',
- 'description': 'md5:9a60cc23fa349f761628924e56eeec2d',
+ 'title': 're:^DIREKTE: V75 fra Solvalla [0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}$',
+ 'description': 'md5:b3743425765355855f88e096acc93231',
'thumbnail': 're:^https?://.*\.jpg',
'duration': 0,
- 'timestamp': 1407423348,
- 'upload_date': '20140807',
+ 'timestamp': 1432975582,
+ 'upload_date': '20150530',
'view_count': int,
},
'params': {
@@ -105,6 +105,7 @@ class VGTVIE(InfoExtractor):
'Video %s is no longer available' % video_id, expected=True)
streams = data['streamUrls']
+ stream_type = data.get('streamType')
formats = []
@@ -115,7 +116,7 @@ class VGTVIE(InfoExtractor):
hds_url = streams.get('hds')
# 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(
hds_url + '?hdcore=3.2.0&plugin=aasp-3.2.0.77.18',
video_id, f4m_id='hds'))
@@ -143,13 +144,14 @@ class VGTVIE(InfoExtractor):
return {
'id': video_id,
- 'title': data['title'],
+ 'title': self._live_title(data['title']),
'description': data['description'],
'thumbnail': data['images']['main'] + '?t[]=900x506q80',
'timestamp': data['published'],
'duration': float_or_none(data['duration'], 1000),
'view_count': data['displays'],
'formats': formats,
+ 'is_live': True if stream_type == 'live' else False,
}