|
|
@ -25,6 +25,7 @@ from ..utils import (
|
|
|
|
from .dailymotion import DailymotionIE
|
|
|
|
from .dailymotion import DailymotionIE
|
|
|
|
from .pladform import PladformIE
|
|
|
|
from .pladform import PladformIE
|
|
|
|
from .vimeo import VimeoIE
|
|
|
|
from .vimeo import VimeoIE
|
|
|
|
|
|
|
|
from .youtube import YoutubeIE
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
class VKBaseIE(InfoExtractor):
|
|
|
|
class VKBaseIE(InfoExtractor):
|
|
|
@ -345,11 +346,9 @@ class VKIE(VKBaseIE):
|
|
|
|
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)
|
|
|
|
|
|
|
|
|
|
|
|
youtube_url = self._search_regex(
|
|
|
|
youtube_url = YoutubeIE._extract_url(info_page)
|
|
|
|
r'<iframe[^>]+src="((?:https?:)?//www.youtube.com/embed/[^"]+)"',
|
|
|
|
|
|
|
|
info_page, 'youtube iframe', default=None)
|
|
|
|
|
|
|
|
if youtube_url:
|
|
|
|
if youtube_url:
|
|
|
|
return self.url_result(youtube_url, 'Youtube')
|
|
|
|
return self.url_result(youtube_url, ie=YoutubeIE.ie_key())
|
|
|
|
|
|
|
|
|
|
|
|
vimeo_url = VimeoIE._extract_url(url, info_page)
|
|
|
|
vimeo_url = VimeoIE._extract_url(url, info_page)
|
|
|
|
if vimeo_url is not None:
|
|
|
|
if vimeo_url is not None:
|
|
|
|