dnsbl: Delete sources by URL as that is unique

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

diff --git a/src/dnsbl/lists.py b/src/dnsbl/lists.py
index 2fcfb345a50038ca7131ee4007cbcc5ae7a8cb96..e4c4f27f797b2b317af3d6a3a579f3a2f94e25bc 100644 (file)
--- a/src/dnsbl/lists.py
+++ b/src/dnsbl/lists.py
@@ -169,13 +169,13 @@ class List(sqlmodel.SQLModel, database.BackendMixin, table=True):
 
        # Delete Source!
 
-       def delete_source(self, name, **kwargs):
+       def delete_source(self, url, **kwargs):
                """
                        Removes a source from the list
                """
                # Delete the source
                for source in self.sources:
-                       if source.name == name:
+                       if source.url == url:
                                source.delete(**kwargs)
                                break
 

diff --git a/src/scripts/dnsbl.in b/src/scripts/dnsbl.in
index c8a88bc286a5359441b708120186a509d69ecb51..a5f8e6dfb6716e567dfd960079e60f6e6a1b40be 100644 (file)
--- a/src/scripts/dnsbl.in
+++ b/src/scripts/dnsbl.in
@@ -140,10 +140,10 @@ class CLI(object):
                                help=_("Deletes a source from a list"))
                delete_source.add_argument("list",
                                help=_("The name of the list"))
-               delete_source.add_argument("source",
-                               help=_("The name of the source"))
+               delete_source.add_argument("url",
+                               help=_("The URL of the source"))
                delete_source.add_argument("--deleted-by", required=True,
-                               default=os.environ.get("USER"), help=_("The person deleting the list"))
+                               default=os.environ.get("USER"), help=_("The person deleting the source"))
                delete_source.set_defaults(func=self.__delete_source)
 
                # search
@@ -468,7 +468,7 @@ class CLI(object):
 
                # Remove the source
                list.delete_source(
-                       name       = args.source,
+                       url        = args.url,
                        deleted_by = args.deleted_by,
                )