From 8908290c4de87d2270ece29d238bb43429961f01 Mon Sep 17 00:00:00 2001 From: 3wc <3wc@doesthisthing.work> Date: Fri, 27 Oct 2023 21:01:45 +0100 Subject: [PATCH] Simplify db ORM method names --- hamstertools/app.py | 4 ++-- hamstertools/db.py | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/hamstertools/app.py b/hamstertools/app.py index 3fb004b..2b3b5ec 100644 --- a/hamstertools/app.py +++ b/hamstertools/app.py @@ -68,7 +68,7 @@ class ActivitiesScreen(ListScreen): self.table.clear() # List activities with the count of facts - activities = Activity.list_activities(self.db_manager, filter_query) + activities = Activity.list(self.db_manager, filter_query) self.table.add_rows( [ @@ -144,7 +144,7 @@ class CategoriesScreen(ListScreen): def _refresh(self, filter_query=None): self.table.clear() - categories = Category.list_categories( + categories = Category.list( self.db_manager, filter_query=filter_query ) diff --git a/hamstertools/db.py b/hamstertools/db.py index 7959876..225b7f2 100644 --- a/hamstertools/db.py +++ b/hamstertools/db.py @@ -38,7 +38,7 @@ class Category(BaseORM): ) @staticmethod - def list_categories(db_manager, filter_query=None): + def list(db_manager, filter_query=None): cursor = db_manager.get_cursor() where = "" if filter_query is not None: @@ -120,7 +120,7 @@ class Activity(BaseORM): self.conn.commit() @staticmethod - def list_activities(db_manager, filter_query=None): + def list(db_manager, filter_query=None): cursor = db_manager.get_cursor() where = "" if filter_query is not None: @@ -195,7 +195,7 @@ class Fact(BaseORM): super().__init__(db_manager, "facts", id, activity_id=activity_id) @staticmethod - def list_facts(db_manager): + def list(db_manager): cursor = db_manager.get_cursor() cursor.execute("SELECT * FROM facts") rows = cursor.fetchall()