X-Git-Url: https://us-delaporte.pagekite.me/gitweb/matrix-chore-bot.git/blobdiff_plain/0e8e2296efcfab2892ec552b04e46450554fd06a..b602bd00cf0d253cc1d035333a39f0e884120bc5:/matrix_chore_bot/db.py diff --git a/matrix_chore_bot/db.py b/matrix_chore_bot/db.py index 536c9c0..a0eae22 100644 --- a/matrix_chore_bot/db.py +++ b/matrix_chore_bot/db.py @@ -13,9 +13,6 @@ DATE_FORMAT = '%Y-%m-%d' def today(): return dt.now().strftime(DATE_FORMAT) -DEFAULT_DB_FILE = os.path.join(os.environ.get('MATRIX_DATA_DIR', ''), 'chores.db') -DB_FILE = os.environ.get('MATRIX_CHORE_DB_FILE', DEFAULT_DB_FILE) - logger = logging.getLogger(__name__) logging.basicConfig(filename='chore.log', encoding='utf-8', level=logging.DEBUG) @@ -38,14 +35,14 @@ def get_chore(session, chore_id): return session.exec(cmd).first() class Data(): - def __init__(self, db_file=None): - - if not db_file: - db_file = DB_FILE + def __init__(self, db_file): self.file = db_file self.engine = self.get_engine() + def get_db_file(self): + return self.file + def get_engine(self): return create_engine(f"sqlite:///{self.file}") @@ -94,6 +91,17 @@ class Data(): results.append(Data.check_chore(session, chore.id)) return results + def filter(self, term): + results = [] + for item in self.list(): + if term in item: + results.append(item) + + return results + + + + def add(self, name): try: with Session(self.engine) as session: