projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
cb6cd76
)
[adn] fix subtitle extraction(#12724)
author
Remita Amine
<remitamine@gmail.com>
Tue, 16 Apr 2019 12:04:13 +0000
(13:04 +0100)
committer
Remita Amine
<remitamine@gmail.com>
Tue, 16 Apr 2019 12:04:13 +0000
(13:04 +0100)
youtube_dl/extractor/adn.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/adn.py
b/youtube_dl/extractor/adn.py
index 1e04a55a6a47793504e368669a21d967b5a8980c..923c351e4c5988d36001f6599268be49e0fcab46 100644
(file)
--- a/
youtube_dl/extractor/adn.py
+++ b/
youtube_dl/extractor/adn.py
@@
-60,14
+60,19
@@
class ADNIE(InfoExtractor):
enc_subtitles = self._download_webpage(
urljoin(self._BASE_URL, sub_path),
enc_subtitles = self._download_webpage(
urljoin(self._BASE_URL, sub_path),
- video_id, 'Downloading subtitles data', fatal=False)
+ video_id, 'Downloading subtitles location', fatal=False) or '{}'
+ subtitle_location = (self._parse_json(enc_subtitles, video_id, fatal=False) or {}).get('location')
+ if subtitle_location:
+ enc_subtitles = self._download_webpage(
+ urljoin(self._BASE_URL, subtitle_location),
+ video_id, 'Downloading subtitles data', fatal=False)
if not enc_subtitles:
return None
# http://animedigitalnetwork.fr/components/com_vodvideo/videojs/adn-vjs.min.js
dec_subtitles = intlist_to_bytes(aes_cbc_decrypt(
bytes_to_intlist(compat_b64decode(enc_subtitles[24:])),
if not enc_subtitles:
return None
# http://animedigitalnetwork.fr/components/com_vodvideo/videojs/adn-vjs.min.js
dec_subtitles = intlist_to_bytes(aes_cbc_decrypt(
bytes_to_intlist(compat_b64decode(enc_subtitles[24:])),
- bytes_to_intlist(binascii.unhexlify(self._K + '
083db5aebd9353b4
')),
+ bytes_to_intlist(binascii.unhexlify(self._K + '
4421de0a5f0814ba
')),
bytes_to_intlist(compat_b64decode(enc_subtitles[:24]))
))
subtitles_json = self._parse_json(
bytes_to_intlist(compat_b64decode(enc_subtitles[:24]))
))
subtitles_json = self._parse_json(