Introduce "dev environment" and dotenv

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.
This commit is contained in:
2023-03-28 00:54:04 +02:00
parent 831166f38b
commit b8220732ee
7 changed files with 112 additions and 93 deletions

View File

@ -12,49 +12,44 @@ entry_table = "entries"
index_label = "Id"
done_table = "done_songs"
connection = None
sql_engine = None
def open_db() -> engine.base.Connection:
global connection
if (not connection):
def get_db_engine() -> engine.base.Engine:
global sql_engine
if (not sql_engine):
print(current_app.config.get("DBCONNSTRING"))
engine = create_engine(current_app.config.get("DBCONNSTRING")) # type: ignore
connection = engine.connect()
# cur.execute('PRAGMA encoding = "UTF-8";')
return connection
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=';')
conn = open_db()
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
# conn.close()
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():
conn = open_db()
conn.execute('CREATE TABLE IF NOT EXISTS '+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)')
# conn.close()
def create_done_song_table():
conn = open_db()
conn.execute('CREATE TABLE IF NOT EXISTS '+done_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)')
# conn.close()
def create_song_table():
conn = open_db()
conn.execute("CREATE TABLE IF NOT EXISTS `"+song_table+"""` (
with get_db_engine().connect() as conn:
conn.execute("CREATE TABLE IF NOT EXISTS `"+song_table+"""` (
`Id` INTEGER,
`Title` TEXT,
`Artist` TEXT,
@ -65,122 +60,107 @@ def create_song_table():
`Styles` TEXT,
`Languages` TEXT
)""")
# conn.close()
def create_list_view():
conn = open_db()
conn.execute("""CREATE OR REPLACE VIEW `Liste` AS
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""")
# conn.close()
def create_done_song_view():
conn = open_db()
conn.execute("""CREATE OR REPLACE VIEW `Abspielliste` AS
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""")
# conn.close()
def get_list():
conn = open_db()
cur = conn.execute("SELECT * FROM Liste")
with get_db_engine().connect() as conn:
cur = conn.execute("SELECT * FROM Liste")
return cur.fetchall()
def get_played_list():
conn = open_db()
cur = conn.execute("SELECT * FROM Abspielliste")
with get_db_engine().connect() as conn:
cur = conn.execute("SELECT * FROM Abspielliste")
return cur.fetchall()
def get_song_list():
conn = open_db()
cur = conn.execute(
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):
conn = open_db()
# 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])
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):
conn = open_db()
conn.execute(
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))
# conn.close()
return
def add_sung_song(entry_id):
conn = open_db()
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;""")
# SQLite bullshittery
# conn.execute("""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)"
# )
delete_entry(entry_id)
# conn.close()
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):
conn = open_db()
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,))
# conn.close()
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):
conn = open_db()
cur = conn.execute(
"SELECT Count(*) FROM entries WHERE entries.Client_Id = %s", (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():
conn = open_db()
cur = conn.execute("SELECT Count(*) FROM entries")
with get_db_engine().connect() as conn:
cur = conn.execute("SELECT Count(*) FROM entries")
return cur.fetchall()[0][0]
def clear_played_songs():
conn = open_db()
conn.execute("DELETE FROM done_songs")
# conn.close()
with get_db_engine().connect() as conn:
conn.execute("DELETE FROM done_songs")
return True
def delete_entry(id):
conn = open_db()
conn.execute("DELETE FROM entries WHERE id=%s", (id,))
# conn.close()
with get_db_engine().connect() as conn:
conn.execute("DELETE FROM entries WHERE id=%s", (id,))
return True
@ -189,16 +169,15 @@ def delete_entries(ids):
for x in ids:
idlist.append((x,))
try:
conn = open_db()
cur = conn.execute("DELETE FROM entries WHERE id=%s", idlist)
# conn.close()
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():
conn = open_db()
conn.execute("DELETE FROM entries")
# conn.close()
with get_db_engine().connect() as conn:
conn.execute("DELETE FROM entries")
return True