oci/zeronet
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Raise RequestError instead of Exception of fileGet error

Browse source
This commit is contained in:
shortcutme 2017-06-19 16:01:41 +02:00
parent ff69b04216
commit c58d28861d
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/File/FileRequest.py
View file

@ -17,6 +17,10 @@ from Plugin import PluginManager
FILE_BUFF = 1024 * 512
class RequestError(Exception):
pass
# Incoming requests
@PluginManager.acceptPlugins
class FileRequest(object):
@ -191,7 +195,7 @@ class FileRequest(object):
file_size = os.fstat(file.fileno()).st_size
if params["location"] > file_size:
self.connection.badAction(5)
raise Exception("Bad file location")
raise RequestError("Bad file location")
back = {
"body": file,
@ -212,6 +216,9 @@ class FileRequest(object):
return {"bytes_sent": bytes_sent, "file_size": file_size, "location": params["location"]}
except RequestError, err:
self.log.debug("GetFile request error: %s" % Debug.formatException(err))
self.response({"error": "File read error: %s" % err})
except Exception, err:
self.log.debug("GetFile read error: %s" % Debug.formatException(err))
self.response({"error": "File read error"})
@ -232,7 +239,7 @@ class FileRequest(object):
stream_bytes = min(FILE_BUFF, file_size - params["location"])
if stream_bytes < 0:
self.connection.badAction(5)
raise Exception("Bad file location")
raise RequestError("Bad file location")
back = {
"size": file_size,