jdormit/youtube-dl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[vk] Fix youtube extraction

Browse Source
This commit is contained in:
Sergey M․ 2015-07-08 20:34:50 +06:00
parent cf9cf7dd04
commit 4647845679
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
youtube_dl/extractor/vk.py
View File

@ -195,10 +195,11 @@ class VKIE(InfoExtractor):
if re.search(error_re, info_page): if re.search(error_re, info_page):
raise ExtractorError(error_msg % video_id, expected=True) raise ExtractorError(error_msg % video_id, expected=True)
m_yt = re.search(r'src="(http://www.youtube.com/.*?)"', info_page) youtube_url = self._search_regex(
if m_yt is not None: r'<iframe[^>]+src="((?:https?:)?//www.youtube.com/embed/[^"]+)"',
self.to_screen('Youtube video detected') info_page, 'youtube iframe', default=None)
return self.url_result(m_yt.group(1), 'Youtube') if youtube_url:
return self.url_result(youtube_url, 'Youtube', video_id)
m_rutube = re.search( m_rutube = re.search(
r'\ssrc="((?:https?:)?//rutube\.ru\\?/video\\?/embed(?:.*?))\\?"', info_page) r'\ssrc="((?:https?:)?//rutube\.ru\\?/video\\?/embed(?:.*?))\\?"', info_page)