mirror of
https://github.com/ytdl-org/youtube-dl
synced 2024-12-25 04:16:03 +01:00
[vk] Fix extraction (closes #11022)
This commit is contained in:
parent
94e08950e3
commit
9305a0dc60
@ -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'])
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user