From: Sergey M․ Date: Mon, 15 Jun 2015 14:46:10 +0000 (+0600) Subject: [vk] Fix extraction (Closes #5987) X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=054932f4035d606946f0c054c02cf87496b753f6;p=youtube-dl [vk] Fix extraction (Closes #5987) --- diff --git a/youtube_dl/extractor/vk.py b/youtube_dl/extractor/vk.py index d0e772108..6aeba109d 100644 --- a/youtube_dl/extractor/vk.py +++ b/youtube_dl/extractor/vk.py @@ -175,16 +175,16 @@ class VKIE(InfoExtractor): m_rutube.group(1).replace('\\', '')) return self.url_result(rutube_url) - m_opts = re.search(r'(?s)var\s+opts\s*=\s*({.*?});', info_page) + 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_url = re.search(r"url\s*:\s*'((?!/\b)[^']+)", 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 = self._search_regex(r'var\s+vars\s*=\s*({.+?});', info_page, 'vars') data = json.loads(data_json) # Extract upload date