Continued:

[fba.git] / fba / commands.py

diff --git a/fba/commands.py b/fba/commands.py
index b951b6355f60dccd400469d16f8c1f01461263f1..31518a85252a358109dcc0b9cabd75559011d5d7 100644 (file)
--- a/fba/commands.py
+++ b/fba/commands.py
@@ -572,7 +572,7 @@ def fetch_observer(args: argparse.Namespace) -> int:
             logger.debug("domain='%s' - AFTER!", domain)
 
             if domain in [None, ""]:
-                logger.debug("domain='%s' is empty after tidyup.domain() - SKIPPED!", domain)
+                logger.debug("domain[%s]='%s' is empty after tidyup.domain(): item[domain]='%s' - SKIPPED!", type(domain), domain, item["domain"])
                 continue
 
             logger.debug("domain='%s' - BEFORE!", domain)
@@ -829,7 +829,7 @@ def fetch_fba_rss(args: argparse.Namespace) -> int:
 
             logger.debug("domain='%s' - AFTER!", domain)
             if domain in [None, ""]:
-                logger.debug("domain='%s' is empty after tidyup.domain() - SKIPPED!", domain)
+                logger.debug("domain[%s]='%s' is empty after tidyup.domain() - SKIPPED!", type(domain), domain)
                 continue
 
             logger.debug("domain='%s' - BEFORE!", domain)
@@ -916,7 +916,7 @@ def fetch_fbabot_atom(args: argparse.Namespace) -> int:
 
                     logger.debug("domain='%s' - AFTER!", domain)
                     if domain in [None, ""]:
-                        logger.debug("domain='%s' is empty after tidyup.domain() - SKIPPED!", domain)
+                        logger.debug("domain[%s]='%s' is empty after tidyup.domain(): href='%s' - SKIPPED!", type(domain), domain, href)
                         continue
 
                     logger.debug("domain='%s' - BEFORE!", domain)
@@ -1124,7 +1124,7 @@ def fetch_txt(args: argparse.Namespace) -> int:
                 logger.debug("domain='%s' - AFTER!", domain)
 
                 if domain in [None, ""]:
-                    logger.debug("domain='%s' is empty after tidyup.domain() - SKIPPED!", domain)
+                    logger.debug("domain[%s]='%s' is empty after tidyup.domain() - SKIPPED!", type(domain), domain)
                     continue
                 elif not domain_helper.is_wanted(domain):
                     logger.debug("domain='%s' is not wanted - SKIPPED!", domain)
@@ -1176,7 +1176,7 @@ def fetch_fedipact(args: argparse.Namespace) -> int:
 
             logger.debug("domain='%s' - AFTER!", domain)
             if domain in [None, ""]:
-                logger.debug("domain='%s' is empty after tidyup.domain() - SKIPPED!", domain)
+                logger.debug("domain[%s]='%s' is empty after tidyup.domain(): row.contents[0]='%s' - SKIPPED!", type(domain), domain, row.contents[0])
                 continue
 
             logger.debug("domain='%s' - BEFORE!", domain)
@@ -1485,7 +1485,7 @@ def fetch_fedilist(args: argparse.Namespace) -> int:
         logger.debug("domain='%s' - AFTER!", domain)
 
         if domain in [None, ""]:
-            logger.debug("domain='%s' is empty after tidyup.domain(): row[hostname]='%s' - SKIPPED!", domain, row["hostname"])
+            logger.debug("domain[%s]='%s' is empty after tidyup.domain(): row[hostname]='%s' - SKIPPED!", type(domain), domain, row["hostname"])
             continue
 
         logger.debug("domain='%s' - BEFORE!", domain)
@@ -1648,8 +1648,8 @@ def fetch_instances_social(args: argparse.Namespace) -> int:
         domain = tidyup.domain(row["name"]) if row["name"] not in [None, ""] else None
         logger.debug("domain='%s' - AFTER!", domain)
 
-        if domain is None and domain == "":
-            logger.debug("domain='%s' is empty after tidyup.domain() - SKIPPED!", domain)
+        if domain in [None, ""]:
+            logger.debug("domain[%s]='%s' is empty after tidyup.domain() - SKIPPED!", type(domain), domain)
             continue
 
         logger.debug("domain='%s' - BEFORE!", domain)
@@ -1717,8 +1717,8 @@ def fetch_relaylist(args: argparse.Namespace) -> int:
         domain = urlparse(row["url"]).netloc.lower().split(":")[0]
         logger.debug("domain='%s' - AFTER!", domain)
 
-        if domain is None and domain == "":
-            logger.debug("domain='%s' is empty after tidyup.domain() - SKIPPED!", domain)
+        if domain [None, ""]:
+            logger.debug("domain[%s]='%s' is empty after tidyup.domain() - SKIPPED!", type(domain), domain)
             continue
 
         logger.debug("domain='%s' - BEFORE!", domain)
@@ -1853,7 +1853,7 @@ def fetch_relays(args: argparse.Namespace) -> int:
                     logger.debug("domain='%s' - AFTER!", domain)
 
                     if domain in [None, ""]:
-                        logger.debug("domain='%s' is empty after tidyup.domain() from origin='%s' - SKIPPED!", domain, row["domain"])
+                        logger.debug("domain[%s]='%s' is empty after tidyup.domain() from origin='%s' - SKIPPED!", type(domain), domain, row["domain"])
                         continue
                     elif domain not in peers:
                         logger.debug("Appending domain='%s' to peers list for relay='%s' ...", domain, row["domain"])
@@ -1895,7 +1895,7 @@ def fetch_relays(args: argparse.Namespace) -> int:
                 logger.debug("domain='%s' - AFTER!", domain)
 
                 if domain in [None, ""]:
-                    logger.debug("domain='%s' is empty after tidyup.domain() from origin='%s' - SKIPPED!", domain, row["domain"])
+                    logger.debug("domain[%s]='%s' is empty after tidyup.domain() from origin='%s' - SKIPPED!", type(domain), domain, row["domain"])
                     continue
                 elif domain not in peers:
                     logger.debug("Appending domain='%s' to peers list for relay='%s' ...", domain, row["domain"])
@@ -1919,7 +1919,7 @@ def fetch_relays(args: argparse.Namespace) -> int:
                 logger.debug("domain='%s' - AFTER!", domain)
 
                 if domain in [None, ""]:
-                    logger.debug("domain='%s' is empty after tidyup.domain() from origin='%s' - SKIPPED!", domain, row["domain"])
+                    logger.debug("domain[%s]='%s' is empty after tidyup.domain() from origin='%s' - SKIPPED!", type(domain), domain, row["domain"])
                     continue
                 elif domain not in peers:
                     logger.debug("Appending domain='%s' to peers list for relay='%s' ...", domain, row["domain"])