libervia-backend: sat/plugins/plugin_misc

plugin download, aesgcm: fixed handling of HTTP errors

comparison

equal deleted inserted replaced

-:554b3b632378
+:84b0c8b4dee0
 try:
 del self._download_callbacks[scheme]
 except KeyError:
 raise exceptions.NotFound(f"No callback registered for scheme {scheme!r}")
+def errbackDownload(self, file_obj, download_d, resp):
+"""Set file_obj and download deferred appropriatly after a network error
+@param file_obj(SatFile): file where the download must be done
+@param download_d(Deferred): deffered which must be fired on complete download
+@param resp(treq.response.IResponse): treq response
+"""
+msg = f"HTTP error ({resp.code}): {resp.phrase.decode()}"
+file_obj.close(error=msg)
+download_d.errback(exceptions.NetworkError(msg))
 async def downloadHTTP(self, client, uri_parsed, dest_path, options):
 url = uri_parsed.geturl()
 head_data = await treq.head(url)
 try:
 )
 progress_id = file_obj.uid
 resp = await treq.get(url, unbuffered=True)
-d = treq.collect(resp, file_obj.write)
+if resp.code == 200:
-d.addBoth(lambda _: file_obj.close())
+d = treq.collect(resp, file_obj.write)
+d.addBoth(lambda _: file_obj.close())
+else:
+d = defer.Deferred()
+self.errbackDownload(file_obj, d, resp)
 return progress_id, d

Mercurial > libervia-backend