pepepper/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl synced 2024-11-14 14:28:00 +09:00
Code Issues Projects Releases Wiki Activity

[twitch] Renew authentication

Browse Source
This commit is contained in:
Sergey M․ 2016-08-21 22:45:50 +07:00
parent e3f6b56909
commit efe470e261
No known key found for this signature in database
GPG Key ID: 2C393E0F18A9236D
1 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
youtube_dl/extractor/twitch.py
View File

@ -7,6 +7,7 @@ import random
from .common import InfoExtractor from .common import InfoExtractor
from ..compat import ( from ..compat import (
compat_HTTPError,
compat_parse_qs, compat_parse_qs,
compat_str, compat_str,
compat_urllib_parse_urlencode, compat_urllib_parse_urlencode,
@ -14,6 +15,7 @@ from ..compat import (
compat_urlparse, compat_urlparse,
) )
from ..utils import ( from ..utils import (
clean_html,
ExtractorError, ExtractorError,
int_or_none, int_or_none,
js_to_json, js_to_json,
@ -62,9 +64,17 @@ class TwitchBaseIE(InfoExtractor):
if username is None: if username is None:
return return
def fail(message):
raise ExtractorError(
'Unable to login. Twitch said: %s' % message, expected=True)
login_page, handle = self._download_webpage_handle( login_page, handle = self._download_webpage_handle(
self._LOGIN_URL, None, 'Downloading login page') self._LOGIN_URL, None, 'Downloading login page')
# Some TOR nodes and public proxies are blocked completely
if 'blacklist_message' in login_page:
fail(clean_html(login_page))
login_form = self._hidden_inputs(login_page) login_form = self._hidden_inputs(login_page)
login_form.update({ login_form.update({
@ -81,20 +91,24 @@ class TwitchBaseIE(InfoExtractor):
if not post_url.startswith('http'): if not post_url.startswith('http'):
post_url = compat_urlparse.urljoin(redirect_url, post_url) post_url = compat_urlparse.urljoin(redirect_url, post_url)
response = self._download_webpage( headers = {'Referer': redirect_url}
post_url, None, 'Logging in as %s' % username,
data=urlencode_postdata(login_form),
headers={'Referer': redirect_url})
error_message = self._search_regex( try:
r'<div[^>]+class="subwindow_notice"[^>]*>([^<]+)</div>', response = self._download_json(
response, 'error message', default=None) post_url, None, 'Logging in as %s' % username,
if error_message: data=urlencode_postdata(login_form),
raise ExtractorError( headers=headers)
'Unable to login. Twitch said: %s' % error_message, expected=True) except ExtractorError as e:
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'])
raise
if '>Reset your password<' in response: if response.get('redirect'):
self.report_warning('Twitch asks you to reset your password, go to https://secure.twitch.tv/reset/submit') self._download_webpage(
response['redirect'], None, 'Downloading login redirect page',
headers=headers)
def _prefer_source(self, formats): def _prefer_source(self, formats):
try: try: