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

Don't display stacktrace for common download errors.

This commit is contained in:
auouymous 2023-01-25 16:44:06 -07:00
parent eb02ddd9d5
commit f64440867d
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/gpodder/download.py
View File

@ -984,7 +984,7 @@ class DownloadTask(object):
except ConnectionError as ce: except ConnectionError as ce:
# special case request exception # special case request exception
result = DownloadTask.FAILED result = DownloadTask.FAILED
logger.error('Download failed: %s', str(ce), exc_info=True) logger.error('Download failed: %s', str(ce))
d = {'host': ce.args[0].pool.host, 'port': ce.args[0].pool.port} d = {'host': ce.args[0].pool.host, 'port': ce.args[0].pool.port}
self.error_message = _("Couldn't connect to server %(host)s:%(port)s" % d) self.error_message = _("Couldn't connect to server %(host)s:%(port)s" % d)
except RequestException as re: except RequestException as re:
@ -992,20 +992,19 @@ class DownloadTask(object):
if isinstance(re.args[0], MaxRetryError): if isinstance(re.args[0], MaxRetryError):
re = re.args[0] re = re.args[0]
logger.error('%s while downloading "%s"', str(re), logger.error('%s while downloading "%s"', str(re),
self.__episode.title, exc_info=True) self.__episode.title)
result = DownloadTask.FAILED result = DownloadTask.FAILED
d = {'error': str(re)} d = {'error': str(re)}
self.error_message = _('Request Error: %(error)s') % d self.error_message = _('Request Error: %(error)s') % d
except IOError as ioe: except IOError as ioe:
logger.error('%s while downloading "%s": %s', ioe.strerror, logger.error('%s while downloading "%s": %s', ioe.strerror,
self.__episode.title, ioe.filename, exc_info=True) self.__episode.title, ioe.filename)
result = DownloadTask.FAILED result = DownloadTask.FAILED
d = {'error': ioe.strerror, 'filename': ioe.filename} d = {'error': ioe.strerror, 'filename': ioe.filename}
self.error_message = _('I/O Error: %(error)s: %(filename)s') % d self.error_message = _('I/O Error: %(error)s: %(filename)s') % d
except gPodderDownloadHTTPError as gdhe: except gPodderDownloadHTTPError as gdhe:
logger.error('HTTP %s while downloading "%s": %s', logger.error('HTTP %s while downloading "%s": %s',
gdhe.error_code, self.__episode.title, gdhe.error_message, gdhe.error_code, self.__episode.title, gdhe.error_message)
exc_info=True)
result = DownloadTask.FAILED result = DownloadTask.FAILED
d = {'code': gdhe.error_code, 'message': gdhe.error_message} d = {'code': gdhe.error_code, 'message': gdhe.error_message}
self.error_message = _('HTTP Error %(code)s: %(message)s') % d self.error_message = _('HTTP Error %(code)s: %(message)s') % d