projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
e811bcf
)
[adobepass] clear cache in case of pendingLogout errors
author
Remita Amine
<remitamine@gmail.com>
Sun, 14 Aug 2016 20:24:33 +0000
(21:24 +0100)
committer
Remita Amine
<remitamine@gmail.com>
Sun, 14 Aug 2016 20:24:33 +0000
(21:24 +0100)
youtube_dl/extractor/adobepass.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/adobepass.py
b/youtube_dl/extractor/adobepass.py
index 4e59302ab4da59ee0306c7c88689019056833576..d315bfbc1e8cf8ab2f6c292c969b1af2d482b6ff 100644
(file)
--- a/
youtube_dl/extractor/adobepass.py
+++ b/
youtube_dl/extractor/adobepass.py
@@
-90,6
+90,9
@@
class AdobePass(InfoExtractor):
'_method': 'GET',
'requestor_id': requestor_id,
}), headers=mvpd_headers)
'_method': 'GET',
'requestor_id': requestor_id,
}), headers=mvpd_headers)
+ if '<pendingLogout' in short_authorize:
+ self._downloader.cache.store('mvpd', requestor_id, {})
+ return self._extract_mvpd_auth(url, video_id, requestor_id, resource)
authn_token = unescapeHTML(xml_text(session, 'authnToken'))
requestor_info['authn_token'] = authn_token
self._downloader.cache.store('mvpd', requestor_id, requestor_info)
authn_token = unescapeHTML(xml_text(session, 'authnToken'))
requestor_info['authn_token'] = authn_token
self._downloader.cache.store('mvpd', requestor_id, requestor_info)
@@
-105,6
+108,9
@@
class AdobePass(InfoExtractor):
'mso_id': xml_text(authn_token, 'simpleTokenMsoID'),
'userMeta': '1',
}), headers=mvpd_headers)
'mso_id': xml_text(authn_token, 'simpleTokenMsoID'),
'userMeta': '1',
}), headers=mvpd_headers)
+ if '<pendingLogout' in authorize:
+ self._downloader.cache.store('mvpd', requestor_id, {})
+ return self._extract_mvpd_auth(url, video_id, requestor_id, resource)
authz_token = unescapeHTML(xml_text(authorize, 'authzToken'))
requestor_info[guid] = authz_token
self._downloader.cache.store('mvpd', requestor_id, requestor_info)
authz_token = unescapeHTML(xml_text(authorize, 'authzToken'))
requestor_info[guid] = authz_token
self._downloader.cache.store('mvpd', requestor_id, requestor_info)
@@
-114,7
+120,7
@@
class AdobePass(InfoExtractor):
'ap_23': xml_text(authn_token, 'simpleSamlSessionIndex'),
})
'ap_23': xml_text(authn_token, 'simpleSamlSessionIndex'),
})
-
return
self._download_webpage(
+
short_authorize =
self._download_webpage(
self._SERVICE_PROVIDER_TEMPLATE % 'shortAuthorize',
video_id, 'Retrieving Media Token', data=urlencode_postdata({
'authz_token': authz_token,
self._SERVICE_PROVIDER_TEMPLATE % 'shortAuthorize',
video_id, 'Retrieving Media Token', data=urlencode_postdata({
'authz_token': authz_token,
@@
-122,3
+128,7
@@
class AdobePass(InfoExtractor):
'session_guid': xml_text(authn_token, 'simpleTokenAuthenticationGuid'),
'hashed_guid': 'false',
}), headers=mvpd_headers)
'session_guid': xml_text(authn_token, 'simpleTokenAuthenticationGuid'),
'hashed_guid': 'false',
}), headers=mvpd_headers)
+ if '<pendingLogout' in short_authorize:
+ self._downloader.cache.store('mvpd', requestor_id, {})
+ return self._extract_mvpd_auth(url, video_id, requestor_id, resource)
+ return short_authorize
\ No newline at end of file