From 79b38f873da4a6b55962b7be38663f81ef507d3d Mon Sep 17 00:00:00 2001 From: raleeper Date: Sun, 30 Oct 2016 14:45:17 -0700 Subject: [PATCH] [adobepass] Allow new Comcast auto login message --- youtube_dl/extractor/adobepass.py | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/youtube_dl/extractor/adobepass.py b/youtube_dl/extractor/adobepass.py index 12eeab271..20ae610ac 100644 --- a/youtube_dl/extractor/adobepass.py +++ b/youtube_dl/extractor/adobepass.py @@ -1375,13 +1375,20 @@ class AdobePassIE(InfoExtractor): # are on Comcast's network. provider_redirect_page, urlh = provider_redirect_page_res # Check for Comcast auto login - if 'automatically signing you in' in provider_redirect_page: + if 'automatically signed in' in provider_redirect_page: oauth_redirect_url = self._html_search_regex( - r'window\.location\s*=\s*[\'"]([^\'"]+)', - provider_redirect_page, 'oauth redirect') + r'continue:\s*[\'"]([^\'"]+)', + provider_redirect_page, 'oauth redirect [1]') # Just need to process the request. No useful data comes back self._download_webpage( - oauth_redirect_url, video_id, 'Confirming auto login') + oauth_redirect_url, video_id, 'Confirming auto login [1]') + elif 'automatically signing you in' in provider_redirect_page: + oauth_redirect_url = self._html_search_regex( + r'window\.location\s*=\s*[\'"]([^\'"]+)', + provider_redirect_page, 'oauth redirect [2]') + # Just need to process the request. No useful data comes back + self._download_webpage( + oauth_redirect_url, video_id, 'Confirming auto login [2]') else: if '