[udemy] Handle already-logged-in scenario (Closes #6327)
authorSergey M․ <dstftw@gmail.com>
Wed, 22 Jul 2015 16:49:00 +0000 (22:49 +0600)
committerSergey M․ <dstftw@gmail.com>
Wed, 22 Jul 2015 16:49:00 +0000 (22:49 +0600)
youtube_dl/extractor/udemy.py

index e2bab52fef3451596ec1cf0de19e3131e378b5dd..4a0eaf65f78be0dbac2b089aa064eec043b15e41 100644 (file)
@@ -77,7 +77,11 @@ class UdemyIE(InfoExtractor):
         login_popup = self._download_webpage(
             self._LOGIN_URL, None, 'Downloading login popup')
 
-        if login_popup == '<div class="run-command close-popup redirect" data-url="https://www.udemy.com/"></div>':
+        def is_logged(webpage):
+            return any(p in webpage for p in ['href="https://www.udemy.com/user/logout/', '>Logout<'])
+
+        # already logged in
+        if is_logged(login_popup):
             return
 
         login_form = self._form_hidden_inputs('login-form', login_popup)
@@ -95,8 +99,7 @@ class UdemyIE(InfoExtractor):
         response = self._download_webpage(
             request, None, 'Logging in as %s' % username)
 
-        if all(logout_pattern not in response
-               for logout_pattern in ['href="https://www.udemy.com/user/logout/', '>Logout<']):
+        if not is_logged(response):
             error = self._html_search_regex(
                 r'(?s)<div[^>]+class="form-errors[^"]*">(.+?)</div>',
                 response, 'error message', default=None)