Changed database scripts

src/database/add.py

@@ -1,42 +1,38 @@
-import traceback
-
+import sqlmodel
 import mariadb
+from sqlalchemy.future import Engine
 
-
-def add_master_pass(
-    id: int, hashed_passwd: bytes, salt: bytes, con: mariadb.Connection
-) -> bool:
-    cursor = con.cursor()
-    try:
-        cursor.execute(
-            "INSERT INTO master_pass (user_id, salt, passwd) VALUES (?, ?, ?)",
-            [id, hashed_passwd, salt],
-        )
-        cursor.close()
-    except Exception:
-        traceback.print_exc()
-        return False
-    else:
-        return True
+from . import models
 
 
 def add_account(
-    id: int,
-    acc_name: str,
+    engine: Engine,
+    user_id: int,
+    name: str,
     salt: bytes,
     enc_login: bytes,
-    enc_passwd: bytes,
-    con: mariadb.Connection,
+    enc_pass: bytes,
 ) -> bool:
-    cursor = con.cursor()
+    account = models.Account(
+        user_id=user_id, name=name, salt=salt, enc_login=enc_login, enc_pass=enc_pass
+    )
     try:
-        cursor.execute(
-            "INSERT INTO accounts (user_id, acc_name, salt, enc_login, enc_pass) VALUES (?, ?, ?, ?, ?, ?)",
-            [id, acc_name, salt, enc_login, enc_passwd],
-        )
-        cursor.close()
+        with sqlmodel.Session(engine) as session:
+            session.add(account)
+            session.commit()
+    except Exception:
+        return False
+    else:
+        return True
+
+
+def add_master_pass(engine: Engine, user_id: int, salt: bytes, passwd: bytes) -> bool:
+    master_pass = models.MasterPass(user_id=user_id, salt=salt, passwd=passwd)
+    try:
+        with sqlmodel.Session(engine) as session:
+            session.add(master_pass)
+            session.commit()
     except Exception:
-        traceback.print_exc()
         return False
     else:
         return True