MarcoBuster/youtube-dl
1
1
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl synced 2024-11-27 17:26:51 +01:00
Code Issues Releases Wiki Activity

[ivi] fallback to old extraction method for unknown error codes

Browse Source
This commit is contained in:
Remita Amine 2019-11-19 20:16:31 +01:00
parent f9c4a45210
commit 76d9eca43d
1 changed files with 45 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
youtube_dl/extractor/ivi.py
View File

@ -93,29 +93,36 @@ class IviIE(InfoExtractor):
] ]
}).encode() }).encode()
for site in (353, 183):
content_data = data % site
if site == 353:
try: try:
from Crypto.Cipher import Blowfish from Cryptodome.Cipher import Blowfish
from Crypto.Hash import CMAC from Cryptodome.Hash import CMAC
pycryptodomex_found = True
except ImportError:
pycryptodomex_found = False
continue
timestamp = self._download_json( timestamp = (self._download_json(
self._LIGHT_URL, video_id, self._LIGHT_URL, video_id,
'Downloading timestamp JSON', data=json.dumps({ 'Downloading timestamp JSON', data=json.dumps({
'method': 'da.timestamp.get', 'method': 'da.timestamp.get',
'params': [] 'params': []
}).encode())['result'] }).encode(), fatal=False) or {}).get('result')
if not timestamp:
continue
data = data % 353
query = { query = {
'ts': timestamp, 'ts': timestamp,
'sign': CMAC.new(self._LIGHT_KEY, timestamp.encode() + data, Blowfish).hexdigest(), 'sign': CMAC.new(self._LIGHT_KEY, timestamp.encode() + content_data, Blowfish).hexdigest(),
} }
except ImportError: else:
data = data % 183
query = {} query = {}
video_json = self._download_json( video_json = self._download_json(
self._LIGHT_URL, video_id, self._LIGHT_URL, video_id,
'Downloading video JSON', data=data, query=query) 'Downloading video JSON', data=content_data, query=query)
error = video_json.get('error') error = video_json.get('error')
if error: if error:
@ -126,13 +133,17 @@ class IviIE(InfoExtractor):
self.raise_geo_restricted(message, self._GEO_COUNTRIES) self.raise_geo_restricted(message, self._GEO_COUNTRIES)
elif origin == 'NoRedisValidData': elif origin == 'NoRedisValidData':
extractor_msg = 'Video %s does not exist' extractor_msg = 'Video %s does not exist'
elif message: elif site == 353:
if 'недоступен для просмотра на площадке s183' in message: continue
elif not pycryptodomex_found:
raise ExtractorError( raise ExtractorError(
'pycryptodome not found. Please install it.', 'pycryptodome not found. Please install it.',
expected=True) expected=True)
elif message:
extractor_msg += ': ' + message extractor_msg += ': ' + message
raise ExtractorError(extractor_msg % video_id, expected=True) raise ExtractorError(extractor_msg % video_id, expected=True)
else:
break
result = video_json['result'] result = video_json['result']
title = result['title'] title = result['title']