projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
bdf16f8
)
[lynda] Skip login if already logged in
author
Sergey M․
<dstftw@gmail.com>
Fri, 10 Jun 2016 16:01:52 +0000
(23:01 +0700)
committer
Sergey M․
<dstftw@gmail.com>
Fri, 10 Jun 2016 16:01:52 +0000
(23:01 +0700)
youtube_dl/extractor/lynda.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/lynda.py
b/youtube_dl/extractor/lynda.py
index c2678652e7b6dd0feaa68945238030a93073c244..7610985b4dd81ef1bb5b6df46545245fc5647460 100644
(file)
--- a/
youtube_dl/extractor/lynda.py
+++ b/
youtube_dl/extractor/lynda.py
@@
-71,6
+71,11
@@
class LyndaBaseIE(InfoExtractor):
signin_page = self._download_webpage(
self._SIGNIN_URL, None, 'Downloading signin page')
signin_page = self._download_webpage(
self._SIGNIN_URL, None, 'Downloading signin page')
+ # Already logged in
+ if any(re.search(p, signin_page) for p in (
+ 'isLoggedIn\s*:\s*true', r'logout\.aspx', r'>Log out<')):
+ return
+
# Step 2: submit email
signin_form = self._search_regex(
r'(?s)(<form[^>]+data-form-name=["\']signin["\'][^>]*>.+?</form>)',
# Step 2: submit email
signin_form = self._search_regex(
r'(?s)(<form[^>]+data-form-name=["\']signin["\'][^>]*>.+?</form>)',
@@
-85,15
+90,6
@@
class LyndaBaseIE(InfoExtractor):
password_form, self._USER_URL, {'email': username, 'password': password},
'Submitting password', signin_url)
password_form, self._USER_URL, {'email': username, 'password': password},
'Submitting password', signin_url)
- def _logout(self):
- username, _ = self._get_login_info()
- if username is None:
- return
-
- self._download_webpage(
- 'http://www.lynda.com/ajax/logout.aspx', None,
- 'Logging out', 'Unable to log out', fatal=False)
-
class LyndaIE(LyndaBaseIE):
IE_NAME = 'lynda'
class LyndaIE(LyndaBaseIE):
IE_NAME = 'lynda'
@@
-217,8
+213,6
@@
class LyndaCourseIE(LyndaBaseIE):
'http://www.lynda.com/ajax/player?courseId=%s&type=course' % course_id,
course_id, 'Downloading course JSON')
'http://www.lynda.com/ajax/player?courseId=%s&type=course' % course_id,
course_id, 'Downloading course JSON')
- self._logout()
-
if course.get('Status') == 'NotFound':
raise ExtractorError(
'Course %s does not exist' % course_id, expected=True)
if course.get('Status') == 'NotFound':
raise ExtractorError(
'Course %s does not exist' % course_id, expected=True)