Initiate new release.

[youtubedl] / youtube_dl / extractor / vk.py

diff --git a/youtube_dl/extractor/vk.py b/youtube_dl/extractor/vk.py
index ca6b0d5b3369c53b7e06715ea5a56fd338d71e41..7dea8c59d2a30673b93ae181bab128b8ef0a8b58 100644 (file)
--- a/youtube_dl/extractor/vk.py
+++ b/youtube_dl/extractor/vk.py
@@ -5,14 +5,17 @@ import re
 import json
 
 from .common import InfoExtractor
 import json
 
 from .common import InfoExtractor

+from ..compat import (
+    compat_str,
+    compat_urllib_parse,
+    compat_urllib_request,
+)

 from ..utils import (
     ExtractorError,
 from ..utils import (
     ExtractorError,

-    compat_urllib_request,
-    compat_urllib_parse,
-    compat_str,
+    orderedSet,

     unescapeHTML,
     unified_strdate,
     unescapeHTML,
     unified_strdate,

-    orderedSet)
+)

 
 
 class VKIE(InfoExtractor):
 
 
 class VKIE(InfoExtractor):


@@ -161,6 +164,14 @@ class VKIE(InfoExtractor):
             self.to_screen('Youtube video detected')
             return self.url_result(m_yt.group(1), 'Youtube')
 
             self.to_screen('Youtube video detected')
             return self.url_result(m_yt.group(1), 'Youtube')
 

+        m_rutube = re.search(
+            r'\ssrc="((?:https?:)?//rutube\.ru\\?/video\\?/embed(?:.*?))\\?"', info_page)
+        if m_rutube is not None:
+            self.to_screen('rutube video detected')
+            rutube_url = self._proto_relative_url(
+                m_rutube.group(1).replace('\\', ''))
+            return self.url_result(rutube_url)
+

         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))
         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))


@@ -206,6 +217,9 @@ class VKUserVideosIE(InfoExtractor):
     _TEMPLATE_URL = 'https://vk.com/videos'
     _TEST = {
         'url': 'http://vk.com/videos205387401',
     _TEMPLATE_URL = 'https://vk.com/videos'
     _TEST = {
         'url': 'http://vk.com/videos205387401',

+        'info_dict': {
+            'id': '205387401',
+        },

         'playlist_mincount': 4,
     }
 
         'playlist_mincount': 4,
     }