[vk] Extract video URL from extra_data (Closes #8646)

This commit is contained in:
Sergey M․ 2016-02-23 18:47:13 +06:00
parent efbeddead3
commit bf4b3b6bd9

View File

@ -11,6 +11,7 @@
) )
from ..utils import ( from ..utils import (
ExtractorError, ExtractorError,
int_or_none,
orderedSet, orderedSet,
sanitized_Request, sanitized_Request,
str_to_int, str_to_int,
@ -151,6 +152,19 @@ class VKIE(InfoExtractor):
'view_count': int, 'view_count': int,
}, },
}, },
{
# video key is extra_data not url\d+
'url': 'http://vk.com/video-110305615_171782105',
'md5': 'e13fcda136f99764872e739d13fac1d1',
'info_dict': {
'id': '171782105',
'ext': 'mp4',
'title': 'S-Dance, репетиции к The way show',
'uploader': 'THE WAY SHOW | 17 апреля',
'upload_date': '20160207',
'view_count': int,
},
},
{ {
# removed video, just testing that we match the pattern # removed video, just testing that we match the pattern
'url': 'http://vk.com/feed?z=video-43215063_166094326%2Fbb50cacd3177146d7a', 'url': 'http://vk.com/feed?z=video-43215063_166094326%2Fbb50cacd3177146d7a',
@ -298,12 +312,17 @@ def _real_extract(self, url):
view_count = str_to_int(self._search_regex( view_count = str_to_int(self._search_regex(
r'([\d,.]+)', views, 'view count', fatal=False)) r'([\d,.]+)', views, 'view count', fatal=False))
formats = [{ formats = []
'format_id': k, for k, v in data.items():
'url': v, if not k.startswith('url') and k != 'extra_data' or not v:
'width': int(k[len('url'):]), continue
} for k, v in data.items() height = int_or_none(self._search_regex(
if k.startswith('url')] r'^url(\d+)', k, 'height', default=None))
formats.append({
'format_id': k,
'url': v,
'height': height,
})
self._sort_formats(formats) self._sort_formats(formats)
return { return {