From 1b69dc7085cb6c82a3c2d7698bf2c37e6d01dd43 Mon Sep 17 00:00:00 2001 From: paulmart-n Date: Mon, 4 Dec 2023 22:12:34 +0100 Subject: [PATCH] Quick-Fix Mensa id-gen --- app.py | 6 +----- fetchMENSA.py | 3 +-- init-sql.sh | 2 +- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/app.py b/app.py index a9bfa0e..1413827 100644 --- a/app.py +++ b/app.py @@ -203,6 +203,7 @@ def login_post(): @app.route("/backendpoc/log-out") +@login_required def logout(): cookie = request.cookies.get("cnsc") dualis = Dualis.query.filter_by(uid=current_user.id).first() @@ -216,10 +217,5 @@ def logout(): return red -@app.errorhandler(AttributeError) -def handle_anon(e): - return redirect(url_for("login"), code=e) - - if __name__ == "__main__": app.run(host='0.0.0.0', port=2024, debug=True) diff --git a/fetchMENSA.py b/fetchMENSA.py index 9b7df83..add62f4 100644 --- a/fetchMENSA.py +++ b/fetchMENSA.py @@ -2,7 +2,6 @@ import json from init import db, Meals, scheduler import datetime import requests -import hashlib import time nomeal = 'Essen nicht (mehr) verfügbar' @@ -53,7 +52,7 @@ def getMealsFromAPI(day: str, dbentry: bool = False): essen += [name] if dbentry: - mid = int(hashlib.sha1((day + name).encode("utf-8")).hexdigest(), 16) % (8 ** 8) + mid = int(time.time()*1000) % 100000 neu = Meals(date=day, name=name, id=mid, vegan=vegan, vegetarian=veget, schwein=schwein) db.session.add(neu) db.session.commit() diff --git a/init-sql.sh b/init-sql.sh index 4777c4c..5fe0edb 100755 --- a/init-sql.sh +++ b/init-sql.sh @@ -2,4 +2,4 @@ mysql -e "USE paulmrtn_DUALHUB; CREATE TABLE user ( id int NOT NULL, email VARCHAR(255), password VARCHAR(255), name VARCHAR(255), kurs VARCHAR (15), PRIMARY KEY (ID), UNIQUE (ID, EMAIL) );" mysql -e "USE paulmrtn_DUALHUB; CREATE TABLE dualis ( uid int NOT NULL, token VARCHAR(255), result_lists VARCHAR(255), token_created INT, PRIMARY KEY (uid));" -mysql -e "USE paulmrtn_DUALHUB; CREATE TABLE meals ( id int NOT NULL, date date, name VARCHAR(100), vegetarian tinyint(1), vegan tinyint(1), schwein tinyint(1), PRIMARY KEY (id));" +mysql -e "USE paulmrtn_DUALHUB; CREATE TABLE meals ( id int NOT NULL, date date, name VARCHAR(200), vegetarian tinyint(1), vegan tinyint(1), schwein tinyint(1), PRIMARY KEY (id));"