dnsbl: Add a command to show all lists

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/dnsbl/database.py b/src/dnsbl/database.py
index 6319e8eb7c2a8de9e4de932150da482308dd05c0..6dc8b4468c4dcda8e1016f7cbaaff9c63b24e60d 100644 (file)
--- a/src/dnsbl/database.py
+++ b/src/dnsbl/database.py
@@ -95,6 +95,23 @@ class Database(object):
                # Return the object
                return object
 
+       def fetch(self, stmt, batch_size=128):
+               """
+                       Fetches objects of the given type
+               """
+               result = self.execute(stmt)
+
+               # Process the result in batches
+               if batch_size:
+                       result = result.yield_per(batch_size)
+
+               # Apply unique filtering
+               result = result.unique()
+
+               # Return all objects
+               for object in result.scalars():
+                       yield object
+
        def fetch_one(self, stmt):
                result = self.execute(stmt)
 
@@ -103,3 +120,21 @@ class Database(object):
 
                # Return exactly one object or none, but fail otherwise
                return result.scalar_one_or_none()
+
+       def fetch_as_list(self, *args, **kwargs):
+               """
+                       Fetches objects and returns them as a list instead of an iterator
+               """
+               objects = self.fetch(*args, **kwargs)
+
+               # Return as list
+               return [o for o in objects]
+
+       def fetch_as_set(self, *args, **kwargs):
+               """
+                       Fetches objects and returns them as a set instead of an iterator
+               """
+               objects = self.fetch(*args, **kwargs)
+
+               # Return as set
+               return set([o for o in objects])

diff --git a/src/dnsbl/lists.py b/src/dnsbl/lists.py
index 40269ac46e501a80a740c3c2138478ee0602ace4..13967858b49d5219d306e6bfcb2e3ca5c0dfa6c7 100644 (file)
--- a/src/dnsbl/lists.py
+++ b/src/dnsbl/lists.py
@@ -29,6 +29,26 @@ class Lists(object):
        def __init__(self, backend):
                self.backend = backend
 
+       def __iter__(self):
+               """
+                       Returns an iterator over all lists
+               """
+               stmt = (
+                       sqlmodel
+                       .select(
+                               List,
+                       )
+                       .where(
+                               List.deleted_at == None,
+                       )
+                       .order_by(
+                               List.name,
+                               List.slug,
+                       )
+               )
+
+               return self.backend.db.fetch(stmt)
+
        def get_by_slug(self, slug):
                stmt = (
                        sqlmodel

diff --git a/src/scripts/dnsbl.in b/src/scripts/dnsbl.in
index 04eaf94b372dd055dfc5d9bcb41287284cd5c131..dd7b7eb6a96e6a5a6656d9be271dec86e5c07103 100644 (file)
--- a/src/scripts/dnsbl.in
+++ b/src/scripts/dnsbl.in
@@ -52,6 +52,10 @@ class CLI(object):
                # Show Version
                parser.add_argument("--version", action="version", version="%(prog)s @VERSION@")
 
+               # lists
+               lists = subparsers.add_parser("lists", help=_("Show all lists"))
+               lists.set_defaults(func=self.__lists)
+
                # list-create
                list_create = subparsers.add_parser("list-create", help=_("Create a new list"))
                list_create.add_argument("--name", required=True,
@@ -121,6 +125,27 @@ class CLI(object):
                # Otherwise just exit
                sys.exit(0)
 
+       def __lists(self, backend, args):
+               table = rich.table.Table(title=_("Lists"))
+               table.add_column(_("Name"))
+               table.add_column(_("Slug"))
+               table.add_column(_("License"))
+               table.add_column(_("Created At"))
+               table.add_column(_("Created By"))
+
+               # Show all lists
+               for list in backend.lists:
+                       table.add_row(
+                               list.name,
+                               list.slug,
+                               list.license,
+                               list.created_at.isoformat(),
+                               list.created_by,
+                       )
+
+               # Print the table
+               self.console.print(table)
+
        def __list_create(self, backend, args):
                """
                        Creates a new list