projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
34a4cd0
)
[twitch] Fix login (Closes #6599)
author
Sergey M․
<dstftw@gmail.com>
Tue, 18 Aug 2015 14:26:45 +0000
(20:26 +0600)
committer
Sergey M․
<dstftw@gmail.com>
Tue, 18 Aug 2015 14:26:45 +0000
(20:26 +0600)
youtube_dl/extractor/twitch.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/twitch.py
b/youtube_dl/extractor/twitch.py
index 4f4eb6d7265b5c26d701cc784c0f9330ad8de640..023911c41f4b05ef0a8137e9cf8fede2cc94cf6d 100644
(file)
--- a/
youtube_dl/extractor/twitch.py
+++ b/
youtube_dl/extractor/twitch.py
@@
-12,6
+12,7
@@
from ..compat import (
compat_urllib_parse,
compat_urllib_parse_urlparse,
compat_urllib_request,
compat_urllib_parse,
compat_urllib_parse_urlparse,
compat_urllib_request,
+ compat_urlparse,
)
from ..utils import (
ExtractorError,
)
from ..utils import (
ExtractorError,
@@
-27,7
+28,7
@@
class TwitchBaseIE(InfoExtractor):
_API_BASE = 'https://api.twitch.tv'
_USHER_BASE = 'http://usher.twitch.tv'
_LOGIN_URL = 'https://secure.twitch.tv/login'
_API_BASE = 'https://api.twitch.tv'
_USHER_BASE = 'http://usher.twitch.tv'
_LOGIN_URL = 'https://secure.twitch.tv/login'
- _LOGIN_POST_URL = 'https://passport.twitch.tv/auth
orize
'
+ _LOGIN_POST_URL = 'https://passport.twitch.tv/auth
entications/new
'
_NETRC_MACHINE = 'twitch'
def _handle_error(self, response):
_NETRC_MACHINE = 'twitch'
def _handle_error(self, response):
@@
-70,8
+71,15
@@
class TwitchBaseIE(InfoExtractor):
'password': password.encode('utf-8'),
})
'password': password.encode('utf-8'),
})
+ post_url = self._search_regex(
+ r'<form[^>]+action=(["\'])(?P<url>.+?)\1', login_page,
+ 'post url', default=self._LOGIN_POST_URL, group='url')
+
+ if not post_url.startswith('http'):
+ post_url = compat_urlparse.urljoin(self._LOGIN_URL, post_url)
+
request = compat_urllib_request.Request(
request = compat_urllib_request.Request(
-
self._LOGIN_POST_URL
, compat_urllib_parse.urlencode(login_form).encode('utf-8'))
+
post_url
, compat_urllib_parse.urlencode(login_form).encode('utf-8'))
request.add_header('Referer', self._LOGIN_URL)
response = self._download_webpage(
request, None, 'Logging in as %s' % username)
request.add_header('Referer', self._LOGIN_URL)
response = self._download_webpage(
request, None, 'Logging in as %s' % username)