projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[odnoklassniki] Support extraction from metadata URL (Closes #5813)
[youtube-dl]
/
youtube_dl
/
extractor
/
crunchyroll.py
diff --git
a/youtube_dl/extractor/crunchyroll.py
b/youtube_dl/extractor/crunchyroll.py
index f1da7d09bc934af86f08aa45f8a1a3de32fa4673..1c77df47ef346173fc11a58396c98768e5afc986 100644
(file)
--- a/
youtube_dl/extractor/crunchyroll.py
+++ b/
youtube_dl/extractor/crunchyroll.py
@@
-23,12
+23,12
@@
from ..utils import (
)
from ..aes import (
aes_cbc_decrypt,
)
from ..aes import (
aes_cbc_decrypt,
- inc,
)
class CrunchyrollIE(InfoExtractor):
_VALID_URL = r'https?://(?:(?P<prefix>www|m)\.)?(?P<url>crunchyroll\.(?:com|fr)/(?:[^/]*/[^/?&]*?|media/\?id=)(?P<video_id>[0-9]+))(?:[/?&]|$)'
)
class CrunchyrollIE(InfoExtractor):
_VALID_URL = r'https?://(?:(?P<prefix>www|m)\.)?(?P<url>crunchyroll\.(?:com|fr)/(?:[^/]*/[^/?&]*?|media/\?id=)(?P<video_id>[0-9]+))(?:[/?&]|$)'
+ _NETRC_MACHINE = 'crunchyroll'
_TESTS = [{
'url': 'http://www.crunchyroll.com/wanna-be-the-strongest-in-the-world/episode-1-an-idol-wrestler-is-born-645513',
'info_dict': {
_TESTS = [{
'url': 'http://www.crunchyroll.com/wanna-be-the-strongest-in-the-world/episode-1-an-idol-wrestler-is-born-645513',
'info_dict': {
@@
-101,13
+101,6
@@
class CrunchyrollIE(InfoExtractor):
key = obfuscate_key(id)
key = obfuscate_key(id)
- class Counter:
- __value = iv
-
- def next_value(self):
- temp = self.__value
- self.__value = inc(self.__value)
- return temp
decrypted_data = intlist_to_bytes(aes_cbc_decrypt(data, key, iv))
return zlib.decompress(decrypted_data)
decrypted_data = intlist_to_bytes(aes_cbc_decrypt(data, key, iv))
return zlib.decompress(decrypted_data)
@@
-270,8
+263,8
@@
Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text
streamdata = self._download_xml(
streamdata_req, video_id,
note='Downloading media info for %s' % video_format)
streamdata = self._download_xml(
streamdata_req, video_id,
note='Downloading media info for %s' % video_format)
- video_url = streamdata.find('./
/
host').text
- video_play_path = streamdata.find('./
/
file').text
+ video_url = streamdata.find('./host').text
+ video_play_path = streamdata.find('./file').text
formats.append({
'url': video_url,
'play_path': video_play_path,
formats.append({
'url': video_url,
'play_path': video_play_path,