[guitartricks] login process fixed 💫
This commit is contained in:
thiemo
parent
dd1b8f3991
commit
9b6f3a25d6
@ -7,7 +7,7 @@ from .common import InfoExtractor
|
||||
from .wistia import WistiaIE
|
||||
from ..compat import (
|
||||
compat_str,
|
||||
compat_kwargs,
|
||||
compat_HTTPError,
|
||||
)
|
||||
from ..utils import (
|
||||
clean_html,
|
||||
@ -23,6 +23,7 @@ class GuitarTricksIE(InfoExtractor):
|
||||
_ORIGIN_URL = 'https://www.guitartricks.com'
|
||||
_NETRC_MACHINE = 'guitartricks'
|
||||
_VALID_URL = r'https?://(?:www\.)?guitartricks\.com/(lesson|course|tutorial).php\?input=(?P<id>[A-Za-z0-9]+.*)'
|
||||
_LOGIN_REQUIRED = False
|
||||
|
||||
_TESTS = [{
|
||||
'url': 'https://www.guitartricks.com/lesson.php?input=21986',
|
||||
@ -48,80 +49,86 @@ class GuitarTricksIE(InfoExtractor):
|
||||
}
|
||||
}, {
|
||||
'url': 'https://www.guitartricks.com/lesson.php?input=24742',
|
||||
'md5': '09e89ad6c6a9b85b0471b80230995fcc',
|
||||
'md5': '98074943181f87361f16085b0370717d',
|
||||
'info_dict': {
|
||||
'id': '5706o2esuo',
|
||||
'id': '4h7kvsarcg',
|
||||
'ext': 'mp4',
|
||||
'title': 'Guitar Lessons: The \'Magic L\', in Reverse!',
|
||||
'description': "Let's flip the Magic L on it's head and open up a whole new set of options for playing in a variety of keys.\r\n\r\nThe Reverse Magic L is like the \u2018Magic L\u2019 you already learned, only it is turned upside down! \r\n\r\nThe 1 chord is played as a 5th-string power chord, and the IV and the V chords will fall into place as 6th string power chords, in an upside-down L shape. \r\n\r\nListen to how these three chords sound intuitively right together. \r\n",
|
||||
'upload_date': '20160718',
|
||||
'timestamp': 1468854273,
|
||||
},
|
||||
}]
|
||||
|
||||
|
||||
def _download_webpage(self, *args, **kwargs):
|
||||
kwargs.setdefault('headers', {})['User-Agent'] = 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_5) AppleWebKit/603.2.4 (KHTML, like Gecko) Version/10.1.1 Safari/603.2.4'
|
||||
return super(GuitarTricksIE, self)._download_webpage(
|
||||
*args, **compat_kwargs(kwargs))
|
||||
|
||||
def _real_initialize(self):
|
||||
self._login()
|
||||
|
||||
def _login(self):
|
||||
(username, password) = self._get_login_info()
|
||||
return
|
||||
|
||||
login_popup = self._download_webpage(
|
||||
self._LOGIN_URL, None, 'Downloading login popup')
|
||||
|
||||
def is_logged(webpage):
|
||||
return any(re.search(p, webpage) for p in (
|
||||
r'<a[^>]+\bhref=["\']/logout.php',
|
||||
r'>Logout<'))
|
||||
|
||||
# already logged in
|
||||
if is_logged(login_popup):
|
||||
if username is None:
|
||||
if self._LOGIN_REQUIRED:
|
||||
raise ExtractorError('No login info available, needed for using %s.' % self.IE_NAME, expected=True)
|
||||
return
|
||||
|
||||
def fail(message):
|
||||
raise ExtractorError(
|
||||
'Unable to login. GuitarTricks said: %s' % message, expected=True)
|
||||
|
||||
login_form = self._form_hidden_inputs(login_popup)
|
||||
def login_step(page, urlh, note, data):
|
||||
form = self._hidden_inputs(page)
|
||||
form.update(data)
|
||||
|
||||
login_form.update({
|
||||
'vb_login_username': username,
|
||||
'vb_login_password': password,
|
||||
})
|
||||
page_url = urlh.geturl()
|
||||
post_url = '/process/loginAjax'
|
||||
post_url = urljoin(page_url, post_url)
|
||||
|
||||
headers = {'Referer': page_url}
|
||||
|
||||
response = self._download_webpage(
|
||||
self._LOGIN_URL, None, 'Logging in',
|
||||
data=urlencode_postdata(login_form),
|
||||
headers={
|
||||
'Content-Type': 'application/x-www-form-urlencoded',
|
||||
'Referer': self._ORIGIN_URL,
|
||||
'Origin': self._ORIGIN_URL,
|
||||
try:
|
||||
response = self._download_json(
|
||||
post_url, None, note,
|
||||
data=urlencode_postdata(form),
|
||||
headers=headers)
|
||||
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.get('message') or response['errors'][0])
|
||||
raise
|
||||
|
||||
if response.get('status'):
|
||||
return None, None
|
||||
else:
|
||||
fail(response.get('error'))
|
||||
|
||||
redirect_url = 'https://www.guitartricks.com/main.php'
|
||||
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')
|
||||
|
||||
redirect_page, handle = login_step(
|
||||
login_page, handle, 'Logging in', {
|
||||
'login': username,
|
||||
'password': password,
|
||||
'action': 'verify_login',
|
||||
})
|
||||
|
||||
|
||||
if not is_logged(response):
|
||||
error = self._html_search_regex(
|
||||
r'(?s)<div[^>]+class="form-errors[^"]*">(.+?)</div>',
|
||||
response, 'error message', default=None)
|
||||
if error:
|
||||
raise ExtractorError('Unable to login: %s' % error, expected=True)
|
||||
raise ExtractorError('Unable to log in')
|
||||
# Successful login
|
||||
if not redirect_page:
|
||||
return
|
||||
|
||||
|
||||
def _real_extract(self, url):
|
||||
video_id = self._match_id(url)
|
||||
|
||||
webpage = self._download_webpage(url, video_id)
|
||||
|
||||
|
||||
if re.search(r'Full Access Members Only', webpage):
|
||||
self.raise_login_required('Full Access Members Only')
|
||||
raise ExtractorError('Video only available with premium plan', expected=True)
|
||||
|
||||
wistia_url = WistiaIE._extract_url(webpage)
|
||||
if not wistia_url:
|
||||
if any(re.search(p, webpage) for p in (
|
||||
r'Full Access Members Only')):
|
||||
self.raise_login_required('Lecture contents locked')
|
||||
|
||||
title = self._og_search_title(webpage, default=None)
|
||||
|
||||
@ -132,5 +139,4 @@ class GuitarTricksIE(InfoExtractor):
|
||||
'ie_key': WistiaIE.ie_key(),
|
||||
'title': title,
|
||||
'description': self._og_search_description(webpage),
|
||||
# TODO more properties (see youtube_dl/extractor/common.py)
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user