projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c64c03b
)
[twitch] Use better naming and simplify (closes #11974)
author
Sergey M․
<dstftw@gmail.com>
Sat, 4 Mar 2017 19:06:33 +0000
(
02:06
+0700)
committer
Sergey M․
<dstftw@gmail.com>
Sat, 4 Mar 2017 19:06:33 +0000
(
02:06
+0700)
youtube_dl/extractor/twitch.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/twitch.py
b/youtube_dl/extractor/twitch.py
index 096a2ac9d5908b54f1d9c5daf1417b88999c744f..ed36336bd9eeacac649a17fb8acccc73e3029693 100644
(file)
--- a/
youtube_dl/extractor/twitch.py
+++ b/
youtube_dl/extractor/twitch.py
@@
-64,7
+64,7
@@
class TwitchBaseIE(InfoExtractor):
raise ExtractorError(
'Unable to login. Twitch said: %s' % message, expected=True)
raise ExtractorError(
'Unable to login. Twitch said: %s' % message, expected=True)
- def
post_login_form
(page, urlh, note, data):
+ def
login_step
(page, urlh, note, data):
form = self._hidden_inputs(page)
form.update(data)
form = self._hidden_inputs(page)
form.update(data)
@@
-88,11
+88,10
@@
class TwitchBaseIE(InfoExtractor):
fail(response['message'])
raise
fail(response['message'])
raise
- if response.get('redirect'):
- redirect_url = urljoin(post_url, response['redirect'])
- return self._download_webpage_handle(
- redirect_url, None, 'Downloading login redirect page',
- headers=headers)
+ redirect_url = urljoin(post_url, response['redirect'])
+ return self._download_webpage_handle(
+ redirect_url, None, 'Downloading login redirect page',
+ headers=headers)
login_page, handle = self._download_webpage_handle(
self._LOGIN_URL, None, 'Downloading login page')
login_page, handle = self._download_webpage_handle(
self._LOGIN_URL, None, 'Downloading login page')
@@
-101,25
+100,19
@@
class TwitchBaseIE(InfoExtractor):
if 'blacklist_message' in login_page:
fail(clean_html(login_page))
if 'blacklist_message' in login_page:
fail(clean_html(login_page))
- login_data = {
- 'username': username,
- 'password': password,
- }
- redirect_res = post_login_form(
- login_page, handle, 'Logging in as %s' % username, login_data)
-
- if not redirect_res:
- return
- redirect_page, handle = redirect_res
+ redirect_page, handle = login_step(
+ login_page, handle, 'Logging in as %s' % username, {
+ 'username': username,
+ 'password': password,
+ })
if re.search(r'(?i)<form[^>]+id="two-factor-submit"', redirect_page) is not None:
# TODO: Add mechanism to request an SMS or phone call
tfa_token = self._get_tfa_info('two-factor authentication token')
if re.search(r'(?i)<form[^>]+id="two-factor-submit"', redirect_page) is not None:
# TODO: Add mechanism to request an SMS or phone call
tfa_token = self._get_tfa_info('two-factor authentication token')
-
tfa_data =
{
+
login_step(redirect_page, handle, 'Submitting TFA token',
{
'authy_token': tfa_token,
'remember_2fa': 'true',
'authy_token': tfa_token,
'remember_2fa': 'true',
- }
- post_login_form(redirect_page, handle, 'Submitting TFA token', tfa_data)
+ })
def _prefer_source(self, formats):
try:
def _prefer_source(self, formats):
try: