maryjane
/
gpodder
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Add download retry without authentication if auth is set (#1300) 

* Add download retry without authentification if auth is set
This commit is contained in:
JKAbrams 2022-06-16 22:37:30 +00:00 committed by GitHub
parent 4d4ad7f7cb
commit 0a51542ab5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/gpodder/download.py
View File

@ -231,7 +231,7 @@ class DownloadURLOpener:
# The following is based on Python's urllib.py "URLopener.retrieve"
# Also based on http://mail.python.org/pipermail/python-list/2001-October/110069.html
def retrieve_resume(self, url, filename, reporthook=None, data=None):
def retrieve_resume(self, url, filename, reporthook=None, data=None, disable_auth=False):
"""Download files from an URL; return (headers, real_url)
Resumes a download if the local filename exists and
@ -244,7 +244,7 @@ class DownloadURLOpener:
'User-agent': gpodder.user_agent
}
if self.channel.auth_username or self.channel.auth_password:
if (self.channel.auth_username or self.channel.auth_password) and not disable_auth:
logger.debug('Authenticating as "%s"', self.channel.auth_username)
auth = (self.channel.auth_username, self.channel.auth_password)
else:
@ -277,7 +277,11 @@ class DownloadURLOpener:
try:
resp.raise_for_status()
except HTTPError as e:
raise gPodderDownloadHTTPError(url, resp.status_code, str(e))
if auth is not None:
# Try again without authentication (bug 1296)
return self.retrieve_resume(url, filename, reporthook, data, True)
else:
raise gPodderDownloadHTTPError(url, resp.status_code, str(e))
headers = resp.headers