From da81df535ab9e5d7b41fa1ae4cf34fd053b77cdd Mon Sep 17 00:00:00 2001 From: rubenwardy Date: Sun, 28 Feb 2021 01:14:43 +0000 Subject: [PATCH] API Screenshots: Fix crash on not a number --- app/logic/screenshots.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/logic/screenshots.py b/app/logic/screenshots.py index ef9eb9d..6b26ac5 100644 --- a/app/logic/screenshots.py +++ b/app/logic/screenshots.py @@ -1,4 +1,4 @@ -import datetime +import datetime, json from app.logic.LogicError import LogicError from app.logic.uploads import upload_file @@ -46,13 +46,13 @@ def do_order_screenshots(_user: User, package: Package, order: [any]): lookup[screenshot.id] = screenshot counter = 1 - for id in order: + for ss_id in order: try: - lookup[int(id)].order = counter + lookup[int(ss_id)].order = counter counter += 1 except KeyError as e: - raise LogicError(400, "Unable to find screenshot with id={}".format(id)) - except ValueError as e: - raise LogicError(400, "Invalid number: {}".format(id)) + raise LogicError(400, "Unable to find screenshot with id={}".format(ss_id)) + except (ValueError, TypeError) as e: + raise LogicError(400, "Invalid id, not a number: {}".format(json.dumps(ss_id))) db.session.commit()