dbrun
/
youtube-dl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[vk] Fix extraction (closes #11022)

This commit is contained in:
Sergey M․ 2016-10-25 21:05:29 +07:00
parent 94e08950e3
commit 9305a0dc60
No known key found for this signature in database
GPG Key ID: 2C393E0F18A9236D
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
youtube_dl/extractor/vk.py
View File

@ -3,7 +3,6 @@ from __future__ import unicode_literals
import collections import collections
import re import re
import json
import sys import sys
from .common import InfoExtractor from .common import InfoExtractor
@ -369,8 +368,18 @@ class VKIE(VKBaseIE):
opts_url = 'http:' + opts_url opts_url = 'http:' + opts_url
return self.url_result(opts_url) return self.url_result(opts_url)
data_json = self._search_regex(r'var\s+vars\s*=\s*({.+?});', info_page, 'vars') # vars does not look to be served anymore since 24.10.2016
data = json.loads(data_json) data = self._parse_json(
self._search_regex(
r'var\s+vars\s*=\s*({.+?});', info_page, 'vars', default='{}'),
video_id, fatal=False)
# <!json> is served instead
if not data:
data = self._parse_json(
self._search_regex(
r'<!json>\s*({.+?})\s*<!>', info_page, 'json'),
video_id)['player']['params'][0]
title = unescapeHTML(data['md_title']) title = unescapeHTML(data['md_title'])