sheppy/python-flask-picture-factory
1
0
Fork 0
mirror of https://github.com/FAUSheppy/python-flask-picture-factory synced 2025-12-06 07:01:37 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

return 404 error on missing file not 500

Browse Source
This commit is contained in:
Yannik Schmidt
2021-06-30 16:08:14 +02:00
parent 1f9e49b815
commit 41f6eb7560
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server.py
View File

@@ -27,7 +27,10 @@ def generatePicture(pathToOrig, scaleX, scaleY, encoding):
encoding = "jpeg" encoding = "jpeg"
# open image # # open image #
image = PIL.Image.open(os.path.join(PICTURE_DIR, pathToOrig)) try:
image = PIL.Image.open(os.path.join(PICTURE_DIR, pathToOrig))
except FileNotFoundError:
return None
# ensure sizes are valid # # ensure sizes are valid #
x, y = image.size x, y = image.size
@@ -74,6 +77,9 @@ def sendPicture(path):
scaleX = round(float(x2)) scaleX = round(float(x2))
path = generatePicture(path, scaleX, scaleY, flask.request.args.get("encoding")) path = generatePicture(path, scaleX, scaleY, flask.request.args.get("encoding"))
if not path:
return ("File not found", 404)
raw = flask.send_from_directory(".", path, cache_timeout=cache_timeout) raw = flask.send_from_directory(".", path, cache_timeout=cache_timeout)
response = flask.make_response(raw) response = flask.make_response(raw)
response.headers['X-ATHQ-INTERNAL-FID'] = path response.headers['X-ATHQ-INTERNAL-FID'] = path