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

[vk] Fix postlive videos extraction

Browse source
This commit is contained in:
Sergey M․ 2016-12-30 04:31:19 +07:00
parent 9cdb0a338d
commit 424ed37ec4
No known key found for this signature in database
GPG key ID: 2C393E0F18A9236D
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
youtube_dl/extractor/vk.py
View file

@ -245,7 +245,7 @@ class VKIE(VKBaseIE):
}, },
}, },
{ {
# finished live stream, live_mp4 # finished live stream, postlive_mp4
'url': 'https://vk.com/videos-387766?z=video-387766_456242764%2Fpl_-387766_-2', 'url': 'https://vk.com/videos-387766?z=video-387766_456242764%2Fpl_-387766_-2',
'md5': '90d22d051fccbbe9becfccc615be6791', 'md5': '90d22d051fccbbe9becfccc615be6791',
'info_dict': { 'info_dict': {
@ -258,7 +258,7 @@ class VKIE(VKBaseIE):
}, },
}, },
{ {
# live stream, hls and rtmp links,most likely already finished live # live stream, hls and rtmp links, most likely already finished live
# stream by the time you are reading this comment # stream by the time you are reading this comment
'url': 'https://vk.com/video-140332_456239111', 'url': 'https://vk.com/video-140332_456239111',
'only_matching': True, 'only_matching': True,
@ -392,6 +392,8 @@ class VKIE(VKBaseIE):
title = unescapeHTML(data['md_title']) title = unescapeHTML(data['md_title'])
# 2 = live
# 3 = post live (finished live)
is_live = data.get('live') == 2 is_live = data.get('live') == 2
if is_live: if is_live:
title = self._live_title(title) title = self._live_title(title)
@ -408,7 +410,8 @@ class VKIE(VKBaseIE):
for format_id, format_url in data.items(): for format_id, format_url in data.items():
if not isinstance(format_url, compat_str) or not format_url.startswith(('http', '//', 'rtmp')): if not isinstance(format_url, compat_str) or not format_url.startswith(('http', '//', 'rtmp')):
continue continue
if format_id.startswith(('url', 'cache')) or format_id in ('extra_data', 'live_mp4'): if (format_id.startswith(('url', 'cache')) or
format_id in ('extra_data', 'live_mp4', 'postlive_mp4')):
height = int_or_none(self._search_regex( height = int_or_none(self._search_regex(
r'^(?:url|cache)(\d+)', format_id, 'height', default=None)) r'^(?:url|cache)(\d+)', format_id, 'height', default=None))
formats.append({ formats.append({