Merge pull request #11 from Fingadumbledore/develop

Develop
This commit is contained in:
Fingadumbledore 2022-11-22 14:13:56 +01:00 committed by GitHub
commit 6e2612df06
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 6 deletions

16
main.py
View File

@ -146,7 +146,8 @@ def get_planer():
log_server("event entered successfully /get_planer")
except:
error_log("unable to insert event")
return "{ \"message\": \"planer\"'}"
return redirect(f'/session/{sessionID}')
else:
warning_log(" called /get_planer without being logged in")
return render_template('404.html')
@ -190,10 +191,12 @@ def mate():
mateSql = f"INSERT INTO mate VALUES (\"{mateSorte}\", \'{mateFlaschen}\', \'{session}\');"
try:
con = sqlite3.connect("party.db")
warning_log("Verbindung mit Datenbank wurde aufgenommen /mate")
cur = con.cursor()
cur.execute(mateSql)
con.commit()
con.close()
log_server("mate wurde in Datenbank eingefügt")
except sqlite3.Error as e:
error_log(f"error while executing sql: {e}")
return render_template("404.html")
@ -227,7 +230,7 @@ def get_creat_session():
log_server("called /get_creat_session with POST")
sessionname = request.form['sessionname']
sessionID = request.form['sessionid']
l = f"INSERT INTO seession VALUES( \'{sessionID}\', \'{sessionname}\', '0', '0', 'online','public');"
l = f"INSERT INTO seession VALUES( \'{sessionID}\', \'{sessionname}\', 'online','public');"
log_server("neue Session")
try:
con = sqlite3.connect("party.db")
@ -364,9 +367,14 @@ def new():
sessionId = request.form['sessionID']
userId = request.form['sessionID']
info = "normal"
userstatus = "normal"
l = f"INSERT INTO user VALUES \'{userid}\',\'{username}\',\'{sessionId}\',\'{info}\';"
account = dbcon(l)
con = sqlite3.connect("party.db")
warning_log("verbindung mit db wurde aufgenommen")
cur = con.cursor()
cur.execute(l)
con.commit()
con.close()
account = True
if account:
session['loggedin'] = True
user_count = +1

View File

@ -1,6 +1,6 @@
PRAGMA foreign_keys=ON;
CREATE TABLE user (userID INTEGER UNIQUE PRIMARY KEY,username TEXT sessionID INTEGER, info TEXT);
CREATE TABLE seession (sessionID INTEGER UNIQUE PRIMARY KEY, sessionname TEXT, useranzahl INTEGER, aktiveuser INTEGER, sesionstatus TEXT, seessiontyp TEXT, startzeit TEXT, bild TEXT);
CREATE TABLE user (userID INTEGER UNIQUE PRIMARY KEY AUTOINCREMENT,username TEXT, sessionID INTEGER, info TEXT);
CREATE TABLE seession (sessionID INTEGER UNIQUE PRIMARY KEY, sessionname TEXT, sesionstatus TEXT, seessiontyp TEXT);
CREATE TABLE chat (sessionID INTEGER, userID INTEGER, chatmessage TEXT, ZEIT TEXT);
CREATE TABLE game (sessionID INTEGER, userID INTEGER, Spielname TEXT, Spielaktivität TEXT, ZEIT TEXT);
CREATE TABLE uploadgame (sessionID INTEGER, userID INTEGER, Spielname TEXT, Spielstand TEXT);