projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a71c1d1
)
[cloudflarestream] import embed URL extraction
author
Remita Amine
<remitamine@gmail.com>
Wed, 8 Jan 2020 22:07:41 +0000
(23:07 +0100)
committer
Remita Amine
<remitamine@gmail.com>
Wed, 8 Jan 2020 22:07:41 +0000
(23:07 +0100)
youtube_dl/extractor/cloudflarestream.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/cloudflarestream.py
b/youtube_dl/extractor/cloudflarestream.py
index 9026c7c907c590ee936bf03319b9e2adb67e13a1..2fdcfbb3af1fbffb9e66abff56b86e31762ad449 100644
(file)
--- a/
youtube_dl/extractor/cloudflarestream.py
+++ b/
youtube_dl/extractor/cloudflarestream.py
@@
-9,14
+9,16
@@
from .common import InfoExtractor
class CloudflareStreamIE(InfoExtractor):
_DOMAIN_RE = r'(?:cloudflarestream\.com|(?:videodelivery|bytehighway)\.net)'
class CloudflareStreamIE(InfoExtractor):
_DOMAIN_RE = r'(?:cloudflarestream\.com|(?:videodelivery|bytehighway)\.net)'
+ _EMBED_RE = r'embed\.%s/embed/[^/]+\.js\?.*?\bvideo=' % _DOMAIN_RE
+ _ID_RE = r'[\da-f]{32}|[\w-]+\.[\w-]+\.[\w-]+'
_VALID_URL = r'''(?x)
https?://
(?:
(?:watch\.)?%s/|
_VALID_URL = r'''(?x)
https?://
(?:
(?:watch\.)?%s/|
- embed\.%s/embed/[^/]+\.js\?.*?\bvideo=
+ %s
)
)
- (?P<id>
[\da-f]{32}|[\w-]+\.[\w-]+\.[\w-]+
)
- ''' % (_DOMAIN_RE, _
DOMAIN
_RE)
+ (?P<id>
%s
)
+ ''' % (_DOMAIN_RE, _
EMBED_RE, _ID
_RE)
_TESTS = [{
'url': 'https://embed.cloudflarestream.com/embed/we4g.fla9.latest.js?video=31c9291ab41fac05471db4e73aa11717',
'info_dict': {
_TESTS = [{
'url': 'https://embed.cloudflarestream.com/embed/we4g.fla9.latest.js?video=31c9291ab41fac05471db4e73aa11717',
'info_dict': {
@@
-43,7
+45,7
@@
class CloudflareStreamIE(InfoExtractor):
return [
mobj.group('url')
for mobj in re.finditer(
return [
mobj.group('url')
for mobj in re.finditer(
- r'<script[^>]+\bsrc=(["\'])(?P<url>(?:https?:)?//
embed\.(?:cloudflarestream\.com|videodelivery\.net)/embed/[^/]+\.js\?.*?\bvideo=[\da-f]+?.*?)\1'
,
+ r'<script[^>]+\bsrc=(["\'])(?P<url>(?:https?:)?//
%s(?:%s).*?)\1' % (CloudflareStreamIE._EMBED_RE, CloudflareStreamIE._ID_RE)
,
webpage)]
def _real_extract(self, url):
webpage)]
def _real_extract(self, url):