R-yan/l1ving_youtube-dl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Change token extraction to _form_hidden_inputs

Browse Source
This commit is contained in:
bato3 2018-07-30 11:44:18 +02:00
parent c447fddb17
commit b50478675d
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
youtube_dl/extractor/adn.py
View File

@ -54,30 +54,26 @@ class ADNIE(InfoExtractor):
self._LOGIN_URL, None, 'Downloading login page') self._LOGIN_URL, None, 'Downloading login page')
def is_logged(webpage): def is_logged(webpage):
return 'task=user.logout' in webpage return 'task=user.logout' in webpage or 'view=logout' in webpage
# Already logged in # Already logged in
if is_logged(login_page): if is_logged(login_page):
return return
_token = self._search_regex( form_data = self._form_hidden_inputs('login-form', login_page)
r'<input[^>]+type=["\']hidden["\'][^>]+name=["\'](?P<token>[\da-f]+)["\'][^>]+value=["\']1["\']', if not form_data.get('return'):
login_page,
'action token',
group='token'
)
if not _token:
raise ExtractorError('%s Can\'t extract login token' % self.IE_NAME) raise ExtractorError('%s Can\'t extract login token' % self.IE_NAME)
form_data.update({
'username': username,
'password': password,
# base64 LOGIN URL
# 'return': 'aHR0cHM6Ly9hbmltZWRpZ2l0YWxuZXR3b3JrLmZyL2Nvbm5leGlvbg==',
})
response = self._download_webpage( response = self._download_webpage(
self._LOGIN_URL + '?task=user.login', self._LOGIN_URL + '?task=user.login',
None, 'Logging in', 'Wrong login info', None, 'Logging in', 'Wrong login info',
data=urlencode_postdata({ data=urlencode_postdata(form_data))
'username': username,
'password': password,
'return': 'aHR0cHM6Ly9hbmltZWRpZ2l0YWxuZXR3b3JrLmZyL2Nvbm5leGlvbg==', # base64 LOGIN URL
_token: '1',
}))
# Successful login # Successful login
if is_logged(response): if is_logged(response):