From caf54541623b1b704ca7a9e98f3380b529e57ee6 Mon Sep 17 00:00:00 2001 From: Hyperbel Date: Wed, 23 Nov 2022 09:08:28 +0100 Subject: [PATCH 1/5] mate logik funktion --- main.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/main.py b/main.py index ab3fd41..195cfca 100644 --- a/main.py +++ b/main.py @@ -181,6 +181,14 @@ def session(id): warning_log(" called /session without being logged in") return render_template('passwd.html') +def mate_logik(sorte, anzahl): + anzahl = anzahl + 1 + koffeingehalt = 0 + match sorte: + case "Mio Mio": + koffeingehalt = + + @app.route("/mate", methods=['POST']) def mate(): log_server("called /mate") @@ -196,6 +204,8 @@ def mate(): cur.execute(mateSql) con.commit() con.close() + + mate_logik(mateSorte, mateFlaschen) log_server("mate wurde in Datenbank eingefügt") except sqlite3.Error as e: error_log(f"error while executing sql: {e}") From 24532ce6d4161ce86df2180af1103af8b2f3319b Mon Sep 17 00:00:00 2001 From: hyperbel Date: Wed, 23 Nov 2022 18:23:03 +0100 Subject: [PATCH 2/5] minor fixes --- run.sh | 6 ++---- templates/session.html | 6 +++--- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/run.sh b/run.sh index 5c184d7..29678ba 100755 --- a/run.sh +++ b/run.sh @@ -1,13 +1,11 @@ +#!/bin/sh python -c "import qrcode" if [ $? -eq 1 ]; then pip install qrcode else - echo "qrcode package is installed" -fi cat party.sql | sqlite3 party.db export FLASK_APP=main.py - - flask run +flask run diff --git a/templates/session.html b/templates/session.html index f57fda1..890871b 100644 --- a/templates/session.html +++ b/templates/session.html @@ -34,9 +34,9 @@ - - - + + + From 475b31fc099141dcb4ea1002203aa9187045d98f Mon Sep 17 00:00:00 2001 From: hyperbel Date: Wed, 23 Nov 2022 18:33:17 +0100 Subject: [PATCH 3/5] check checksum on run.sh --- .sums | 1 + run.sh | 9 +++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 .sums diff --git a/.sums b/.sums new file mode 100644 index 0000000..234e7ae --- /dev/null +++ b/.sums @@ -0,0 +1 @@ +dbfbf6b3987f9fb0f75b46515769394a party.db diff --git a/run.sh b/run.sh index 29678ba..9cb0e8e 100755 --- a/run.sh +++ b/run.sh @@ -3,8 +3,13 @@ python -c "import qrcode" if [ $? -eq 1 ]; then pip install qrcode -else -cat party.sql | sqlite3 party.db +fi + +md5sum -c .sums +if [ $? -eq 1 ]; then + rm party.db + cat party.sql | sqlite3 party.db +fi export FLASK_APP=main.py From 25a07b5d7123c0bdb5322707db9f86d33652b378 Mon Sep 17 00:00:00 2001 From: hyperbel Date: Wed, 21 Dec 2022 22:40:04 +0100 Subject: [PATCH 4/5] add <> to stop confusion --- main.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/main.py b/main.py index 5c17a1e..1d97dbd 100644 --- a/main.py +++ b/main.py @@ -192,7 +192,7 @@ def mate_logik(sorte, anzahl): koffeingehalt = 0 match sorte: case "Mio Mio": - koffeingehalt = + koffeingehalt = @app.route("/mate", methods=['POST']) @@ -415,4 +415,4 @@ def create_app(config_filename): return app # Use this line to run it localy -#app.run(host="ip", port=80) +#app.run(host="", port=80) From cde30e1417f38d38d891a620b3dccfcc9b7897aa Mon Sep 17 00:00:00 2001 From: hyperbel Date: Wed, 21 Dec 2022 22:44:39 +0100 Subject: [PATCH 5/5] appropiate spacing and removed most of the warnings --- main.py | 76 +++++++++++++++++++++++++++++++++++---------------------- 1 file changed, 47 insertions(+), 29 deletions(-) diff --git a/main.py b/main.py index 1d97dbd..6ec1f6b 100644 --- a/main.py +++ b/main.py @@ -15,6 +15,7 @@ zeit = time.strftime("%H%M", time.localtime(time.time())) log = date app.config['SECRET_KEY'] = 'party' + def dbcon(sql): con = sqlite3.connect("party.db") warning_log("verbindung mit db wurde aufgenommen") @@ -23,17 +24,20 @@ def dbcon(sql): con.commit() return sql.fetchall() + def dbcon1(sql): con = sqlite3.connect("party.db") cur = con.cursor() return cur.execute(sql) + def uptime(): time = int(zeit) uptime = time - starttime return uptime -#log system + +# log system def log_server(log): log = date + log datei = open('server.log', 'a') @@ -41,26 +45,30 @@ def log_server(log): log = date datei.close() + def error_log(error): - error = date + " [ERROR]"+ error + error = date + " [ERROR]" + error datei = open('server.log', 'a') datei.write('\n' + " " + error) log = date - datei.close() + datei.close() + def problem_log(problem): - problem = date + " [PROBLEM]"+ problem + problem = date + " [PROBLEM]" + problem datei = open('server.log', 'a') datei.write('\n' + " " + problem) log = date - datei.close() + datei.close() + def warning_log(warning): - warning = date + " [WARNING]"+ warning + warning = date + " [WARNING]" + warning datei = open('server.log', 'a') datei.write('\n' + " " + warning) log = date - datei.close() + datei.close() + # Qr-code generator# def create_qr(id): @@ -71,13 +79,15 @@ def create_qr(id): else: warning_log("QR-Code ist bereits vorhanden") -#Hauptseite + +# Hauptseite @app.route("/") def index(): log_server("called /") return render_template("index.html") -#Neue Nachrichten + +# Neue Nachrichten @app.route("/get_chat", methods=['POST']) def get_chat(): if session: @@ -93,27 +103,30 @@ def get_chat(): dbcon(l) log_server("message entered successfully") - except: + except e: error_log("unable to get new Messages") account = cur.fetchone() return render_template("chat.html") else: - warning_log(" called /get_chat without being logged in") - return "{ \"message\": \"you need to login\"'}" + warning_log(" called /get_chat without being logged in") + return "{ \"message\": \"you need to login\"'}" + @app.route("/get_game_file", methods=['POST']) def get_game_file(): - log_server("called /get_game_file") - pick() + log_server("called /get_game_file") + pick() + @app.route("/get_new_message") def get_new_message(): if session: log_server("called /get_new_message") - return render_template("chat.html") + return render_template("chat.html") else: - warning_log(" called /get_new_message without being logged in") - return render_template('passwd.html') + warning_log(" called /get_new_message without being logged in") + return render_template('passwd.html') + @app.route("/message") def message(): @@ -121,10 +134,11 @@ def message(): log_server("called /message") return render_template("message.html") else: - warning_log(" called /message without being logged in") - return render_template('passwd.html') + warning_log(" called /message without being logged in") + return render_template('passwd.html') -#planer + +# planer @app.route("/get_planer", methods=['POST']) def get_planer(): if session: @@ -140,17 +154,18 @@ def get_planer(): con = sqlite3.connect("party.db") warning_log("verbindung mit db wurde aufgenommen") cur = con.cursor() - cur.execute(l) + cur.execute(l) con.commit() con.close() log_server("event entered successfully /get_planer") - except: + except e: error_log("unable to insert event") return redirect(f'/session/{sessionID}') else: - warning_log(" called /get_planer without being logged in") - return render_template('404.html') + warning_log(" called /get_planer without being logged in") + return render_template('404.html') + @app.route("/session/") def session(id): @@ -182,10 +197,13 @@ def session(id): con.commit() cur.close() - return render_template("session.html", asd=asd, game=game, das=user_count, er=creator, mate=mate, der=uptime()) + return render_template("session.html", asd=asd, game=game, + das=user_count, er=creator, mate=mate, + der=uptime()) else: - warning_log(" called /session without being logged in") - return render_template('passwd.html') + warning_log(" called /session without being logged in") + return render_template('passwd.html') + def mate_logik(sorte, anzahl): anzahl = anzahl + 1 @@ -200,8 +218,8 @@ def mate(): log_server("called /mate") if session: - mateFlaschen = request.form['mateFlaschen'] - sessionId = request.form['sessionID'] + mateFlaschen = request.form['mateFlaschen'] + sessionId = request.form['sessionID'] mateSorte = request.form['mateSorte'] mateSql = f"INSERT INTO mate VALUES (\"{mateSorte}\", \'{mateFlaschen}\', \'{sessionId}\');" try: