Continued:

- reduced another return statement
- added debug line
- combined both local variable initialization

diff --git a/fba/helpers/processing.py b/fba/helpers/processing.py
index 5f8438d86d0a09ab8bd3d3a16a9f23e0a297a384..9832b64d826b3e87429104a3337dd1491d0ffafe 100644 (file)
--- a/fba/helpers/processing.py
+++ b/fba/helpers/processing.py
@@ -142,8 +142,6 @@ def csv_block(blocker: str, url: str, command: str) -> None:
     logger.debug("Setting last_blocked for blocker='%s' ...", blocker)
     instances.set_last_blocked(blocker)
 
-    domains = []
-
     # Fetch this URL
     logger.info("Fetching url='%s' for blocker='%s' ...", url, blocker)
     response = network.fetch_url(
@@ -164,7 +162,7 @@ def csv_block(blocker: str, url: str, command: str) -> None:
     rows = list(reader)
 
     # Init local variables
-    blockdict = []
+    blockdict = domains = []
     cnt = 0
 
     logger.info("Checking %d CSV lines ...", len(rows))
@@ -229,7 +227,7 @@ def csv_block(blocker: str, url: str, command: str) -> None:
             domain = utils.deobfuscate(domain, blocker)
             logger.debug("domain='%s' - AFTER!", domain)
 
-        logger.debug("Marking domain='%s' as handled", domain)
+        logger.debug("Marking domain='%s' as handled ...", domain)
         domains.append(domain)
 
         if not validators.domain(domain, rfc_2782=True):

diff --git a/fba/networks/lemmy.py b/fba/networks/lemmy.py
index e0bad16fa350018e7ed777765ee5fa5cf8b4dc16..df912f17364786704b30485202c151b699268eb1 100644 (file)
--- a/fba/networks/lemmy.py
+++ b/fba/networks/lemmy.py
@@ -77,10 +77,12 @@ def fetch_peers(domain: str, origin: str) -> list:
     elif not instances.is_registered(domain):
         raise Exception(f"domain='{domain}' is not registered but function is invoked")
 
-    peers = []
 
     # No CSRF by default, you don't have to add network.api_headers by yourself here
-    headers = tuple()
+    headers = {}
+
+    # Init peer list
+    peers = []
 
     try:
         logger.debug("Checking CSRF for domain='%s' ...", domain)
@@ -194,7 +196,31 @@ def fetch_blocks(domain: str) -> list:
 
                 logger.debug("domain='%s' has %d peer(s).", domain, len(peers))
                 for blocked in peers:
-                    logger.debug("Appending blocker='%s',blocked='%s',block_level='reject' ...", domain, blocked)
+                    logger.debug("Appending domain='%s',blocked='%s',block_level='reject' ...", domain, blocked)
+                    blocklist.append({
+                        "blocker"    : domain,
+                        "blocked"    : blocked,
+                        "reason"     : None,
+                        "block_level": "rejected",
+                    })
+            else:
+                logger.debug("Finding links in ul/table ...")
+                blocking = found.find_next(["ul", "table"]).findAll("a")
+
+                logger.debug("Found %d blocked instance(s) ...", len(blocking))
+                for tag in blocking:
+                    logger.debug("tag[]='%s'", type(tag))
+                    blocked = tidyup.domain(tag.contents[0]) if tag.contents[0] != "" else None
+                    logger.debug("blocked='%s'", blocked)
+
+                    if blocked in [None, ""]:
+                        logger.debug("blocked[%s]='%s' is empty after tidyup.domain(): tag.contents[0]='%s' - SKIPPED!", type(blocked), blocked, tag.contents[0])
+                        continue
+                    elif not domain_helper.is_wanted(blocked):
+                        logger.debug("blocked='%s' is not wanted - SKIPPED!", blocked)
+                        continue
+
+                    logger.debug("Appending domain='%s',blocked='%s',block_level='reject' ...", domain, blocked)
                     blocklist.append({
                         "blocker"    : domain,
                         "blocked"    : blocked,
@@ -202,30 +228,7 @@ def fetch_blocks(domain: str) -> list:
                         "block_level": "rejected",
                     })
 
-                logger.debug("blocklist()=%d - EXIT!", len(blocklist))
-                return blocklist
-
-            blocking = found.find_next(["ul", "table"]).findAll("a")
-            logger.debug("Found %d blocked instance(s) ...", len(blocking))
-            for tag in blocking:
-                logger.debug("tag[]='%s'", type(tag))
-                blocked = tidyup.domain(tag.contents[0]) if tag.contents[0] != "" else None
-                logger.debug("blocked='%s'", blocked)
-
-                if blocked in [None, ""]:
-                    logger.debug("blocked[%s]='%s' is empty after tidyup.domain(): tag.contents[0]='%s' - SKIPPED!", type(blocked), blocked, tag.contents[0])
-                    continue
-                elif not domain_helper.is_wanted(blocked):
-                    logger.debug("blocked='%s' is not wanted - SKIPPED!", blocked)
-                    continue
-
-                logger.debug("Appending blocker='%s',blocked='%s',block_level='reject' ...", domain, blocked)
-                blocklist.append({
-                    "blocker"    : domain,
-                    "blocked"    : blocked,
-                    "reason"     : None,
-                    "block_level": "rejected",
-                })
+            logger.debug("blocklist()=%d - AFTER!", len(blocklist))
         else:
             logger.warning("Cannot fetch /instances due to error: response.ok='%s',response.status_code=%d,response.details='%s'", response.ok, response.status_code, response.reason)
             instances.set_last_error(domain, response)