From 59d9ea4bf42699ca62b1de266cf21bcaea0b7861 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juhani=20Krekel=C3=A4?= Date: Wed, 9 May 2018 23:24:15 +0300 Subject: [PATCH] Apparently we should use one database. Fortunately that's easily fixed --- database.py | 16 ++++++++-------- initialize.py | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/database.py b/database.py index 0257695..60f28a8 100644 --- a/database.py +++ b/database.py @@ -13,7 +13,7 @@ class userstatus(enum.Enum): csprng = random.SystemRandom() -def add_user(userdb, *, username, password, email, parent, status): +def add_user(db, *, username, password, email, parent, status): """Add a user to the database""" global csprgn @@ -34,15 +34,15 @@ def add_user(userdb, *, username, password, email, parent, status): status = status.value # Add the user into the database - cursor = userdb.cursor() + cursor = db.cursor() cursor.execute('INSERT INTO users VALUES (?, ?, ?, ?, ?, ?, ?);', (userid, parent, status, password, username, email, '')) - userdb.commit() + db.commit() -def initialize_userdb(userdb, admin_user, admin_password): - """Creates a bare-bones user database with only admin +def initialize_users(db, admin_user, admin_password): + """Creates a bare-bones database with only admin user This should never be run outside of the initialization script""" - cursor = userdb.cursor() + cursor = db.cursor() cursor.execute('''CREATE TABLE users ( id integer NOT NULL PRIMARY KEY, @@ -58,6 +58,6 @@ def initialize_userdb(userdb, admin_user, admin_password): comment text NOT NULL );''') - userdb.commit() + db.commit() - add_user(userdb, username = admin_user, password = admin_password, email = '', parent = None, status = userstatus.admin) + add_user(db, username = admin_user, password = admin_password, email = '', parent = None, status = userstatus.admin) diff --git a/initialize.py b/initialize.py index 7b04e50..4a1a83c 100644 --- a/initialize.py +++ b/initialize.py @@ -3,7 +3,7 @@ import sqlite3 import database if __name__ == '__main__': - with sqlite3.connect('user.db') as userdb: + with sqlite3.connect('buranun.db') as db: username = input('admin username: ') password = input('admin password: ') - database.initialize_userdb(userdb, username, password) + database.initialize_users(db, username, password)