projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ea331f4
)
[beeg] Fix extraction (closes #11069)
author
Sergey M․
<dstftw@gmail.com>
Sat, 29 Oct 2016 22:27:50 +0000
(
05:27
+0700)
committer
Sergey M․
<dstftw@gmail.com>
Sat, 29 Oct 2016 22:27:50 +0000
(
05:27
+0700)
youtube_dl/extractor/beeg.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/beeg.py
b/youtube_dl/extractor/beeg.py
index 956c7680e2ecc46a1df493947ed0be7b973d81b8..b0b7914d89777fcba136a12562f771bf4f2af4d6 100644
(file)
--- a/
youtube_dl/extractor/beeg.py
+++ b/
youtube_dl/extractor/beeg.py
@@
-46,19
+46,19
@@
class BeegIE(InfoExtractor):
self._proto_relative_url(cpl_url), video_id,
'Downloading cpl JS', fatal=False)
if cpl:
self._proto_relative_url(cpl_url), video_id,
'Downloading cpl JS', fatal=False)
if cpl:
- beeg_version = self._search_regex(
- r'beeg_version\s*=\s*(
\d
+)', cpl,
- 'beeg version', default=None) or self._search_regex(
+ beeg_version =
int_or_none(
self._search_regex(
+ r'beeg_version\s*=\s*(
[^\b]
+)', cpl,
+ 'beeg version', default=None)
)
or self._search_regex(
r'/(\d+)\.js', cpl_url, 'beeg version', default=None)
beeg_salt = self._search_regex(
r'/(\d+)\.js', cpl_url, 'beeg version', default=None)
beeg_salt = self._search_regex(
- r'beeg_salt\s*=\s*(["\'])(?P<beeg_salt>.+?)\1', cpl, 'beeg
beeg_
salt',
+ r'beeg_salt\s*=\s*(["\'])(?P<beeg_salt>.+?)\1', cpl, 'beeg salt',
default=None, group='beeg_salt')
default=None, group='beeg_salt')
- beeg_version = beeg_version or '
175
0'
- beeg_salt = beeg_salt or '
MIDtGaw96f0N1kMMAM1DE46EC9pmFr
'
+ beeg_version = beeg_version or '
200
0'
+ beeg_salt = beeg_salt or '
pmweAkq8lAYKdfWcFCUj0yoVgoPlinamH5UE1CB3H
'
video = self._download_json(
video = self._download_json(
- 'http://api.beeg.com/api/v6/%s/video/%s' % (beeg_version, video_id),
+ 'http
s
://api.beeg.com/api/v6/%s/video/%s' % (beeg_version, video_id),
video_id)
def split(o, e):
video_id)
def split(o, e):