projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
48970d5
)
[nexx] Add support for Multi Player JS Setup(closes #23052)
author
Remita Amine
<remitamine@gmail.com>
Wed, 13 Nov 2019 18:09:32 +0000
(19:09 +0100)
committer
Remita Amine
<remitamine@gmail.com>
Wed, 13 Nov 2019 18:09:32 +0000
(19:09 +0100)
youtube_dl/extractor/nexx.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/nexx.py
b/youtube_dl/extractor/nexx.py
index f9aad83c405a9268596880f7b5d9e3cd63545731..586c1b7eb0197a3973edb3096c9457716f2bb982 100644
(file)
--- a/
youtube_dl/extractor/nexx.py
+++ b/
youtube_dl/extractor/nexx.py
@@
-108,7
+108,7
@@
class NexxIE(InfoExtractor):
@staticmethod
def _extract_domain_id(webpage):
mobj = re.search(
@staticmethod
def _extract_domain_id(webpage):
mobj = re.search(
- r'<script\b[^>]+\bsrc=["\'](?:https?:)?//
require\.nexx(?:\.cloud|cdn\.com)/
(?P<id>\d+)',
+ r'<script\b[^>]+\bsrc=["\'](?:https?:)?//
(?:require|arc)\.nexx(?:\.cloud|cdn\.com)/(?:sdk/)?
(?P<id>\d+)',
webpage)
return mobj.group('id') if mobj else None
webpage)
return mobj.group('id') if mobj else None
@@
-123,7
+123,7
@@
class NexxIE(InfoExtractor):
domain_id = NexxIE._extract_domain_id(webpage)
if domain_id:
for video_id in re.findall(
domain_id = NexxIE._extract_domain_id(webpage)
if domain_id:
for video_id in re.findall(
- r'(?is)onPLAYReady.+?_play\.
init
\s*\(.+?\s*,\s*["\']?(\d+)',
+ r'(?is)onPLAYReady.+?_play\.
(?:init|(?:control\.)?addPlayer)
\s*\(.+?\s*,\s*["\']?(\d+)',
webpage):
entries.append(
'https://api.nexx.cloud/v3/%s/videos/byid/%s'
webpage):
entries.append(
'https://api.nexx.cloud/v3/%s/videos/byid/%s'
@@
-410,8
+410,8
@@
class NexxIE(InfoExtractor):
class NexxEmbedIE(InfoExtractor):
class NexxEmbedIE(InfoExtractor):
- _VALID_URL = r'https?://embed\.nexx(?:\.cloud|cdn\.com)/\d+/(?P<id>[^/?#&]+)'
- _TEST
=
{
+ _VALID_URL = r'https?://embed\.nexx(?:\.cloud|cdn\.com)/\d+/(?
:video/)?(?
P<id>[^/?#&]+)'
+ _TEST
S = [
{
'url': 'http://embed.nexx.cloud/748/KC1614647Z27Y7T?autoplay=1',
'md5': '16746bfc28c42049492385c989b26c4a',
'info_dict': {
'url': 'http://embed.nexx.cloud/748/KC1614647Z27Y7T?autoplay=1',
'md5': '16746bfc28c42049492385c989b26c4a',
'info_dict': {
@@
-420,7
+420,6
@@
class NexxEmbedIE(InfoExtractor):
'title': 'Nervenkitzel Achterbahn',
'alt_title': 'Karussellbauer in Deutschland',
'description': 'md5:ffe7b1cc59a01f585e0569949aef73cc',
'title': 'Nervenkitzel Achterbahn',
'alt_title': 'Karussellbauer in Deutschland',
'description': 'md5:ffe7b1cc59a01f585e0569949aef73cc',
- 'release_year': 2005,
'creator': 'SPIEGEL TV',
'thumbnail': r're:^https?://.*\.jpg$',
'duration': 2761,
'creator': 'SPIEGEL TV',
'thumbnail': r're:^https?://.*\.jpg$',
'duration': 2761,
@@
-431,7
+430,10
@@
class NexxEmbedIE(InfoExtractor):
'format': 'bestvideo',
'skip_download': True,
},
'format': 'bestvideo',
'skip_download': True,
},
- }
+ }, {
+ 'url': 'https://embed.nexx.cloud/11888/video/DSRTO7UVOX06S7',
+ 'only_matching': True,
+ }]
@staticmethod
def _extract_urls(webpage):
@staticmethod
def _extract_urls(webpage):