aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl
diff options
context:
space:
mode:
authorSergey M․ <dstftw@gmail.com>2015-07-11 21:23:49 +0600
committerSergey M․ <dstftw@gmail.com>2015-07-11 21:23:49 +0600
commit79913fde35ead6247d7b764f3a95059fc4f17dbb (patch)
tree5e6055c2c09f17e76e50dccdab6552bd576a8a49 /youtube_dl
parentda634d0a8b409673ea095710c642bbd61ffec429 (diff)
[vk] Add list id to info_url
Diffstat (limited to 'youtube_dl')
-rw-r--r--youtube_dl/extractor/vk.py22
1 files changed, 21 insertions, 1 deletions
diff --git a/youtube_dl/extractor/vk.py b/youtube_dl/extractor/vk.py
index c0292095b..333c2a634 100644
--- a/youtube_dl/extractor/vk.py
+++ b/youtube_dl/extractor/vk.py
@@ -29,7 +29,7 @@ class VKIE(InfoExtractor):
(?:m\.)?vk\.com/(?:.+?\?.*?z=)?video|
(?:www\.)?biqle\.ru/watch/
)
- (?P<videoid>[^s].*?)(?:\?|%2F|$)
+ (?P<videoid>[^s].*?)(?:\?(?:.*\blist=(?P<list_id>[\da-f]+))?|%2F|$)
)
'''
_NETRC_MACHINE = 'vk'
@@ -120,6 +120,20 @@ class VKIE(InfoExtractor):
'skip': 'Only works from Russia',
},
{
+ # video (removed?) only available with list id
+ 'url': 'https://vk.com/video30481095_171201961?list=8764ae2d21f14088d4',
+ 'md5': '091287af5402239a1051c37ec7b92913',
+ 'info_dict': {
+ 'id': '171201961',
+ 'ext': 'mp4',
+ 'title': 'ТюменцевВВ_09.07.2015',
+ 'uploader': 'Anton Ivanov',
+ 'duration': 109,
+ 'upload_date': '20150709',
+ 'view_count': int,
+ },
+ },
+ {
# youtube embed
'url': 'https://vk.com/video276849682_170681728',
'info_dict': {
@@ -182,6 +196,12 @@ class VKIE(InfoExtractor):
video_id = '%s_%s' % (mobj.group('oid'), mobj.group('id'))
info_url = 'https://vk.com/al_video.php?act=show&al=1&module=video&video=%s' % video_id
+
+ # Some videos (removed?) can only be downloaded with list id specified
+ list_id = mobj.group('list_id')
+ if list_id:
+ info_url += '&list=%s' % list_id
+
info_page = self._download_webpage(info_url, video_id)
if re.search(r'<!>/login\.php\?.*\bact=security_check', info_page):