Browse Source
[eagleplatform] Improve embed detection and extract in separate routine (Closes #9926)
master
Sergey M․
8 years ago
No known key found for this signature in database
GPG Key ID: 2C393E0F18A9236D
2 changed files with
12 additions and
4 deletions
-
youtube_dl/extractor/eagleplatform.py
-
youtube_dl/extractor/generic.py
|
|
@ -50,6 +50,14 @@ class EaglePlatformIE(InfoExtractor): |
|
|
|
'skip': 'Georestricted', |
|
|
|
}] |
|
|
|
|
|
|
|
@staticmethod |
|
|
|
def _extract_url(webpage): |
|
|
|
mobj = re.search( |
|
|
|
r'<iframe[^>]+src=(["\'])(?P<url>(?:https?:)?//.+?\.media\.eagleplatform\.com/index/player\?.+?)\1', |
|
|
|
webpage) |
|
|
|
if mobj is not None: |
|
|
|
return mobj.group('url') |
|
|
|
|
|
|
|
@staticmethod |
|
|
|
def _handle_error(response): |
|
|
|
status = int_or_none(response.get('status', 200)) |
|
|
|
|
|
@ -65,6 +65,7 @@ from .threeqsdn import ThreeQSDNIE |
|
|
|
from .theplatform import ThePlatformIE |
|
|
|
from .vessel import VesselIE |
|
|
|
from .kaltura import KalturaIE |
|
|
|
from .eagleplatform import EaglePlatformIE |
|
|
|
|
|
|
|
|
|
|
|
class GenericIE(InfoExtractor): |
|
|
@ -1932,10 +1933,9 @@ class GenericIE(InfoExtractor): |
|
|
|
return self.url_result(smuggle_url(kaltura_url, {'source_url': url}), KalturaIE.ie_key()) |
|
|
|
|
|
|
|
# Look for Eagle.Platform embeds |
|
|
|
mobj = re.search( |
|
|
|
r'<iframe[^>]+src="(?P<url>https?://.+?\.media\.eagleplatform\.com/index/player\?.+?)"', webpage) |
|
|
|
if mobj is not None: |
|
|
|
return self.url_result(mobj.group('url'), 'EaglePlatform') |
|
|
|
eagleplatform_url = EaglePlatformIE._extract_url(webpage) |
|
|
|
if eagleplatform_url: |
|
|
|
return self.url_result(eagleplatform_url, EaglePlatformIE.ie_key()) |
|
|
|
|
|
|
|
# Look for ClipYou (uses Eagle.Platform) embeds |
|
|
|
mobj = re.search( |
|
|
|