projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[beeg] Fix extraction (closes #14275)
[youtube-dl]
/
youtube_dl
/
extractor
/
beeg.py
diff --git
a/youtube_dl/extractor/beeg.py
b/youtube_dl/extractor/beeg.py
index b0b7914d89777fcba136a12562f771bf4f2af4d6..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,
)
)
@@
-16,7
+17,7
@@
class BeegIE(InfoExtractor):
_VALID_URL = r'https?://(?:www\.)?beeg\.com/(?P<id>\d+)'
_TEST = {
'url': 'http://beeg.com/5416503',
_VALID_URL = r'https?://(?:www\.)?beeg\.com/(?P<id>\d+)'
_TEST = {
'url': 'http://beeg.com/5416503',
- 'md5': '
46c384def73b33dbc581262e5ee67cef
',
+ 'md5': '
a1a1b1a8bc70a89e49ccfd113aed0820
',
'info_dict': {
'id': '5416503',
'ext': 'mp4',
'info_dict': {
'id': '5416503',
'ext': 'mp4',
@@
-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(