aboutsummaryrefslogtreecommitdiffstats
path: root/routes/uploads.py
diff options
context:
space:
mode:
authorFulgen301 <tokmajigeorge@gmail.com>2019-07-26 13:46:34 +0200
committerFulgen301 <tokmajigeorge@gmail.com>2019-07-26 13:46:34 +0200
commitc1f5360a8b06364dd5ae6e916a5cbccf1966d380 (patch)
tree179f9e2c048148df81da3b9cf52615f477921eaf /routes/uploads.py
parent8213c244eaca9a65a51ccb8422b3adb45485ef43 (diff)
downloadparry-c1f5360a8b06364dd5ae6e916a5cbccf1966d380.tar.gz
parry-c1f5360a8b06364dd5ae6e916a5cbccf1966d380.zip
Finally fix CORS
Diffstat (limited to 'routes/uploads.py')
-rw-r--r--routes/uploads.py31
1 files changed, 15 insertions, 16 deletions
diff --git a/routes/uploads.py b/routes/uploads.py
index 332b5a4..d75c4f2 100644
--- a/routes/uploads.py
+++ b/routes/uploads.py
@@ -73,10 +73,10 @@ def post_upload(id=None):
if id is not None:
entry = session.query(Upload).get(id)
if not entry:
- raise ParryHTTPResponse(status=404)
+ raise HTTPResponse(status=404)
else:
if session.query(Upload).filter_by(title=request_data()["title"]).count():
- raise ParryHTTPResponse("An entry with the specified title already exists", 410)
+ raise HTTPResponse("An entry with the specified title already exists", 410)
entry = Upload()
@@ -118,7 +118,7 @@ def post_upload(id=None):
except KeyError as e:
session.rollback()
- raise ParryHTTPResponse(f"Missing form value: {e.args[0]}", 400)
+ raise HTTPResponse(f"Missing form value: {e.args[0]}", 400)
session.commit()
return _add_upload(entry, session)
@@ -131,7 +131,7 @@ def get_upload(id):
if entry is not None:
return _add_upload(entry, session)
- raise ParryHTTPResponse(status=404)
+ raise HTTPResponse(status=404)
@delete("/api/uploads/<id>")
@jwt_auth_required
@@ -141,10 +141,10 @@ def delete_upload(id):
try:
entry = session.query(Upload).filter_by(id=id, author=author).one()
except db.orm.exc.NoResultFound:
- raise ParryHTTPResponse(status=404)
+ raise HTTPResponse(status=404)
if entry.readonly:
- raise ParryHTTPResponse("Resource is read-only", 403)
+ raise HTTPResponse("Resource is read-only", 403)
session.delete(entry)
for i in [Comment, Vote]:
@@ -158,7 +158,7 @@ def delete_upload(id):
#TODO: Dependencies
session.commit()
session.flush()
- return ParryHTTPResponse(status=204)
+ return HTTPResponse(status=204)
@get("/api/uploads/<id>/comments")
@@ -166,7 +166,7 @@ def get_comments(id):
session = DBSession()
upload = session.query(Upload).get(id)
if upload is None:
- raise ParryHTTPResponse("Invalid upload id", 404)
+ raise HTTPResponse("Invalid upload id", 404)
return {
"comments" : [{**(comment.json()), **_vote_dummy} for comment in session.query(Comment).filter_by(upload=upload)]
@@ -178,17 +178,16 @@ def post_comments(id):
session = DBSession()
upload = session.query(Upload).get(id)
if upload is None:
- raise ParryHTTPResponse("Invalid upload id", 404)
+ raise HTTPResponse("Invalid upload id", 404)
try:
-
comment = Comment(
body=request_data()["body"],
author=get_user(session),
upload=upload
)
except KeyError as e:
- raise ParryHTTPResponse(f"Missing json value: {e.args[0]}", 400)
+ raise HTTPResponse(f"Missing json value: {e.args[0]}", 400)
session.add(comment)
session.commit()
@@ -201,11 +200,11 @@ def delete_comments(id, comment_id):
try:
comment = session.query(Comment).filter_by(id=comment_id, author=get_user(session), upload=session.query(Upload).get(id)).one()
except db.orm.exc.NoResultFound:
- raise ParryHTTPResponse(status=404)
+ raise HTTPResponse(status=404)
session.delete(comment)
session.commit()
- return ParryHTTPResponse(status=204)
+ return HTTPResponse(status=204)
@get("/api/uploads/<id>/vote")
@jwt_auth_required
@@ -213,12 +212,12 @@ def get_vote(id):
session = DBSession()
upload = session.query(Upload).get(id)
if upload is None:
- raise ParryHTTPResponse("Invalid upload id", 404)
+ raise HTTPResponse("Invalid upload id", 404)
try:
return session.query(Vote).filter_by(upload=upload, author=get_user(session)).one().json()
except db.orm.exc.NoResultFound:
- raise ParryHTTPResponse(status=404)
+ raise HTTPResponse(status=404)
@post("/api/uploads/<id>/vote")
@jwt_auth_required
@@ -226,7 +225,7 @@ def post_vote(id):
session = DBSession()
upload = session.query(Upload).get(id)
if upload is None:
- raise ParryHTTPResponse("Invalid upload id", 404)
+ raise HTTPResponse("Invalid upload id", 404)
author = get_user(session)
try: