projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
1d1d60f
)
[twitch] Fix authentication and error capture (closes #14090, closes #15264)
author
Sergey M․
<dstftw@gmail.com>
Tue, 16 Jan 2018 15:34:16 +0000
(22:34 +0700)
committer
Sergey M․
<dstftw@gmail.com>
Tue, 16 Jan 2018 15:34:16 +0000
(22:34 +0700)
youtube_dl/extractor/twitch.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/twitch.py
b/youtube_dl/extractor/twitch.py
index f9164af098d8a7529f290e2297a4974fe2004af5..1981b4d4a8064541c0fcf2faa04d863c72eebb14 100644
(file)
--- a/
youtube_dl/extractor/twitch.py
+++ b/
youtube_dl/extractor/twitch.py
@@
-85,10
+85,15
@@
class TwitchBaseIE(InfoExtractor):
if isinstance(e.cause, compat_HTTPError) and e.cause.code == 400:
response = self._parse_json(
e.cause.read().decode('utf-8'), None)
if isinstance(e.cause, compat_HTTPError) and e.cause.code == 400:
response = self._parse_json(
e.cause.read().decode('utf-8'), None)
- fail(response
['message'
])
+ fail(response
.get('message') or response['errors'][0
])
raise
raise
- redirect_url = urljoin(post_url, response['redirect'])
+ if 'Authenticated successfully' in response.get('message', ''):
+ return None, None
+
+ redirect_url = urljoin(
+ post_url,
+ response.get('redirect') or response['redirect_path'])
return self._download_webpage_handle(
redirect_url, None, 'Downloading login redirect page',
headers=headers)
return self._download_webpage_handle(
redirect_url, None, 'Downloading login redirect page',
headers=headers)
@@
-106,6
+111,10
@@
class TwitchBaseIE(InfoExtractor):
'password': password,
})
'password': password,
})
+ # Successful login
+ if not redirect_page:
+ return
+
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')