From e755a4c7f30bc2cdfd312ad487510492b533af1f Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Wed, 21 Jul 2021 18:04:43 +0200 Subject: [PATCH] sneed --- ruqqus/helpers/aws.py | 23 ----------------------- ruqqus/routes/admin.py | 14 ++++++++++---- 2 files changed, 10 insertions(+), 27 deletions(-) diff --git a/ruqqus/helpers/aws.py b/ruqqus/helpers/aws.py index 358815ff2..12458efb6 100644 --- a/ruqqus/helpers/aws.py +++ b/ruqqus/helpers/aws.py @@ -26,29 +26,6 @@ def check_phash(db, name): ).first() -def upload_from_url(name, url): - - print('upload from url') - - x = requests.get(url) - - print('got content') - - tempname = name.replace("/", "_") - - with open(tempname, "wb") as file: - for chunk in x.iter_content(1024): - file.write(chunk) - - if tempname.split('.')[-1] in ['jpg', 'jpeg']: - piexif.remove(tempname) - - imagurl = upload_from_file(tempname, tempname, (50, 50)) - - remove(tempname) - - return imageurl - def crop_and_resize(img, resize): i = img diff --git a/ruqqus/routes/admin.py b/ruqqus/routes/admin.py index d3679db26..e66c3079a 100644 --- a/ruqqus/routes/admin.py +++ b/ruqqus/routes/admin.py @@ -26,13 +26,19 @@ from ruqqus.__main__ import app, cache @app.route("/admin/resize", methods=["GET"]) -@auth_required +@admin_level_required(6) def resize(v): - if not (v and v.admin_level == 6): abort(404) for u in g.db.query(User).filter(User.profileurl != None).all(): - u.profileurl = upload_from_url(u.username, u.profileurl) + print("1 " + u.profileurl) + x = requests.get(u.profileurl) + + with open(tempname, "wb") as file: + for chunk in x.iter_content(1024): + file.write(chunk) + + u.profileurl = upload_from_file(tempname, tempname, (50, 50)) g.db.add(u) - print(u.profileurl) + print("2 " + u.profileurl) return "sex"