Add delete unused uploads admin function

[cheatdb.git] / app / utils.py

diff --git a/app/utils.py b/app/utils.py
index fd36392664e054a7cb89229ff406a04e30372394..bb24920b8c9ca83e856ba65687151645fc1ee4c5 100644 (file)
--- a/app/utils.py
+++ b/app/utils.py
@@ -18,9 +18,23 @@
 from flask import request, flash, abort, redirect
 from flask_user import *
 from flask_login import login_user, logout_user
-from app.models import *
-from app import app
+from .models import *
+from . import app
 import random, string, os, imghdr
+from urllib.parse import urljoin
+
+def abs_url_for(path, **kwargs):
+       scheme = "https" if app.config["BASE_URL"][:5] == "https" else "http"
+       return url_for(path, _external=True, _scheme=scheme, **kwargs)
+
+def abs_url(path):
+       return urljoin(app.config["BASE_URL"], path)
+
+def get_int_or_abort(v, default=None):
+       try:
+               return int(v or default)
+       except ValueError:
+               abort(400)
 
 def getExtension(filename):
        return filename.rsplit(".", 1)[1].lower() if "." in filename else None
@@ -42,8 +56,10 @@ def randomString(n):
 
 def doFileUpload(file, fileType, fileTypeDesc):
        if not file or file is None or file.filename == "":
-               flash("No selected file", "error")
-               return None
+               flash("No selected file", "danger")
+               return None, None
+
+       assert os.path.isdir(app.config["UPLOAD_DIR"]), "UPLOAD_DIR must exist"
 
        allowedExtensions = []
        isImage = False
@@ -57,18 +73,19 @@ def doFileUpload(file, fileType, fileTypeDesc):
 
        ext = getExtension(file.filename)
        if ext is None or not ext in allowedExtensions:
-               flash("Please upload load " + fileTypeDesc, "danger")
-               return None
+               flash("Please upload " + fileTypeDesc, "danger")
+               return None, None
 
        if isImage and not isAllowedImage(file.stream.read()):
                flash("Uploaded image isn't actually an image", "danger")
-               return None
+               return None, None
 
        file.stream.seek(0)
 
        filename = randomString(10) + "." + ext
-       file.save(os.path.join("app/public/uploads", filename))
-       return "/uploads/" + filename
+       filepath = os.path.join(app.config["UPLOAD_DIR"], filename)
+       file.save(filepath)
+       return "/uploads/" + filename, filepath
 
 def make_flask_user_password(plaintext_str):
        # http://passlib.readthedocs.io/en/stable/modular_crypt_format.html
@@ -93,7 +110,7 @@ def make_flask_user_password(plaintext_str):
        else:
                return password.decode("UTF-8")
 
-def _do_login_user(user, remember_me=False):
+def loginUser(user):
        def _call_or_get(v):
                if callable(v):
                        return v()
@@ -105,7 +122,7 @@ def _do_login_user(user, remember_me=False):
                return False
 
        if user.rank == UserRank.BANNED:
-               flash("You have been banned.", "error")
+               flash("You have been banned.", "danger")
                return False
 
        user.active = True
@@ -116,32 +133,17 @@ def _do_login_user(user, remember_me=False):
 
        # Check if user account has been disabled
        if not _call_or_get(user.is_active):
-               flash("Your account has not been enabled.", "error")
-               return False
-
-       # Check if user has a confirmed email address
-       user_manager = current_app.user_manager
-       if user_manager.enable_email and user_manager.enable_confirm_email \
-                       and not current_app.user_manager.enable_login_without_confirm_email \
-                       and not user.has_confirmed_email():
-               url = url_for("user.resend_confirm_email")
-               flash("Your email address has not yet been confirmed", "error")
+               flash("Your account has not been enabled.", "danger")
                return False
 
        # Use Flask-Login to sign in user
-       login_user(user, remember=remember_me)
+       login_user(user, remember=True)
        signals.user_logged_in.send(current_app._get_current_object(), user=user)
 
        flash("You have signed in successfully.", "success")
 
        return True
 
-def loginUser(user):
-       user_mixin = None
-       if user_manager.enable_username:
-               user_mixin = user_manager.find_user_by_username(user.username)
-
-       return _do_login_user(user_mixin, True)
 
 def rank_required(rank):
        def decorator(f):