]> git.bitcoin.ninja Git - youtube-dl/commitdiff
[vk] Fix extraction (closes #11022)
authorSergey M․ <dstftw@gmail.com>
Tue, 25 Oct 2016 14:05:29 +0000 (21:05 +0700)
committerSergey M․ <dstftw@gmail.com>
Tue, 25 Oct 2016 14:05:29 +0000 (21:05 +0700)
youtube_dl/extractor/vk.py

index df43ba86755eca4d25e5c670626550eb4bc88053..1990e7093acabb2dce11faebfddd220e8d88392b 100644 (file)
@@ -3,7 +3,6 @@ from __future__ import unicode_literals
 
 import collections
 import re
-import json
 import sys
 
 from .common import InfoExtractor
@@ -369,8 +368,18 @@ class VKIE(VKBaseIE):
                     opts_url = 'http:' + opts_url
                 return self.url_result(opts_url)
 
-        data_json = self._search_regex(r'var\s+vars\s*=\s*({.+?});', info_page, 'vars')
-        data = json.loads(data_json)
+        # vars does not look to be served anymore since 24.10.2016
+        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'])