Madeorsk/youtube-dl
1
0
Fork 0
mirror of https://codeberg.org/polarisfm/youtube-dl synced 2025-02-26 05:57:53 +01:00
Code Issues Releases Wiki Activity

after 2nd review

Browse Source
This commit is contained in:
bato3 2018-07-30 17:44:45 +02:00
parent b50478675d
commit 7475f05442
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
youtube_dl/extractor/adn.py
View File

@ -61,13 +61,9 @@ class ADNIE(InfoExtractor):
return return
form_data = self._form_hidden_inputs('login-form', login_page) form_data = self._form_hidden_inputs('login-form', login_page)
if not form_data.get('return'):
raise ExtractorError('%s Can\'t extract login token' % self.IE_NAME)
form_data.update({ form_data.update({
'username': username, 'username': username,
'password': password, 'password': password,
# base64 LOGIN URL
# 'return': 'aHR0cHM6Ly9hbmltZWRpZ2l0YWxuZXR3b3JrLmZyL2Nvbm5leGlvbg==',
}) })
response = self._download_webpage( response = self._download_webpage(
@ -179,14 +175,15 @@ class ADNIE(InfoExtractor):
urljoin(self._BASE_URL, links_url), video_id, headers={ urljoin(self._BASE_URL, links_url), video_id, headers={
'Authorization': 'Bearer ' + authorization, 'Authorization': 'Bearer ' + authorization,
}) })
if links_data.get('status'): error = links_data.get('error')
if error:
if links_data.get('code') == 1: if links_data.get('code') == 1:
self.raise_login_required(links_data.get('error')) self.raise_login_required(error)
if links_data.get('code') == 0: if links_data.get('code') == 0:
if links_data.get('error').find('Pour des raisons l') != -1: if 'Pour des raisons l' in error:
self.raise_geo_restricted(links_data.get('error')) self.raise_geo_restricted(error)
else: else:
raise ExtractorError('%s said: %s' % (self.IE_NAME, links_data.get('error')), expected=True) raise ExtractorError('%s said: %s' % (self.IE_NAME, error), expected=True)
links = links_data.get('links') or {} links = links_data.get('links') or {}
metas = metas or links_data.get('meta') or {} metas = metas or links_data.get('meta') or {}
sub_path = (sub_path or links_data.get('subtitles')) + '&token=' + token sub_path = (sub_path or links_data.get('subtitles')) + '&token=' + token