projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
12ea5c7
)
[beeg] Fix extraction (closes #14275)
author
Giuseppe Fabiano
<gfabiano40@gmail.com>
Wed, 20 Sep 2017 21:05:33 +0000
(23:05 +0200)
committer
Sergey M
<dstftw@gmail.com>
Wed, 20 Sep 2017 21:05:33 +0000
(
04:05
+0700)
youtube_dl/extractor/beeg.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/beeg.py
b/youtube_dl/extractor/beeg.py
index d5c5822f2b2fdfef339353e71b160851fca76e68..bbeae4bacbe164e42e007573d987105c104b6752 100644
(file)
--- a/
youtube_dl/extractor/beeg.py
+++ b/
youtube_dl/extractor/beeg.py
@@
-9,6
+9,7
@@
from ..compat import (
from ..utils import (
int_or_none,
parse_iso8601,
from ..utils import (
int_or_none,
parse_iso8601,
+ urljoin,
)
)
@@
-36,9
+37,11
@@
class BeegIE(InfoExtractor):
webpage = self._download_webpage(url, video_id)
cpl_url = self._search_regex(
webpage = self._download_webpage(url, video_id)
cpl_url = self._search_regex(
- r'<script[^>]+src=(["\'])(?P<url>(?:
https?:)?//static\.beeg\.com
/cpl/\d+\.js.*?)\1',
+ r'<script[^>]+src=(["\'])(?P<url>(?:
/static|(?:https?:)?//static\.beeg\.com)
/cpl/\d+\.js.*?)\1',
webpage, 'cpl', default=None, group='url')
webpage, 'cpl', default=None, group='url')
+ cpl_url = urljoin(url, cpl_url)
+
beeg_version, beeg_salt = [None] * 2
if cpl_url:
beeg_version, beeg_salt = [None] * 2
if cpl_url:
@@
-54,7
+57,7
@@
class BeegIE(InfoExtractor):
r'beeg_salt\s*=\s*(["\'])(?P<beeg_salt>.+?)\1', cpl, 'beeg salt',
default=None, group='beeg_salt')
r'beeg_salt\s*=\s*(["\'])(?P<beeg_salt>.+?)\1', cpl, 'beeg salt',
default=None, group='beeg_salt')
- beeg_version = beeg_version or '2
000
'
+ beeg_version = beeg_version or '2
185
'
beeg_salt = beeg_salt or 'pmweAkq8lAYKdfWcFCUj0yoVgoPlinamH5UE1CB3H'
video = self._download_json(
beeg_salt = beeg_salt or 'pmweAkq8lAYKdfWcFCUj0yoVgoPlinamH5UE1CB3H'
video = self._download_json(