[nexx] Add support for shortcuts and relax domain id extraction
parent
af0f74288d
commit
694b61545c
|
@ -18,7 +18,13 @@ from ..utils import (
|
||||||
|
|
||||||
|
|
||||||
class NexxIE(InfoExtractor):
|
class NexxIE(InfoExtractor):
|
||||||
_VALID_URL = r'https?://api\.nexx(?:\.cloud|cdn\.com)/v3/(?P<domain_id>\d+)/videos/byid/(?P<id>\d+)'
|
_VALID_URL = r'''(?x)
|
||||||
|
(?:
|
||||||
|
https?://api\.nexx(?:\.cloud|cdn\.com)/v3/(?P<domain_id>\d+)/videos/byid/|
|
||||||
|
nexx:(?P<domain_id_s>\d+):
|
||||||
|
)
|
||||||
|
(?P<id>\d+)
|
||||||
|
'''
|
||||||
_TESTS = [{
|
_TESTS = [{
|
||||||
# movie
|
# movie
|
||||||
'url': 'https://api.nexx.cloud/v3/748/videos/byid/128907',
|
'url': 'https://api.nexx.cloud/v3/748/videos/byid/128907',
|
||||||
|
@ -62,8 +68,18 @@ class NexxIE(InfoExtractor):
|
||||||
}, {
|
}, {
|
||||||
'url': 'https://api.nexxcdn.com/v3/748/videos/byid/128907',
|
'url': 'https://api.nexxcdn.com/v3/748/videos/byid/128907',
|
||||||
'only_matching': True,
|
'only_matching': True,
|
||||||
|
}, {
|
||||||
|
'url': 'nexx:748:128907',
|
||||||
|
'only_matching': True,
|
||||||
}]
|
}]
|
||||||
|
|
||||||
|
@staticmethod
|
||||||
|
def _extract_domain_id(webpage):
|
||||||
|
mobj = re.search(
|
||||||
|
r'<script\b[^>]+\bsrc=["\'](?:https?:)?//require\.nexx(?:\.cloud|cdn\.com)/(?P<id>\d+)',
|
||||||
|
webpage)
|
||||||
|
return mobj.group('id') if mobj else None
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def _extract_urls(webpage):
|
def _extract_urls(webpage):
|
||||||
# Reference:
|
# Reference:
|
||||||
|
@ -72,11 +88,8 @@ class NexxIE(InfoExtractor):
|
||||||
entries = []
|
entries = []
|
||||||
|
|
||||||
# JavaScript Integration
|
# JavaScript Integration
|
||||||
mobj = re.search(
|
domain_id = NexxIE._extract_domain_id(webpage)
|
||||||
r'<script\b[^>]+\bsrc=["\']https?://require\.nexx(?:\.cloud|cdn\.com)/(?P<id>\d+)',
|
if domain_id:
|
||||||
webpage)
|
|
||||||
if mobj:
|
|
||||||
domain_id = mobj.group('id')
|
|
||||||
for video_id in re.findall(
|
for video_id in re.findall(
|
||||||
r'(?is)onPLAYReady.+?_play\.init\s*\(.+?\s*,\s*["\']?(\d+)',
|
r'(?is)onPLAYReady.+?_play\.init\s*\(.+?\s*,\s*["\']?(\d+)',
|
||||||
webpage):
|
webpage):
|
||||||
|
@ -112,7 +125,8 @@ class NexxIE(InfoExtractor):
|
||||||
|
|
||||||
def _real_extract(self, url):
|
def _real_extract(self, url):
|
||||||
mobj = re.match(self._VALID_URL, url)
|
mobj = re.match(self._VALID_URL, url)
|
||||||
domain_id, video_id = mobj.group('domain_id', 'id')
|
domain_id = mobj.group('domain_id') or mobj.group('domain_id_s')
|
||||||
|
video_id = mobj.group('id')
|
||||||
|
|
||||||
# Reverse engineered from JS code (see getDeviceID function)
|
# Reverse engineered from JS code (see getDeviceID function)
|
||||||
device_id = '%d:%d:%d%d' % (
|
device_id = '%d:%d:%d%d' % (
|
||||||
|
|
Loading…
Reference in New Issue