Continued:

[fba.git] / fba / commands.py

diff --git a/fba/commands.py b/fba/commands.py
index 87f9163003341bfd957a0876b02b10ed70f39796..e770b1c60942b67d9932aa93900efd42ce7e6f5f 100644 (file)
--- a/fba/commands.py
+++ b/fba/commands.py
@@ -1326,8 +1326,15 @@ def recheck_obfuscation(args: argparse.Namespace) -> int:
     logger.info("Checking %d domains ...", len(rows))
     for row in rows:
         logger.debug("Fetching peers from domain='%s',software='%s',nodeinfo_url='%s' ...", row["domain"], row["software"], row["nodeinfo_url"])
-        if blacklist.is_blacklisted(row["domain"]):
-            logger.debug("row[domain]='%s' is blacklisted - SKIPPED!", row["domain"])
+        if not domain_helper.is_wanted(row["domain"]):
+            logger.debug("row[domain]='%s' is not wanted - SKIPPED!", row["domain"])
+            if args.delete_unwanted:
+                logger.info("Deleting unwanted row[domain]='%s' ...", row["domain"])
+                instances.delete(row["domain"])
+                blocks.delete(row["domain"])
+            continue
+        elif blacklist.is_blacklisted(row["domain"]):
+            logger.warning("row[domain]='%s' is blacklisted - SKIPPED!", row["domain"])
             continue
         elif (args.force is None or not args.force) and args.domain is None and args.software is None and instances.is_recent(row["domain"], "last_blocked"):
             logger.debug("row[domain]='%s' has recently been checked, args.force[]='%s' - SKIPPED!", row["domain"], type(args.force))