[vk] Better support for embeds
authorSergey M․ <dstftw@gmail.com>
Sun, 29 Jun 2014 13:07:59 +0000 (20:07 +0700)
committerSergey M․ <dstftw@gmail.com>
Sun, 29 Jun 2014 13:07:59 +0000 (20:07 +0700)
youtube_dl/extractor/vk.py

index 4afb059235ecaf9024ed8c2ad0721ff63cf4260a..6c7db7a6f192a5efb16b89b61c12dd8c1104ed05 100644 (file)
@@ -91,6 +91,17 @@ class VKIE(InfoExtractor):
             },
             'skip': 'Requires vk account credentials',
         },
+        {
+            'url': 'http://m.vk.com/video-43215063_169084319?list=125c627d1aa1cebb83&from=wall-43215063_2566540',
+            'md5': '0c45586baa71b7cb1d0784ee3f4e00a6',
+            'note': 'ivi.ru embed',
+            'info_dict': {
+                'id': '60690',
+                'ext': 'mp4',
+                'title': 'Книга Илая',
+                'duration': 6771,
+            },
+        },
     ]
 
     def _login(self):
@@ -134,6 +145,16 @@ class VKIE(InfoExtractor):
         if m_yt is not None:
             self.to_screen('Youtube video detected')
             return self.url_result(m_yt.group(1), 'Youtube')
+
+        m_opts = re.search(r'(?s)var\s+opts\s*=\s*({.*?});', info_page)
+        if m_opts:
+            m_opts_url = re.search(r"url\s*:\s*'([^']+)", m_opts.group(1))
+            if m_opts_url:
+                opts_url = m_opts_url.group(1)
+                if opts_url.startswith('//'):
+                    opts_url = 'http:' + opts_url
+                return self.url_result(opts_url)
+
         data_json = self._search_regex(r'var vars = ({.*?});', info_page, 'vars')
         data = json.loads(data_json)