diff --git a/.gitignore b/.gitignore index d46c2b0597ee919f86c0e3b22c36fa26d0686e10..713030397fc6fcdc05a9d80732a38e8c2fc5bdb6 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ tags* .env data/*.sqlite +*.sqlite # Created by https://www.toptal.com/developers/gitignore/api/python # Edit at https://www.toptal.com/developers/gitignore?templates=python diff --git a/data/links.sql b/data/links.sql deleted file mode 100644 index 1a4672ef7d22fe8018aa006a0f1d9c57b430ac28..0000000000000000000000000000000000000000 --- a/data/links.sql +++ /dev/null @@ -1,7 +0,0 @@ -CREATE TABLE link ( - entrance TEXT NOT NULL UNIQUE, - destination TEXT NULL, - one_way INTEGER NOT NULL DEFAULT 0, - block TEXT NULL, - note TEXT NULL -); \ No newline at end of file diff --git a/data/links.sqlite.empty b/data/links.sqlite.empty index 0a3b0779eb459dfe856110a91396c95a65aff6eb..8ac3def1cc9eb933568dd55b39d5f572b78e3389 100644 Binary files a/data/links.sqlite.empty and b/data/links.sqlite.empty differ diff --git a/links/db.py b/links/db.py index 267e071db76df2239c67e519c12fa2232fb4b790..380b61fd571a20f3a3d54aeb39df56078ada2d9d 100644 --- a/links/db.py +++ b/links/db.py @@ -3,11 +3,24 @@ import sqlite3 from links.link import Link from util.blocked import Blocked +CREATE = """ +CREATE TABLE IF NOT EXISTS link ( + entrance TEXT NOT NULL UNIQUE, + destination TEXT NULL, + one_way INTEGER NOT NULL DEFAULT 0, + block TEXT NULL, + note TEXT NULL +); +""" + class Db: def __init__(self, database): self._database = database + def create_table(self): + self._cursor.execute(CREATE) + def insert(self, link: Link): block = link.block.value if link.block is not None else None self._cursor.execute("INSERT INTO link VALUES (?, ?, ?, ?, ?)", @@ -53,6 +66,7 @@ class Db: def __enter__(self): self._conn = sqlite3.connect(self._database, isolation_level=None) self._cursor = self._conn.cursor() + self.create_table() return self def __exit__(self, exc_type, exc_val, exc_tb): diff --git a/main.py b/main.py index 61dc520c18c61527b7cc6e22201d7f616d53e81d..3aed464af5feae7525cd2cf0c0d4a7942721dbda 100644 --- a/main.py +++ b/main.py @@ -1,6 +1,5 @@ import sys import logging -from os.path import join from PySide6.QtCore import QCoreApplication, Qt from PySide6.QtWidgets import QApplication @@ -10,9 +9,9 @@ from pokerandom import PokeRandom from links.db import Db from timer import connect_shift -logging.basicConfig(filename=join('data', 'pokerandom.log'), level=logging.DEBUG, +logging.basicConfig(filename='pokerandom.log', level=logging.DEBUG, format='%(asctime)s %(levelname)s:%(message)s') -database = join('data', 'links.sqlite') +database = 'pokerandom_db.sqlite' if __name__ == '__main__':