|
@ -118,6 +118,7 @@ from .foxnews import FoxNewsIE |
|
|
from .viqeo import ViqeoIE |
|
|
from .viqeo import ViqeoIE |
|
|
from .expressen import ExpressenIE |
|
|
from .expressen import ExpressenIE |
|
|
from .zype import ZypeIE |
|
|
from .zype import ZypeIE |
|
|
|
|
|
from .odnoklassniki import OdnoklassnikiIE |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
class GenericIE(InfoExtractor): |
|
|
class GenericIE(InfoExtractor): |
|
@ -2627,9 +2628,9 @@ class GenericIE(InfoExtractor): |
|
|
return self.url_result(mobj.group('url'), 'VK') |
|
|
return self.url_result(mobj.group('url'), 'VK') |
|
|
|
|
|
|
|
|
# Look for embedded Odnoklassniki player |
|
|
# Look for embedded Odnoklassniki player |
|
|
mobj = re.search(r'<iframe[^>]+?src=(["\'])(?P<url>https?://(?:odnoklassniki|ok)\.ru/videoembed/.+?)\1', webpage) |
|
|
|
|
|
if mobj is not None: |
|
|
|
|
|
return self.url_result(mobj.group('url'), 'Odnoklassniki') |
|
|
|
|
|
|
|
|
odnoklassniki_url = OdnoklassnikiIE._extract_url(webpage) |
|
|
|
|
|
if odnoklassniki_url: |
|
|
|
|
|
return self.url_result(odnoklassniki_url, OdnoklassnikiIE.ie_key()) |
|
|
|
|
|
|
|
|
# Look for embedded ivi player |
|
|
# Look for embedded ivi player |
|
|
mobj = re.search(r'<embed[^>]+?src=(["\'])(?P<url>https?://(?:www\.)?ivi\.ru/video/player.+?)\1', webpage) |
|
|
mobj = re.search(r'<embed[^>]+?src=(["\'])(?P<url>https?://(?:www\.)?ivi\.ru/video/player.+?)\1', webpage) |
|
|