Merge branch 'legacy' into feature/legacy/mariadb_database

There are now two dockerfiles. One for production, one for development.
All configuration is now also handled through dotenv files,
which these dotenv files, as well as the included VSCode launch tasks
use.

.env.dev

@@ -0,0 +1,14 @@
+# MariaDB
+MARIADB_ROOT_PASSWORD=mariadb_root_password
+MARIADB_ROOT_HOST=localhost
+MARIADB_DATABASE=karaoqueue
+MARIADB_USER=karaoqueue
+MARIADB_PASSWORD=mariadb_karaoqueue_password
+
+# Karaoqueue
+DEPLOYMENT_PLATFORM=Docker
+DBSTRING=mysql://karaoqueue:mariadb_karaoqueue_password@127.0.0.1:3306/karaoqueue
+BASIC_AUTH_USERNAME=admin 
+BASIC_AUTH_PASSWORD=change_me
+ENTRY_QUOTA=3
+MAX_QUEUE=20

.gitignore

@@ -138,3 +138,6 @@ node_modules/
 
 # Version identification file
 .version
+
+# Docker secrets
+secrets.yml

.vscode/launch.json

@@ -5,17 +5,18 @@
     "version": "0.2.0",
     "configurations": [
         {
-            "preLaunchTask": "versiondump",
+            "preLaunchTask": "mariadb",
             "name": "Python: Flask",
             "type": "python",
-            "cwd": "${workspaceFolder}/backend/app",
+            "cwd": "${workspaceFolder}/backend",
             "request": "launch",
             "module": "flask",
             "env": {
-                "FLASK_APP": "backend/app/main.py",
+                "FLASK_APP": "backend/app.py",
                 "FLASK_ENV": "development",
-                "FLASK_DEBUG": "1"
+                "FLASK_DEBUG": "1", 
             },
+            "envFile": "${workspaceFolder}/.env.dev",
             "args": [
                 "run",
                 "--no-debugger",
@@ -24,17 +25,18 @@
             "jinja": true
         },
         {
-            "preLaunchTask": "versiondump",
+            "preLaunchTask": "mariadb",
             "name": "Python: Flask (with reload)",
             "type": "python",
-            "cwd": "${workspaceFolder}/backend/app",
+            "cwd": "${workspaceFolder}/backend",
             "request": "launch",
             "module": "flask",
             "env": {
-                "FLASK_APP": "backend/app/main.py",
+                "FLASK_APP": "backend/app.py",
                 "FLASK_ENV": "development",
                 "FLASK_DEBUG": "1"
             },
+            "envFile": "${workspaceFolder}/.env.dev",
             "args": [
                 "run",
                 "--no-debugger"
@@ -42,17 +44,18 @@
             "jinja": true
         },
         {
-            "preLaunchTask": "versiondump",
+            "preLaunchTask": "mariadb",
             "name": "Python: Flask (with reload, externally reachable)",
             "type": "python",
-            "cwd": "${workspaceFolder}/backend/app",
+            "cwd": "${workspaceFolder}/backend",
             "request": "launch",
             "module": "flask",
             "env": {
-                "FLASK_APP": "backend/app/main.py",
+                "FLASK_APP": "backend/app.py",
                 "FLASK_ENV": "development",
                 "FLASK_DEBUG": "1"
             },
+            "envFile": "${workspaceFolder}/.env.dev",
             "args": [
                 "run",
                 "--no-debugger",
@@ -61,17 +64,18 @@
             "jinja": true
         },
         {
-            "preLaunchTask": "versiondump",
+            "preLaunchTask": "mariadb",
             "name": "Python: Flask (externally reachable)",
             "type": "python",
-            "cwd": "${workspaceFolder}/backend/app",
+            "cwd": "${workspaceFolder}/backend",
             "request": "launch",
             "module": "flask",
             "env": {
-                "FLASK_APP": "backend/app/main.py",
+                "FLASK_APP": "backend/app.py",
                 "FLASK_ENV": "development",
                 "FLASK_DEBUG": "1"
             },
+            "envFile": "${workspaceFolder}/.env.dev",
             "args": [
                 "run",
                 "--no-debugger",

.vscode/tasks.json

@@ -6,8 +6,15 @@
         {
             "label": "versiondump",
             "type": "shell",
-            "command": "echo \"$(git rev-parse --abbrev-ref HEAD)-$(git describe)\"> ${workspaceFolder}/backend/app/.version",
+            "command": "echo \"$(git rev-parse --abbrev-ref HEAD)-$(git describe)\"> ${workspaceFolder}/backend/.version",
             "problemMatcher": []
+        },
+        {
+            "label": "mariadb",
+            "type": "shell",
+            "command": "docker-compose -f docker-compose.yml up --remove-orphans",
+            "isBackground": true,
+            "activeOnStart": false
         }
     ]
 }

Dockerfile

@@ -0,0 +1,5 @@
+FROM tiangolo/uwsgi-nginx-flask:python3.7
+
+COPY ./backend /app
+
+RUN pip install -r /app/requirements.txt

backend/Dockerfile

@@ -1,11 +0,0 @@
-FROM tiangolo/uwsgi-nginx-flask:python3.7
-
-RUN pip install requests
-
-RUN pip install pandas
-
-RUN pip install Flask-BasicAuth
-
-RUN pip install bs4
-
-COPY ./app /app

backend/Procfile

@@ -0,0 +1 @@
+web: gunicorn wsgi:app

backend/app.py

@@ -1,4 +1,5 @@
-from flask import Flask, render_template, Response, abort, request, redirect, send_from_directory
+from flask import Flask, render_template, abort, request, redirect, send_from_directory, jsonify
+from flask.wrappers import Request, Response
 import helpers
 import database
 import data_adapters
@@ -9,7 +10,7 @@ from helpers import nocache
 app = Flask(__name__, static_url_path='/static')
 
 basic_auth = BasicAuth(app)
-accept_entries = False
+accept_entries = True
 
 @app.route("/")
 def home():
@@ -51,8 +52,8 @@ def enqueue():
                 abort(400)
             name = request.json['name']
             song_id = request.json['id']
-            if database.check_queue_length() < app.config['MAX_QUEUE']:
-                if database.check_entry_quota(client_id) < app.config['ENTRY_QUOTA']:
+            if database.check_queue_length() < int(app.config['MAX_QUEUE']):
+                if database.check_entry_quota(client_id) < int(app.config['ENTRY_QUOTA']):
                     database.add_entry(name, song_id, client_id)
                     return Response('{"status":"OK"}', mimetype='text/json')
                 else:
@@ -81,12 +82,12 @@ def settings():
 def settings_post():
     entryquota = request.form.get("entryquota")
     maxqueue = request.form.get("maxqueue")
-    if entryquota.isnumeric() and int(entryquota) > 0:
-        app.config['ENTRY_QUOTA'] = int(entryquota)
+    if entryquota.isnumeric() and int(entryquota) > 0:  # type: ignore
+        app.config['ENTRY_QUOTA'] = int(entryquota)  # type: ignore
     else:
         abort(400)
-    if maxqueue.isnumeric and int(maxqueue) > 0:
-        app.config['MAX_QUEUE'] = int(maxqueue)
+    if maxqueue.isnumeric and int(maxqueue) > 0:  # type: ignore
+        app.config['MAX_QUEUE'] = int(maxqueue)  # type: ignore
     else:
         abort(400)
 
@@ -131,8 +132,8 @@ def get_song_completions(input_string=""):
     input_string = request.args.get('search', input_string)
     if input_string != "":
         print(input_string)
-        list = database.get_song_completions(input_string=input_string)
-        return Response(json.dumps(list, ensure_ascii=False).encode('utf-8'), mimetype='text/json')
+        result = [list(x) for x in database.get_song_completions(input_string=input_string)]
+        return jsonify(result)
 
     else:
         return 400
@@ -229,6 +230,7 @@ def admin():
 
 @app.before_first_request
 def activate_job():
+    helpers.load_dbconfig(app)
     helpers.load_version(app)
     helpers.create_data_directory()
     database.create_entry_table()

backend/app/database.py

@@ -1,212 +0,0 @@
-# -*- coding: utf_8 -*-
-
-import sqlite3
-import pandas
-from io import StringIO
-
-song_table = "songs"
-entry_table = "entries"
-index_label = "Id"
-done_table = "done_songs"
-
-
-def open_db():
-    conn = sqlite3.connect("/tmp/karaoqueue.db")
-    conn.execute('PRAGMA encoding = "UTF-8";')
-    return conn
-
-
-def import_songs(song_csv):
-    print("Start importing Songs...")
-    df = pandas.read_csv(StringIO(song_csv), sep=';')
-    conn = open_db()
-    cur = conn.cursor()
-    df.to_sql(song_table, conn, if_exists='replace',
-              index=False)
-    cur.execute("SELECT Count(Id) FROM songs")
-    num_songs = cur.fetchone()[0]
-    conn.close()
-    print("Imported songs ({} in Database)".format(num_songs))
-    return("Imported songs ({} in Database)".format(num_songs))
-
-
-def create_entry_table():
-    conn = open_db()
-    conn.execute('CREATE TABLE IF NOT EXISTS '+entry_table +
-                 ' (ID INTEGER PRIMARY KEY NOT NULL, Song_Id INTEGER NOT NULL, Name VARCHAR(255), Client_Id VARCHAR(36), Transferred INTEGER DEFAULT 0)')
-    conn.close()
-
-
-def create_done_song_table():
-    conn = open_db()
-    conn.execute('CREATE TABLE IF NOT EXISTS '+done_table +
-                 ' (Song_Id INTEGER PRIMARY KEY NOT NULL,  Plays INTEGER)')
-    conn.close()
-
-
-def create_song_table():
-    conn = open_db()
-    conn.execute("CREATE TABLE IF NOT EXISTS \""+song_table+"""\" (
-        "Id" INTEGER,
-        "Title" TEXT,
-        "Artist" TEXT,
-        "Year" INTEGER,
-        "Duo" INTEGER,
-        "Explicit" INTEGER,
-        "Date Added" TEXT,
-        "Styles" TEXT,
-        "Languages" TEXT
-    )""")
-    conn.close()
-
-
-def create_list_view():
-    conn = open_db()
-    conn.execute("""CREATE VIEW IF NOT EXISTS [Liste] AS
-                 SELECT Name, Title, Artist, entries.Id, songs.Id, entries.Transferred
-                 FROM entries, songs
-                 WHERE entries.Song_Id=songs.Id""")
-    conn.close()
-
-
-def create_done_song_view():
-    conn = open_db()
-    conn.execute("""CREATE VIEW IF NOT EXISTS [Abspielliste] AS
-                 SELECT Artist || \" - \" || Title AS Song, Plays AS Wiedergaben
-                 FROM songs, done_songs
-                 WHERE done_songs.Song_Id=songs.Id""")
-    conn.close()
-
-
-def get_list():
-    conn = open_db()
-    conn.row_factory = sqlite3.Row
-    cur = conn.cursor()
-    cur.execute("SELECT * FROM Liste")
-    return cur.fetchall()
-
-
-def get_played_list():
-    conn = open_db()
-    cur = conn.cursor()
-    cur.execute("SELECT * FROM Abspielliste")
-    return cur.fetchall()
-
-
-def get_song_list():
-    conn = open_db()
-    cur = conn.cursor()
-    cur.execute("SELECT Artist || \" - \" || Title AS Song, Id FROM songs;")
-    return cur.fetchall()
-
-
-def get_song_completions(input_string):
-    conn = open_db()
-    cur = conn.cursor()
-    # Don't look, it burns...
-    prepared_string = "%{0}%".format(
-        input_string).upper()  # "Test" -> "%TEST%"
-    print(prepared_string)
-    cur.execute(
-        "SELECT Title || \" - \" || Artist AS Song, Id FROM songs WHERE REPLACE(REPLACE(REPLACE(REPLACE(UPPER( SONG ),'ö','Ö'),'ü','Ü'),'ä','Ä'),'ß','ẞ') LIKE (?) LIMIT 20;", (prepared_string,))
-    return cur.fetchall()
-
-
-def add_entry(name, song_id, client_id):
-    conn = open_db()
-    cur = conn.cursor()
-    cur.execute(
-        "INSERT INTO entries (Song_Id,Name,Client_Id) VALUES(?,?,?);", (song_id, name, client_id))
-    conn.commit()
-    conn.close()
-    return
-
-
-def add_sung_song(entry_id):
-    conn = open_db()
-    cur = conn.cursor()
-    cur.execute("""SELECT Song_Id FROM entries WHERE Id=?""", (entry_id,))
-    song_id = cur.fetchone()[0]
-    cur.execute("""INSERT OR REPLACE INTO done_songs (Song_Id, Plays)
-                VALUES("""+str(song_id)+""",
-                       COALESCE(
-                           (SELECT Plays FROM done_songs
-                            WHERE Song_Id="""+str(song_id)+"), 0) + 1)"
-                )
-    conn.commit()
-    delete_entry(entry_id)
-    conn.close()
-    return True
-
-
-def toggle_transferred(entry_id):
-    conn = open_db()
-    cur = conn.cursor()
-    cur.execute("SELECT Transferred FROM entries WHERE ID =?", (entry_id,))
-    marked = cur.fetchall()[0][0]
-    if(marked == 0):
-        cur.execute(
-            "UPDATE entries SET Transferred = 1 WHERE ID =?", (entry_id,))
-    else:
-        cur.execute(
-            "UPDATE entries SET Transferred = 0 WHERE ID =?", (entry_id,))
-    conn.commit()
-    conn.close()
-    return True
-
-
-def check_entry_quota(client_id):
-    conn = open_db()
-    cur = conn.cursor()
-    cur.execute(
-        "SELECT Count(*) FROM entries WHERE entries.Client_Id = ?", (client_id,))
-    return cur.fetchall()[0][0]
-
-
-def check_queue_length():
-    conn = open_db()
-    cur = conn.cursor()
-    cur.execute("SELECT Count(*) FROM entries")
-    return cur.fetchall()[0][0]
-
-
-def clear_played_songs():
-    conn = open_db()
-    cur = conn.cursor()
-    cur.execute("DELETE FROM done_songs")
-    conn.commit()
-    conn.close()
-    return True
-
-
-def delete_entry(id):
-    conn = open_db()
-    cur = conn.cursor()
-    cur.execute("DELETE FROM entries WHERE id=?", (id,))
-    conn.commit()
-    conn.close()
-    return True
-
-
-def delete_entries(ids):
-    idlist = []
-    for x in ids:
-        idlist.append((x,))
-    try:
-        conn = open_db()
-        cur = conn.cursor()
-        cur.executemany("DELETE FROM entries WHERE id=?", idlist)
-        conn.commit()
-        conn.close()
-        return cur.rowcount
-    except sqlite3.Error as error:
-        return -1
-
-
-def delete_all_entries():
-    conn = open_db()
-    cur = conn.cursor()
-    cur.execute("DELETE FROM entries")
-    conn.commit()
-    conn.close()
-    return True

backend/app/helpers.py

@@ -1,77 +0,0 @@
-import requests
-from bs4 import BeautifulSoup
-import json
-import os
-import uuid
-from flask import make_response
-from functools import wraps, update_wrapper
-from datetime import datetime
-
-data_directory = "data"
-config_file = data_directory+"/config.json"
-
-def create_data_directory():
-    if not os.path.exists(data_directory):
-        os.makedirs(data_directory)
-
-
-def get_catalog_url():
-    r = requests.get('https://www.karafun.de/karaoke-song-list.html')
-    soup = BeautifulSoup(r.content, 'html.parser')
-    url = soup.findAll('a', href=True, text='Verfügbar in CSV-Format')[0]['href']
-    return url
-
-def get_songs(url):
-    r = requests.get(url)
-    return r.text
-
-def is_valid_uuid(val):
-    try:
-        uuid.UUID(str(val))
-        return True
-    except ValueError:
-        return False
-
-def check_config_exists():
-    return os.path.isfile(config_file)
-
-def load_version(app):
-    if os.path.isfile(".version"):
-        with open('.version', 'r') as file:
-            data = file.read().replace('\n', '')
-            if data:
-                app.config['VERSION'] = data
-            else:
-                app.config['VERSION'] = ""
-    else:
-        app.config['VERSION'] = ""
-
-def setup_config(app):
-    if check_config_exists():
-        config = json.load(open(config_file))
-        with open(config_file, 'r') as handle:
-            config = json.load(handle)
-        print("Loaded existing config")
-    else:
-        config = {'username': 'admin', 'password': 'changeme', 'entryquota': 3, 'maxqueue': 20}
-        with open(config_file, 'w') as handle:
-            json.dump(config, handle, indent=4, sort_keys=True)
-        print("Wrote new config")
-    app.config['BASIC_AUTH_USERNAME'] = config['username']
-    app.config['BASIC_AUTH_PASSWORD'] = config['password']
-    app.config['ENTRY_QUOTA'] = config['entryquota']
-    app.config['MAX_QUEUE'] = config['maxqueue']
-
-
-
-def nocache(view):
-    @wraps(view)
-    def no_cache(*args, **kwargs):
-        response = make_response(view(*args, **kwargs))
-        response.headers['Last-Modified'] = datetime.now()
-        response.headers['Cache-Control'] = 'no-store, no-cache, must-revalidate, post-check=0, pre-check=0, max-age=0'
-        response.headers['Pragma'] = 'no-cache'
-        response.headers['Expires'] = '-1'
-        return response
-        
-    return update_wrapper(no_cache, view)

backend/app/requirements.txt

@@ -1,4 +0,0 @@
-requests
-pandas
-Flask-BasicAuth
-bs4

backend/database.py

@@ -0,0 +1,183 @@
+# -*- coding: utf_8 -*-
+
+from email.mime import base
+from MySQLdb import Connection
+from sqlalchemy import create_engine, engine
+import pandas
+from io import StringIO
+from flask import current_app
+
+song_table = "songs"
+entry_table = "entries"
+index_label = "Id"
+done_table = "done_songs"
+
+sql_engine = None
+
+
+def get_db_engine() -> engine.base.Engine:
+    global sql_engine
+    if (not sql_engine):
+        print(current_app.config.get("DBCONNSTRING"))
+        sql_engine = create_engine(current_app.config.get("DBCONNSTRING"))  # type: ignore
+    return sql_engine
+
+
+def import_songs(song_csv):
+    print("Start importing Songs...")
+    df = pandas.read_csv(StringIO(song_csv), sep=';')
+    with get_db_engine().connect() as conn:
+        df.to_sql(song_table, conn, if_exists='replace',
+                index=False)
+        cur = conn.execute("SELECT Count(Id) FROM songs")
+        num_songs = cur.fetchone()[0] # type: ignore
+    print("Imported songs ({} in Database)".format(num_songs))
+    return("Imported songs ({} in Database)".format(num_songs))
+
+
+def create_entry_table():
+    with get_db_engine().connect() as conn:
+        conn.execute('CREATE TABLE IF NOT EXISTS '+entry_table +
+                 ' (ID INTEGER PRIMARY KEY NOT NULL AUTO_INCREMENT, Song_Id INTEGER NOT NULL, Name VARCHAR(255), Client_Id VARCHAR(36), Transferred INTEGER DEFAULT 0)')
+
+
+def create_done_song_table():
+    with get_db_engine().connect() as conn:
+        conn.execute('CREATE TABLE IF NOT EXISTS '+done_table +
+                 ' (Song_Id INTEGER PRIMARY KEY NOT NULL,  Plays INTEGER)')
+
+
+def create_song_table():
+    with get_db_engine().connect() as conn:
+        conn.execute("CREATE TABLE IF NOT EXISTS `"+song_table+"""` (
+        `Id` INTEGER,
+        `Title` TEXT,
+        `Artist` TEXT,
+        `Year` INTEGER,
+        `Duo` INTEGER,
+        `Explicit` INTEGER,
+        `Date Added` TEXT,
+        `Styles` TEXT,
+        `Languages` TEXT
+    )""")
+
+
+def create_list_view():
+    with get_db_engine().connect() as conn:
+        conn.execute("""CREATE OR REPLACE VIEW `Liste` AS
+                 SELECT Name, Title, Artist, entries.Id AS entry_ID, songs.Id AS song_ID, entries.Transferred
+                 FROM entries, songs
+                 WHERE entries.Song_Id=songs.Id""")
+
+
+def create_done_song_view():
+    with get_db_engine().connect() as conn:
+        conn.execute("""CREATE OR REPLACE VIEW `Abspielliste` AS
+                 SELECT CONCAT(Artist," - ", Title) AS Song, Plays AS Wiedergaben
+                 FROM songs, done_songs
+                 WHERE done_songs.Song_Id=songs.Id""")
+
+
+def get_list():
+    with get_db_engine().connect() as conn:
+        cur = conn.execute("SELECT * FROM Liste")
+    return cur.fetchall()
+
+
+def get_played_list():
+    with get_db_engine().connect() as conn:
+        cur = conn.execute("SELECT * FROM Abspielliste")
+    return cur.fetchall()
+
+
+def get_song_list():
+    with get_db_engine().connect() as conn:
+        cur = conn.execute(
+        "SELECT Artist || \" - \" || Title AS Song, Id FROM songs;")
+    return cur.fetchall()
+
+
+def get_song_completions(input_string):
+    with get_db_engine().connect() as conn:
+        # Don't look, it burns...
+        prepared_string = "%{0}%".format(
+            input_string).upper()  # "Test" -> "%TEST%"
+        print(prepared_string)
+        cur = conn.execute(
+            "SELECT CONCAT(Artist,\" - \",Title) AS Song, Id FROM songs WHERE CONCAT(Artist,\" - \",Title) LIKE (%s) LIMIT 20;", [prepared_string])
+    return cur.fetchall()
+
+
+def add_entry(name, song_id, client_id):
+    with get_db_engine().connect() as conn:
+        conn.execute(
+        "INSERT INTO entries (Song_Id,Name,Client_Id) VALUES(%s,%s,%s);", (song_id, name, client_id))
+    return
+
+
+def add_sung_song(entry_id):
+    with get_db_engine().connect() as conn:
+        cur = conn.execute(
+            """SELECT Song_Id FROM entries WHERE Id=%s""", (entry_id,))
+        song_id = cur.fetchone()[0] # type: ignore
+        conn.execute("""INSERT INTO done_songs (Song_Id, Plays) VALUES("""+str(song_id)+""",1) ON DUPLICATE KEY UPDATE Plays=Plays + 1;""")
+        delete_entry(entry_id)
+    return True
+
+
+def toggle_transferred(entry_id):
+    with get_db_engine().connect() as conn:
+        cur = conn.execute(
+            "SELECT Transferred FROM entries WHERE ID =%s", (entry_id,))
+        marked = cur.fetchall()[0][0]
+        if(marked == 0):
+            conn.execute(
+                "UPDATE entries SET Transferred = 1 WHERE ID =%s", (entry_id,))
+        else:
+            conn.execute(
+                "UPDATE entries SET Transferred = 0 WHERE ID =%s", (entry_id,))
+    return True
+
+
+def check_entry_quota(client_id):
+    with get_db_engine().connect() as conn:
+        cur = conn.execute(
+            "SELECT Count(*) FROM entries WHERE entries.Client_Id = %s", (client_id,))
+    return cur.fetchall()[0][0]
+
+
+def check_queue_length():
+    with get_db_engine().connect() as conn:
+        cur = conn.execute("SELECT Count(*) FROM entries")
+    return cur.fetchall()[0][0]
+
+
+def clear_played_songs():
+    with get_db_engine().connect() as conn:
+        conn.execute("DELETE FROM done_songs")
+    return True
+
+
+def delete_entry(id):
+    with get_db_engine().connect() as conn:
+        conn.execute("DELETE FROM entries WHERE id=%s", (id,))
+    return True
+
+
+def delete_entries(ids):
+    idlist = []
+    for x in ids:
+        idlist.append((x,))
+    try:
+        with get_db_engine().connect() as conn:
+            cur = conn.execute("DELETE FROM entries WHERE id=%s", idlist)
+
+        return cur.rowcount
+    except Exception as error:
+        return -1
+
+
+def delete_all_entries():
+    with get_db_engine().connect() as conn:
+        conn.execute("DELETE FROM entries")
+    return True

backend/helpers.py

@@ -0,0 +1,109 @@
+import requests
+from bs4 import BeautifulSoup
+import json
+import os
+import uuid
+from flask import make_response
+from functools import wraps, update_wrapper
+from datetime import datetime
+
+data_directory = "data"
+config_file = data_directory+"/config.json"
+
+def create_data_directory():
+    if not os.path.exists(data_directory):
+        os.makedirs(data_directory)
+
+
+def get_catalog_url():
+    r = requests.get('https://www.karafun.de/karaoke-song-list.html')
+    soup = BeautifulSoup(r.content, 'html.parser')
+    url = soup.findAll('a', href=True, text='Verfügbar in CSV-Format')[0]['href']
+    return url
+
+def get_songs(url):
+    r = requests.get(url)
+    return r.text
+
+def is_valid_uuid(val):
+    try:
+        uuid.UUID(str(val))
+        return True
+    except ValueError:
+        return False
+
+def check_config_exists():
+    return os.path.isfile(config_file)
+
+def load_version(app):
+    if os.environ.get("SOURCE_VERSION"):
+        app.config['VERSION'] = os.environ.get("SOURCE_VERSION")[0:7] # type: ignore
+    elif os.path.isfile(".version"):
+        with open('.version', 'r') as file:
+            data = file.read().replace('\n', '')
+            if data:
+                app.config['VERSION'] = data
+            else:
+                app.config['VERSION'] = ""
+    else:
+        app.config['VERSION'] = ""
+        
+def load_dbconfig(app):
+    if os.environ.get("FLASK_ENV") == "development":
+        app.config['DBCONNSTRING'] = os.environ.get("DBSTRING")
+    else:
+        if os.environ.get("DEPLOYMENT_PLATFORM") == "Heroku":    
+            if os.environ.get("JAWSDB_MARIA_URL"):
+                app.config['DBCONNSTRING'] = os.environ.get("JAWSDB_MARIA_URL")
+            else:
+                app.config['DBCONNSTRING'] = ""
+        if os.environ.get("DEPLOYMENT_PLATFORM") == "Docker": 
+            if os.environ.get("DBSTRING"):
+                app.config['DBCONNSTRING'] = os.environ.get("DBSTRING")
+            else:
+                app.config['DBCONNSTRING'] = ""   
+        elif os.path.isfile(".dbconn"):
+            with open('.dbconn', 'r') as file:
+                data = file.read().replace('\n', '')
+                if data:
+                    app.config['DBCONNSTRING'] = data
+                else:
+                    app.config['DBCONNSTRING'] = ""
+        else:
+            app.config['DBCONNSTRING'] = ""
+
+def setup_config(app):
+    if os.environ.get("DEPLOYMENT_PLATFORM") == "Docker":
+        app.config['BASIC_AUTH_USERNAME'] = os.environ.get('BASIC_AUTH_USERNAME')
+        app.config['BASIC_AUTH_PASSWORD'] = os.environ.get('BASIC_AUTH_PASSWORD')
+        app.config['ENTRY_QUOTA'] = os.environ.get('ENTRY_QUOTA')
+        app.config['MAX_QUEUE'] = os.environ.get('MAX_QUEUE')
+    else:
+        if check_config_exists():
+            config = json.load(open(config_file))
+            with open(config_file, 'r') as handle:
+                config = json.load(handle)
+            print("Loaded existing config")
+        else:
+            config = {'username': 'admin', 'password': 'changeme', 'entryquota': 3, 'maxqueue': 20}
+            with open(config_file, 'w') as handle:
+                json.dump(config, handle, indent=4, sort_keys=True)
+            print("Wrote new config")
+        app.config['BASIC_AUTH_USERNAME'] = config['username']
+        app.config['BASIC_AUTH_PASSWORD'] = config['password']
+        app.config['ENTRY_QUOTA'] = config['entryquota']
+        app.config['MAX_QUEUE'] = config['maxqueue']
+
+
+
+def nocache(view):
+    @wraps(view)
+    def no_cache(*args, **kwargs):
+        response = make_response(view(*args, **kwargs))
+        response.headers['Last-Modified'] = datetime.now()  # type: ignore
+        response.headers['Cache-Control'] = 'no-store, no-cache, must-revalidate, post-check=0, pre-check=0, max-age=0'
+        response.headers['Pragma'] = 'no-cache'
+        response.headers['Expires'] = '-1'
+        return response
+        
+    return update_wrapper(no_cache, view)

backend/main.py

@@ -0,0 +1,4 @@
+from app import app
+
+if __name__ == "__main__":
+        app.run()

backend/requirements.txt

@@ -0,0 +1,7 @@
+requests
+pandas
+Flask-BasicAuth
+bs4
+gunicorn
+SQLAlchemy
+mysqlclient

backend/templates/base.html

@@ -12,7 +12,7 @@
     <title>{% block title %}{% endblock %} - KaraoQueue</title>
 
     <!-- Bootstrap-Tables -->
-    <link rel="stylesheet" href="https://unpkg.com/bootstrap-table@1.15.3/dist/bootstrap-table.min.css">
+    <link rel="stylesheet" href="https://unpkg.com/bootstrap-table@1.21.2/dist/bootstrap-table.min.css">
 
     <!-- Bootstrap core CSS -->
     <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/css/bootstrap.min.css"
@@ -73,9 +73,9 @@
             {% if not auth %}
             <a href="/login" class="ml-1 mr-1"><i class="fas fa-sign-in-alt mr-1"></i><span>Login</span></a>
             {% endif %}
-            <!--<a href="https://github.com/PhoenixTwoFive/karaoqueue"
-                class="ml-1 mr-1"><i class="fab fa-github mr-1"></i><span>Github</span></a>-->
-            <span class="text-muted">KaraoQueue {{karaoqueue_version}} -&nbsp;<span>&copy</span>&nbsp;2019-21 - Phillip
+            <a href="https://github.com/PhoenixTwoFive/karaoqueue"
+                class="ml-1 mr-1"><i class="fab fa-github mr-1"></i><span>Github</span></a>
+            <span class="text-muted"> {{karaoqueue_version}} -&nbsp;2019-23 - Phillip
                 Kühne</span>
         </div>
     </footer>
@@ -96,9 +96,9 @@
     <script src="https://cdnjs.cloudflare.com/ajax/libs/bootbox.js/4.4.0/bootbox.min.js"
         integrity="sha256-4F7e4JsAJyLUdpP7Q8Sah866jCOhv72zU5E8lIRER4w=" crossorigin="anonymous">
         </script>
-    <script src="https://unpkg.com/bootstrap-table@1.15.3/dist/bootstrap-table.min.js"></script>
+    <script src="https://unpkg.com/bootstrap-table@1.21.2/dist/bootstrap-table.min.js"></script>
     <script
-        src="https://unpkg.com/bootstrap-table@1.15.3/dist/extensions/auto-refresh/bootstrap-table-auto-refresh.min.js"></script>
+        src="https://unpkg.com/bootstrap-table@1.21.2/dist/extensions/auto-refresh/bootstrap-table-auto-refresh.min.js"></script>
     <script src="https://gitcdn.github.io/bootstrap-toggle/2.2.2/js/bootstrap-toggle.min.js"></script>
     {% block extrajs %}{% endblock %}
     <script>

backend/templates/main_admin.html

@@ -52,10 +52,10 @@ table td:nth-child(2) {
 {% block extrajs %}
 <script>
     $(function () {
+        refreshEntryToggle()
         $('#entryToggle').change(function() {
             $.ajax({url: "/api/entries/accept/"+($('#entryToggle').is(":checked") ? "1" : "0"), complete: setTimeout(refreshEntryToggle, 1000)});
         })
-        refreshEntryToggle()
         $("#entrytable").bootstrapTable().on('load-success.bs.table', function() {
             $('[data-toggle="tooltip"]').tooltip()
         })
@@ -195,17 +195,19 @@ table td:nth-child(2) {
         });
     }
     function TableActions (value, row, index) {
+        console.log("Value: "+value+", Row: "+row+", Index: "+index)
+        console.log(row)
         let outerHTML = ""
         if (row.Transferred==1) {
-            outerHTML = "<button type=\"button\" class=\"btn btn-default\" onclick=\"markEntryAsTransferred("+row.ID+")\"><i class=\"fas fa-backward\"></i></button>&nbsp;<button type=\"button\" class=\"btn btn-success\" data-toggle=\"tooltip\" data-placement=\"top\" title=\"Als gesungen markieren\" onclick=\"markEntryAsSung("+row.ID+")\"><i class=\"fas fa-check\"></i></button>&nbsp;<button type=\"button\" class=\"btn btn-danger\" data-toggle=\"tooltip\" data-placement=\"top\" title=\"Eintrag löschen\" onclick=\"confirmDeleteEntry('"+row.Name+"',"+row.ID+")\"><i class=\"fas fa-trash\"></i></button>";
+            outerHTML = "<button type=\"button\" class=\"btn btn-default\" onclick=\"markEntryAsTransferred("+row.entry_ID+")\"><i class=\"fas fa-backward\"></i></button>&nbsp;<button type=\"button\" class=\"btn btn-success\" data-toggle=\"tooltip\" data-placement=\"top\" title=\"Als gesungen markieren\" onclick=\"markEntryAsSung("+row.entry_ID+")\"><i class=\"fas fa-check\"></i></button>&nbsp;<button type=\"button\" class=\"btn btn-danger\" data-toggle=\"tooltip\" data-placement=\"top\" title=\"Eintrag löschen\" onclick=\"confirmDeleteEntry('"+row.Name+"',"+row.entry_ID+")\"><i class=\"fas fa-trash\"></i></button>";
         } else {
-            outerHTML = "<button type=\"button\" class=\"btn btn-info\" onclick=\"markEntryAsTransferred("+row.ID+")\"><i class=\"fas fa-exchange-alt\"></i></button>&nbsp;<button type=\"button\" class=\"btn btn-success\" data-toggle=\"tooltip\" data-placement=\"top\" title=\"Als gesungen markieren\" onclick=\"markEntryAsSung("+row.ID+")\"><i class=\"fas fa-check\"></i></button>&nbsp;<button type=\"button\" class=\"btn btn-danger\" data-toggle=\"tooltip\" data-placement=\"top\" title=\"Eintrag löschen\" onclick=\"confirmDeleteEntry('"+row.Name+"',"+row.ID+")\"><i class=\"fas fa-trash\"></i></button>";
+            outerHTML = "<button type=\"button\" class=\"btn btn-info\" onclick=\"markEntryAsTransferred("+row.entry_ID+")\"><i class=\"fas fa-exchange-alt\"></i></button>&nbsp;<button type=\"button\" class=\"btn btn-success\" data-toggle=\"tooltip\" data-placement=\"top\" title=\"Als gesungen markieren\" onclick=\"markEntryAsSung("+row.entry_ID+")\"><i class=\"fas fa-check\"></i></button>&nbsp;<button type=\"button\" class=\"btn btn-danger\" data-toggle=\"tooltip\" data-placement=\"top\" title=\"Eintrag löschen\" onclick=\"confirmDeleteEntry('"+row.Name+"',"+row.entry_ID+")\"><i class=\"fas fa-trash\"></i></button>";
         }
         return outerHTML;
     }
     function getIdSelections() {
         return $.map($("#entrytable").bootstrapTable('getSelections'), function (row) {
-            return row.ID
+            return row.entry_ID
         })
     }
 </script>

docker-compose.prod.yml

@@ -0,0 +1,28 @@
+version: "3.9"
+
+secrets:
+  secrets:
+    file: ./secrets.yml
+
+services:
+  karaoqueue:
+    image: "phillipkhne/karaoqueue:latest"
+    restart: always
+    ports:
+      - "127.0.0.1:8081:80" # Please put a reverse proxy in front of this
+    environment:
+      DEPLOYMENT_PLATFORM: Docker
+      DBSTRING: mysql://user:pass@host:3306/database
+      BASIC_AUTH_USERNAME: admin
+      BASIC_AUTH_PASSWORD: changeme
+      ENTRY_QUOTA: 3
+      MAX_QUEUE: 20
+  db:
+    image: mariadb
+    restart: always
+    environment:
+      MARIADB_ROOT_PASSWORD: changeme!
+      MARIADB_ROOT_HOST: localhost
+      MARIADB_DATABASE: karaoqueue
+      MARIADB_USER: karaoqueue
+      MARIADB_PASSWORD: change

docker-compose.yml

@@ -0,0 +1,15 @@
+# This Compose file is for development only. It is not intended for production use.
+# It only starts auxiliary services, such as a database, that are required for the
+# application to run. The application itself is started separately, using the
+# command "python -m flask run" or your favorite IDE.
+# Useful for attaching a debugger to the application.
+
+version: "3.9"
+
+services:
+  db:
+    image: mariadb
+    restart: always
+    env_file: .env.dev
+    ports:
+      - "3306:3306"